Commits October 2013

commits@lists.einsteintoolkit.org

8 participants
87 discussions

Start a nNew thread

[svn:einsteintoolkit] NullGrid/branches/tapir/ (Rev. 12)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:26 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] NullExact/branches/tapir/ (Rev. 11)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:26 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] NullEvolve/branches/tapir/ (Rev. 15)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:26 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] NullDecomp/branches/tapir/ (Rev. 13)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:26 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] NullConstr/branches/tapir/ (Rev. 10)
by rhaas＠tapir.caltech.edu 22 Oct '13

22 Oct '13

User: rhaas Date: 2013/10/22 01:25 PM Added: /branches/tapir/ Log: create tapir branch

1 0

[svn:einsteintoolkit] ADMConstraints/ (Rev. 158)
by rhaas＠tapir.caltech.edu 16 Oct '13

16 Oct '13

User: rhaas Date: 2013/10/16 06:10 PM Modified: /branches/ET_2013_05/ /branches/ET_2013_05/src/ ADMConstraints.F Log: set off-diagonal Tij components this affected all runs using ADMConstraints and new style Tmunu interface since rev 154 (January 2013) Directory Changes: Directory: /branches/ET_2013_05/ ================================ Property changes on: branches/ET_2013_05 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== + /trunk:157 File Changes: Directory: /branches/ET_2013_05/src/ ==================================== File [modified]: ADMConstraints.F Delta lines: +1 -0 =================================================================== --- branches/ET_2013_05/src/ADMConstraints.F 2013-10-02 01:08:28 UTC (rev 157) +++ branches/ET_2013_05/src/ADMConstraints.F 2013-10-16 23:10:58 UTC (rev 158) @@ -165,6 +165,7 @@ Txx = eTxx(i,j,k); Tyy = eTyy(i,j,k); Tzz = eTzz(i,j,k) + Txy = eTxy(i,j,k); Txz = eTxz(i,j,k); Tyz = eTyz(i,j,k) else

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/ (Rev. 17)
by zachetie＠gmail.com 16 Oct '13

16 Oct '13

User: zetienne Date: 2013/10/16 03:51 PM Modified: /trunk/ interface.ccl /trunk/src/ InitSymBound.C, MoL_registration.C, apply_frozen_boundary_condition.C, compute_B_and_Bstagger_from_A.C, convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij.C, driver_conserv_to_prims.C, driver_evaluate_MHD_rhs.C, driver_prims_to_conserv.C, font_fix.C, mhdflux.C, output_BC_error.C, postinitialdata.C, reconstruct_set_of_prims_PPM.C, symmetry__set_gzs_staggered_gfs.C Log: Improve compatibility with ET coding standards. Thanks to Roland Haas for the suggestions\! File Changes: Directory: /trunk/src/ ====================== File [modified]: InitSymBound.C Delta lines: +2 -2 =================================================================== --- trunk/src/InitSymBound.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/InitSymBound.C 2013-10-16 20:51:11 UTC (rev 17) @@ -2,9 +2,9 @@ Set the symmetries for the IllinoisGRMHD variables */ -#include <stdio.h> -#include <stdlib.h> #include "cctk.h" +#include <cstdio> +#include <cstdlib> #include "cctk_Arguments.h" #include "cctk_Parameters.h" #include "Symmetry.h" File [modified]: MoL_registration.C Delta lines: +3 -4 =================================================================== --- trunk/src/MoL_registration.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/MoL_registration.C 2013-10-16 20:51:11 UTC (rev 17) @@ -4,11 +4,10 @@ // To understand this, read documentation in arrangements/CactusBase/MoL/doc //-------------------------------------------------------------------------- -#include <stdio.h> -#include <math.h> -#include <stddef.h> - #include "cctk.h" +#include <cstdio> +#include <cmath> +#include <stddef.h> #include "cctk_Parameters.h" #include "cctk_Arguments.h" File [modified]: apply_frozen_boundary_condition.C Delta lines: +6 -17 =================================================================== --- trunk/src/apply_frozen_boundary_condition.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/apply_frozen_boundary_condition.C 2013-10-16 20:51:11 UTC (rev 17) @@ -12,29 +12,22 @@ * shouldn't matter. ****************************************/ - -#include <stdio.h> -#include <stdlib.h> -#include <math.h> -#include <sys/time.h> #include "cctk.h" +#include <cstdio> +#include <cstdlib> +#include <cmath> +#include <sys/time.h> #include "cctk_Arguments.h" #include "cctk_Parameters.h" -#include "cctk_Math.h" -extern "C" void CCTK_FCALL CCTK_FNAME(apply_frozen_boundary_condition) (CCTK_ARGUMENTS); - extern "C" void apply_frozen_boundary_condition(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + int levelnumber = GetRefinementLevel(cctkGH); - int levelnumber = (int)( log((double)(cctk_levfac[0]))/log(2.0) + 1.e-5 ) + 1; + if(levelnumber==0) { - //printf("LEVELNUM=%d %d\n",levelnumber,cctk_levfac[0]); - - if(levelnumber==1) { - for(int k=0;k<cctk_lsh[2];k++) for(int j=0;j<cctk_lsh[1];j++) for(int i=0;i<cctk_lsh[0];i++) { if(i<cctk_nghostzones[0] || i>cctk_lsh[0]-cctk_nghostzones[0]-1 || j<cctk_nghostzones[1] || j>cctk_lsh[1]-cctk_nghostzones[1]-1 || @@ -62,7 +55,3 @@ } } } - -extern "C" void CCTK_FCALL CCTK_FNAME(apply_frozen_boundary_condition) (CCTK_ARGUMENTS) { - apply_frozen_boundary_condition(CCTK_PASS_CTOC); -} File [modified]: compute_B_and_Bstagger_from_A.C Delta lines: +4 -4 =================================================================== --- trunk/src/compute_B_and_Bstagger_from_A.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/compute_B_and_Bstagger_from_A.C 2013-10-16 20:51:11 UTC (rev 17) @@ -1,8 +1,8 @@ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include "cctk.h" +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <sys/time.h> -#include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" File [modified]: convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij.C Delta lines: +1 -2 =================================================================== --- trunk/src/convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij.C 2013-10-16 20:51:11 UTC (rev 17) @@ -1,6 +1,5 @@ -#include <math.h> #include "cctk.h" -#include "cctk_Parameters.h" +#include <cmath> void convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij(const cGH *cctkGH,const int *cctk_lsh, double *gxx,double *gxy,double *gxz,double *gyy,double *gyz,double *gzz,double *alp, File [modified]: driver_conserv_to_prims.C Delta lines: +2 -2 =================================================================== --- trunk/src/driver_conserv_to_prims.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/driver_conserv_to_prims.C 2013-10-16 20:51:11 UTC (rev 17) @@ -25,13 +25,13 @@ * polytrope. */ +#include "cctk.h" #include <iostream> #include <iomanip> #include <fstream> #include <time.h> #include <sys/time.h> -#include <math.h> -#include "cctk.h" +#include <cmath> #include "cctk_Arguments.h" #include "cctk_Parameters.h" #include "Symmetry.h" File [modified]: driver_evaluate_MHD_rhs.C Delta lines: +4 -4 =================================================================== --- trunk/src/driver_evaluate_MHD_rhs.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/driver_evaluate_MHD_rhs.C 2013-10-16 20:51:11 UTC (rev 17) @@ -34,11 +34,11 @@ * to have 3 ghostzones instead of 4. *********************************************/ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include "cctk.h" +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <sys/time.h> -#include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" #include "GRMHD_params_not_for_params_dot_ccl.h" File [modified]: driver_prims_to_conserv.C Delta lines: +4 -5 =================================================================== --- trunk/src/driver_prims_to_conserv.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/driver_prims_to_conserv.C 2013-10-16 20:51:11 UTC (rev 17) @@ -1,10 +1,9 @@ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include "cctk.h" +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <sys/time.h> #include "Symmetry.h" -#include "cctk.h" -#include "cctk_Math.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" #include "harm_primitives_headers.h" File [modified]: font_fix.C Delta lines: +3 -3 =================================================================== --- trunk/src/font_fix.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/font_fix.C 2013-10-16 20:51:11 UTC (rev 17) @@ -1,6 +1,6 @@ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <iostream> #include <sys/time.h> File [modified]: mhdflux.C Delta lines: +3 -3 =================================================================== --- trunk/src/mhdflux.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/mhdflux.C 2013-10-16 20:51:11 UTC (rev 17) @@ -3,9 +3,9 @@ // and S_i . //----------------------------------------------------------------------------- -#include "stdio.h" -#include "stdlib.h" -#include "math.h" +#include <cstdio> +#include <cstdlib> +#include <cmath> #define SQR(x) ((x) * (x)) File [modified]: output_BC_error.C Delta lines: +4 -4 =================================================================== --- trunk/src/output_BC_error.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/output_BC_error.C 2013-10-16 20:51:11 UTC (rev 17) @@ -1,8 +1,8 @@ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include "cctk.h" +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <sys/time.h> -#include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" File [modified]: postinitialdata.C Delta lines: +2 -2 =================================================================== --- trunk/src/postinitialdata.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/postinitialdata.C 2013-10-16 20:51:11 UTC (rev 17) @@ -2,9 +2,9 @@ // Stuff to run right after initial data is set up //------------------------------------------------- -#include "stdio.h" -#include "stdlib.h" #include "cctk.h" +#include <cstdio> +#include <cstdlib> #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "cctk_Parameters.h" File [modified]: reconstruct_set_of_prims_PPM.C Delta lines: +3 -3 =================================================================== --- trunk/src/reconstruct_set_of_prims_PPM.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/reconstruct_set_of_prims_PPM.C 2013-10-16 20:51:11 UTC (rev 17) @@ -7,9 +7,9 @@ * to have 3 ghostzones instead of 4. *****************************************/ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include <cstdio> +#include <cstdlib> +#include <cmath> #include <sys/time.h> #define MINUS2 0 File [modified]: symmetry__set_gzs_staggered_gfs.C Delta lines: +2 -2 =================================================================== --- trunk/src/symmetry__set_gzs_staggered_gfs.C 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/src/symmetry__set_gzs_staggered_gfs.C 2013-10-16 20:51:11 UTC (rev 17) @@ -1,6 +1,6 @@ -#include "stdio.h" -#include "stdlib.h" #include "cctk.h" +#include <cstdio> +#include <cstdlib> extern "C" void CCTK_FCALL CCTK_FNAME(IllinoisGRMHD_set_symmetry_gzs_staggered) (const cGH **cctkGH, const int *cctk_lsh,double *X,double *Y,double *Z,const int &Symmetry, double *gridfunc, Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +9 -0 =================================================================== --- trunk/interface.ccl 2013-10-16 20:22:27 UTC (rev 16) +++ trunk/interface.ccl 2013-10-16 20:51:11 UTC (rev 17) @@ -173,3 +173,12 @@ USES FUNCTION Boundary_SelectVarForBC USES FUNCTION Boundary_SelectGroupForBC ########################################################################### + +######################################### +### Aliased functions from Carpet ### +######################################### + +CCTK_INT FUNCTION \ + GetRefinementLevel \ + (CCTK_POINTER_TO_CONST IN cctkGH) +USES FUNCTION GetRefinementLevel

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/src/ (Rev. 16)
by zachetie＠gmail.com 16 Oct '13

16 Oct '13

User: zetienne Date: 2013/10/16 03:22 PM Modified: /trunk/src/ apply_frozen_boundary_condition.C Log: Add comment on coding standards of apply_frozen_boundary_condition.C File Changes: Directory: /trunk/src/ ====================== File [modified]: apply_frozen_boundary_condition.C Delta lines: +15 -0 =================================================================== --- trunk/src/apply_frozen_boundary_condition.C 2013-10-16 20:15:20 UTC (rev 15) +++ trunk/src/apply_frozen_boundary_condition.C 2013-10-16 20:22:27 UTC (rev 16) @@ -1,3 +1,18 @@ +/**************************************** + * Apply frozen boundary conditions. + * + * IMPORTANT NOTE: This is a placeholder + * function for frozen BCs that WILL BE + * DELETED once IllinoisGRMHD moves to the + * standard ET boundary condition + * interface. Zach is aware that this + * function is not exactly compliant with + * ET coding standards, but given the + * short lifetime of this code, it + * shouldn't matter. + ****************************************/ + + #include <stdio.h> #include <stdlib.h> #include <math.h>

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/ (Rev. 15)
by zachetie＠gmail.com 16 Oct '13

16 Oct '13

User: zetienne Date: 2013/10/16 03:15 PM Modified: /trunk/ interface.ccl /trunk/src/ apply_frozen_boundary_condition.C, compute_B_and_Bstagger_from_A.C, driver_conserv_to_prims.C, driver_evaluate_MHD_rhs.C, driver_prims_to_conserv.C Log: IllinoisGRMHD inherits from Tmunubase, which in turn inherits from StaticConformal. IllinoisGRMHD needs & modifies a variable called psi, that is defined by StaticConformal. To avoid stepping on StaticConformal's toes, I replaced all references to psi with references to a variable called psi_bssn, which IllinoisGRMHD now uses instead of the variable called psi. File Changes: Directory: /trunk/src/ ====================== File [modified]: apply_frozen_boundary_condition.C Delta lines: +1 -1 =================================================================== --- trunk/src/apply_frozen_boundary_condition.C 2013-10-16 19:50:41 UTC (rev 14) +++ trunk/src/apply_frozen_boundary_condition.C 2013-10-16 20:15:20 UTC (rev 15) @@ -42,7 +42,7 @@ // FIXME: the following line (commented out) yields the following error message from // the Intel compiler (icpc) v 13.1.3 20130607 . // error: name followed by "::" must be a class or namespace name - //if(isnan(mhd_st_x_p[index])) {printf("BAD\n");exit(1);} + if(std::isnan(mhd_st_x_p[index])) {printf("BAD\n");exit(1);} } } } File [modified]: compute_B_and_Bstagger_from_A.C Delta lines: +5 -5 =================================================================== --- trunk/src/compute_B_and_Bstagger_from_A.C 2013-10-16 19:50:41 UTC (rev 14) +++ trunk/src/compute_B_and_Bstagger_from_A.C 2013-10-16 20:15:20 UTC (rev 15) @@ -39,7 +39,7 @@ for(int j=0;j<cctk_lsh[1];j++) for(int i=0;i<cctk_lsh[0];i++) { int index=CCTK_GFINDEX3D(cctkGH,i,j,k); - psi[index] = exp(phi[index]); + psi_bssn[index] = exp(phi[index]); } #pragma omp parallel for @@ -60,7 +60,7 @@ int actual_index = CCTK_GFINDEX3D(cctkGH,i,j,k); - double Psi = psi[actual_index]; + double Psi = psi_bssn[actual_index]; double Psim3 = 1.0/(Psi*Psi*Psi); // For the lower boundaries, the following applies a "copy" @@ -87,7 +87,7 @@ // Now multiply Bx and Bx_stagger by 1/sqrt(gamma(i+1/2,j,k)]) = 1/sqrt(1/2 [gamma + gamma_ip1]) = exp(-6 x 1/2 [phi + phi_ip1] ) int imax_minus_i = (cctk_lsh[0]-1)-i; int indexip1jk = CCTK_GFINDEX3D(cctkGH,i + ( (imax_minus_i > 0) - (0 > imax_minus_i) ),j,k); - double Psi_ip1 = psi[indexip1jk]; + double Psi_ip1 = psi_bssn[indexip1jk]; Bx_stagger[actual_index] *= Psim3/(Psi_ip1*Psi_ip1*Psi_ip1); /**************/ @@ -103,7 +103,7 @@ // Now multiply By and By_stagger by 1/sqrt(gamma(i,j+1/2,k)]) = 1/sqrt(1/2 [gamma + gamma_jp1]) = exp(-6 x 1/2 [phi + phi_jp1] ) int jmax_minus_j = (cctk_lsh[1]-1)-j; int indexijp1k = CCTK_GFINDEX3D(cctkGH,i,j + ( (jmax_minus_j > 0) - (0 > jmax_minus_j) ),k); - double Psi_jp1 = psi[indexijp1k]; + double Psi_jp1 = psi_bssn[indexijp1k]; By_stagger[actual_index] *= Psim3/(Psi_jp1*Psi_jp1*Psi_jp1); @@ -120,7 +120,7 @@ // Now multiply Bz_stagger by 1/sqrt(gamma(i,j,k+1/2)]) = 1/sqrt(1/2 [gamma + gamma_kp1]) = exp(-6 x 1/2 [phi + phi_kp1] ) int kmax_minus_k = (cctk_lsh[2]-1)-k; int indexijkp1 = CCTK_GFINDEX3D(cctkGH,i,j,k + ( (kmax_minus_k > 0) - (0 > kmax_minus_k) )); - double Psi_kp1 = psi[indexijkp1]; + double Psi_kp1 = psi_bssn[indexijkp1]; Bz_stagger[actual_index] *= Psim3/(Psi_kp1*Psi_kp1*Psi_kp1); File [modified]: driver_conserv_to_prims.C Delta lines: +2 -2 =================================================================== --- trunk/src/driver_conserv_to_prims.C 2013-10-16 19:50:41 UTC (rev 14) +++ trunk/src/driver_conserv_to_prims.C 2013-10-16 20:15:20 UTC (rev 15) @@ -42,7 +42,7 @@ double *gxx,double *gxy,double *gxz,double *gyy,double *gyz,double *gzz,double *alp, double *gtxx,double *gtxy,double *gtxz,double *gtyy,double *gtyz,double *gtzz, double *gtupxx,double *gtupxy,double *gtupxz,double *gtupyy,double *gtupyz,double *gtupzz, - double *phi,double *psi,double *lapm1); + double *phi,double *psi_bssn,double *lapm1); #define SQR(x) ((x) * (x)) @@ -59,7 +59,7 @@ convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij(cctkGH,cctk_lsh, gxx,gxy,gxz,gyy,gyz,gzz,alp, gtxx,gtxy,gtxz,gtyy,gtyz,gtzz, gtupxx,gtupxy,gtupxz,gtupyy,gtupyz,gtupzz, - phi,psi,lapm1); + phi,psi_bssn,lapm1); if(Symmetry==1) { // SET SYMMETRY GHOSTZONES ON ALL CONSERVATIVE VARIABLES! File [modified]: driver_evaluate_MHD_rhs.C Delta lines: +16 -16 =================================================================== --- trunk/src/driver_evaluate_MHD_rhs.C 2013-10-16 19:50:41 UTC (rev 14) +++ trunk/src/driver_evaluate_MHD_rhs.C 2013-10-16 20:15:20 UTC (rev 15) @@ -96,12 +96,12 @@ convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij(cctkGH,cctk_lsh, gxx,gxy,gxz,gyy,gyz,gzz,alp, gtxx,gtxy,gtxz,gtyy,gtyz,gtzz, gtupxx,gtupxy,gtupxz,gtupyy,gtupyz,gtupzz, - phi,psi,lapm1); + phi,psi_bssn,lapm1); double *metric[NUMVARS_FOR_METRIC_FACEVALS]; // "metric" here is array of pointers to the actual gridfunctions. ww=0; metric[ww]=phi; ww++; - metric[ww]=psi; ww++; + metric[ww]=psi_bssn; ww++; metric[ww]=gtxx; ww++; metric[ww]=gtxy; ww++; metric[ww]=gtxz; ww++; @@ -464,20 +464,20 @@ // We need A^i, but only have A_i. So we add gtupij to the list of input variables. double *interp_vars[MAXNUMINTERP]; int w=0; - interp_vars[w]=betax; w++; - interp_vars[w]=betay; w++; - interp_vars[w]=betaz; w++; - interp_vars[w]=gtupxx; w++; - interp_vars[w]=gtupxy; w++; - interp_vars[w]=gtupxz; w++; - interp_vars[w]=gtupyy; w++; - interp_vars[w]=gtupyz; w++; - interp_vars[w]=gtupzz; w++; - interp_vars[w]=psi; w++; - interp_vars[w]=lapm1; w++; - interp_vars[w]=Ax; w++; - interp_vars[w]=Ay; w++; - interp_vars[w]=Az; w++; + interp_vars[w]=betax; w++; + interp_vars[w]=betay; w++; + interp_vars[w]=betaz; w++; + interp_vars[w]=gtupxx; w++; + interp_vars[w]=gtupxy; w++; + interp_vars[w]=gtupxz; w++; + interp_vars[w]=gtupyy; w++; + interp_vars[w]=gtupyz; w++; + interp_vars[w]=gtupzz; w++; + interp_vars[w]=psi_bssn;w++; + interp_vars[w]=lapm1; w++; + interp_vars[w]=Ax; w++; + interp_vars[w]=Ay; w++; + interp_vars[w]=Az; w++; int max_num_interp_variables=w; if(max_num_interp_variables>MAXNUMINTERP) {printf("Error: Didn't allocate enough space for interp_vars[].\n"); exit(1); } // We are FINISHED with v{x,y,z}{r,l} and Pr so we use these 7 gridfunctions' worth of space as temp storage. File [modified]: driver_prims_to_conserv.C Delta lines: +3 -6 =================================================================== --- trunk/src/driver_prims_to_conserv.C 2013-10-16 19:50:41 UTC (rev 14) +++ trunk/src/driver_prims_to_conserv.C 2013-10-16 20:15:20 UTC (rev 15) @@ -33,7 +33,7 @@ convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij(cctkGH,cctk_lsh, gxx,gxy,gxz,gyy,gyz,gzz,alp, gtxx,gtxy,gtxz,gtyy,gtyz,gtzz, gtupxx,gtupxy,gtupxz,gtupyy,gtupyz,gtupzz, - phi,psi,lapm1); + phi,psi_bssn,lapm1); // for(int index=0;index<cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2];index++) { #pragma omp parallel for @@ -42,7 +42,7 @@ for(int i=0;i<cctk_lsh[0];i++) { int index=CCTK_GFINDEX3D(cctkGH,i,j,k); - double Psi = psi[index]; + double Psi = psi_bssn[index]; double Psi2 = Psi*Psi; double Psi4 = Psi2*Psi2; double Psi6 = Psi2*Psi4; @@ -114,10 +114,7 @@ BxL,ByL,BzL, rho_star[index],tau[index],mhd_st_x[index],mhd_st_y[index],mhd_st_z[index], u_xL,u_yL,u_zL,au0m1); - // FIXME: the following line (commented out) yields the following error message from - // the Intel compiler (icpc) v 13.1.3 20130607 . - // error: name followed by "::" must be a class or namespace name - //if(isnan(tau[index])) {printf("TAU IS NAN AT %d %d %d\n",i,j,k); exit(1); } + if(std::isnan(tau[index])) {printf("TAU IS NAN AT %d %d %d\n",i,j,k); exit(1); } } } Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -2 =================================================================== --- trunk/interface.ccl 2013-10-16 19:50:41 UTC (rev 14) +++ trunk/interface.ccl 2013-10-16 20:15:20 UTC (rev 15) @@ -129,8 +129,7 @@ #vvvvvvv BSSN-based quantities, computed from ADM quantities.v vvvvvvv# cctk_real BSSN_quantities type = GF TAGS='Checkpoint="no"' { - gtxx,gtxy,gtxz,gtyy,gtyz,gtzz,gtupxx,gtupxy,gtupxz,gtupyy,gtupyz,gtupzz,phi,lapm1 -# gtxx,gtxy,gtxz,gtyy,gtyz,gtzz,gtupxx,gtupxy,gtupxz,gtupyy,gtupyz,gtupzz,phi,psi,lapm1 + gtxx,gtxy,gtxz,gtyy,gtyz,gtzz,gtupxx,gtupxy,gtupxz,gtupyy,gtupyz,gtupzz,phi,psi_bssn,lapm1 } #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^#

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/ (Rev. 14)
by zachetie＠gmail.com 16 Oct '13

16 Oct '13

User: zetienne Date: 2013/10/16 02:50 PM Modified: /trunk/ configuration.ccl, interface.ccl, param.ccl, schedule.ccl /trunk/src/ A_i_rhs_no_gauge_terms.C, Lorenz_psi6phi_rhs__add_gauge_terms_to_A_i_rhs.C, add_fluxes_and_source_terms_to_hydro_rhss.C, apply_frozen_boundary_condition.C, compute_B_and_Bstagger_from_A.C, compute_tau_rhs_extrinsic_curvature_terms_and_TUPmunu.C, convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij.C, driver_conserv_to_prims.C, driver_evaluate_MHD_rhs.C, driver_prims_to_conserv.C, evaluate_MHD_rhs_headers.h, postinitialdata.C, reconstruct_set_of_prims_PPM.C, symmetry__set_gzs_staggered_gfs.C Log: Fix various bugs that prevented IllinoisGRMHD from compiling in ET. Used Intel icpc 13.1.3 20130607, on Ubuntu 13.04. File Changes: Directory: /trunk/src/ ====================== File [modified]: A_i_rhs_no_gauge_terms.C Delta lines: <Unavailable> File [modified]: Lorenz_psi6phi_rhs__add_gauge_terms_to_A_i_rhs.C Delta lines: <Unavailable> File [modified]: add_fluxes_and_source_terms_to_hydro_rhss.C Delta lines: <Unavailable> File [modified]: apply_frozen_boundary_condition.C Delta lines: <Unavailable> File [modified]: compute_B_and_Bstagger_from_A.C Delta lines: <Unavailable> File [modified]: compute_tau_rhs_extrinsic_curvature_terms_and_TUPmunu.C Delta lines: <Unavailable> File [modified]: convert_ADM_to_BSSN__enforce_detgtij_eq_1__and_compute_gtupij.C Delta lines: <Unavailable> File [modified]: driver_conserv_to_prims.C Delta lines: <Unavailable> File [modified]: driver_evaluate_MHD_rhs.C Delta lines: <Unavailable> File [modified]: driver_prims_to_conserv.C Delta lines: <Unavailable> File [modified]: evaluate_MHD_rhs_headers.h Delta lines: <Unavailable> File [modified]: postinitialdata.C Delta lines: <Unavailable> File [modified]: reconstruct_set_of_prims_PPM.C Delta lines: <Unavailable> File [modified]: symmetry__set_gzs_staggered_gfs.C Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: configuration.ccl Delta lines: <Unavailable> File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits October 2013