From c14ee6f3d20ffb6e9099de25f03a5c2f49544dab Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 3 Jan 2011 21:01:50 -0500 Subject: Re-generate code --- ML_ADMQuantities/param.ccl | 17 +++---- ML_ADMQuantities/schedule.ccl | 2 +- ML_ADMQuantities/src/ML_ADMQuantities.c | 87 ++++++++++++++++----------------- 3 files changed, 49 insertions(+), 57 deletions(-) (limited to 'ML_ADMQuantities') diff --git a/ML_ADMQuantities/param.ccl b/ML_ADMQuantities/param.ccl index 37d0295..09afed3 100644 --- a/ML_ADMQuantities/param.ccl +++ b/ML_ADMQuantities/param.ccl @@ -3,11 +3,6 @@ shares: GenericFD -USES CCTK_INT stencil_width -USES CCTK_INT stencil_width_x -USES CCTK_INT stencil_width_y -USES CCTK_INT stencil_width_z -USES CCTK_INT boundary_width shares: MethodOfLines @@ -15,7 +10,7 @@ shares: MethodOfLines USES CCTK_INT MoL_Num_Evolved_Vars restricted: -CCTK_INT verbose "verbose" +CCTK_INT verbose "verbose" STEERABLE=ALWAYS { *:* :: "" } 0 @@ -27,31 +22,31 @@ CCTK_INT conformalMethod "Treatment of conformal factor" } 0 restricted: -CCTK_INT ML_ADMQuantities_MaxNumEvolvedVars "Number of evolved variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars +CCTK_INT ML_ADMQuantities_MaxNumEvolvedVars "Number of evolved variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars STEERABLE=RECOVER { 0:0 :: "Number of evolved variables used by this thorn" } 0 restricted: -CCTK_INT timelevels "Number of active timelevels" +CCTK_INT timelevels "Number of active timelevels" STEERABLE=RECOVER { 0:3 :: "" } 3 restricted: -CCTK_INT rhs_timelevels "Number of active RHS timelevels" +CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER { 0:3 :: "" } 1 restricted: -CCTK_INT ML_ADMQuantities_calc_every "ML_ADMQuantities_calc_every" +CCTK_INT ML_ADMQuantities_calc_every "ML_ADMQuantities_calc_every" STEERABLE=ALWAYS { *:* :: "" } 1 restricted: -CCTK_INT ML_ADMQuantities_calc_offset "ML_ADMQuantities_calc_offset" +CCTK_INT ML_ADMQuantities_calc_offset "ML_ADMQuantities_calc_offset" STEERABLE=ALWAYS { *:* :: "" } 0 diff --git a/ML_ADMQuantities/schedule.ccl b/ML_ADMQuantities/schedule.ccl index 76e5a43..4f50b25 100644 --- a/ML_ADMQuantities/schedule.ccl +++ b/ML_ADMQuantities/schedule.ccl @@ -73,7 +73,7 @@ schedule ML_ADMQuantities_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMQuantities_ApplyBCs in MoL_PseudoEvolution after ML_ADMQuantities_SelectBoundConds +schedule group ApplyBCs as ML_ADMQuantities_ApplyBCs in MoL_PseudoEvolution after ML_ADMQuantities_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" diff --git a/ML_ADMQuantities/src/ML_ADMQuantities.c b/ML_ADMQuantities/src/ML_ADMQuantities.c index 581811d..741fd5b 100644 --- a/ML_ADMQuantities/src/ML_ADMQuantities.c +++ b/ML_ADMQuantities/src/ML_ADMQuantities.c @@ -53,9 +53,6 @@ void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const dir, int return; } - const char *groups[] = {"grid::coordinates","Grid::coordinates","McLachlan::ML_curv","McLachlan::ML_Gamma","McLachlan::ML_lapse","McLachlan::ML_log_confac","McLachlan::ML_metric","McLachlan::ML_shift","McLachlan::ML_trace_curv","ML_ADMQuantities::ML_Jadm","ML_ADMQuantities::ML_Madm"}; - GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities", 11, groups); - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -294,27 +291,27 @@ void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const dir, int PDstandardNth1gt33*SQR(gtu31); CCTK_REAL dgtu211 = -(gtu11*gtu21*PDstandardNth1gt11) - - gtu11*gtu22*PDstandardNth1gt12 - gtu21*gtu31*PDstandardNth1gt13 - - gtu11*gtu32*PDstandardNth1gt13 - gtu21*gtu22*PDstandardNth1gt22 - - gtu22*gtu31*PDstandardNth1gt23 - gtu21*gtu32*PDstandardNth1gt23 - - gtu31*gtu32*PDstandardNth1gt33 - PDstandardNth1gt12*SQR(gtu21); + gtu21*gtu31*PDstandardNth1gt13 - gtu11*gtu32*PDstandardNth1gt13 - + gtu21*gtu22*PDstandardNth1gt22 - gtu22*gtu31*PDstandardNth1gt23 - + gtu21*gtu32*PDstandardNth1gt23 - gtu31*gtu32*PDstandardNth1gt33 - + PDstandardNth1gt12*(gtu11*gtu22 + SQR(gtu21)); - CCTK_REAL dgtu311 = -(gtu11*gtu31*PDstandardNth1gt11) - - gtu21*gtu31*PDstandardNth1gt12 - gtu11*gtu32*PDstandardNth1gt12 - - gtu11*gtu33*PDstandardNth1gt13 - gtu21*gtu32*PDstandardNth1gt22 - - gtu31*gtu32*PDstandardNth1gt23 - gtu21*gtu33*PDstandardNth1gt23 - - gtu31*gtu33*PDstandardNth1gt33 - PDstandardNth1gt13*SQR(gtu31); + CCTK_REAL dgtu311 = -(gtu11*gtu31*PDstandardNth1gt11) - (gtu21*gtu31 + + gtu11*gtu32)*PDstandardNth1gt12 - gtu11*gtu33*PDstandardNth1gt13 - + gtu21*gtu32*PDstandardNth1gt22 - gtu31*gtu32*PDstandardNth1gt23 - + gtu21*gtu33*PDstandardNth1gt23 - gtu31*gtu33*PDstandardNth1gt33 - + PDstandardNth1gt13*SQR(gtu31); CCTK_REAL dgtu221 = -2*(gtu21*gtu22*PDstandardNth1gt12 + gtu21*gtu32*PDstandardNth1gt13 + gtu22*gtu32*PDstandardNth1gt23) - PDstandardNth1gt11*SQR(gtu21) - PDstandardNth1gt22*SQR(gtu22) - PDstandardNth1gt33*SQR(gtu32); - CCTK_REAL dgtu321 = -(gtu21*gtu31*PDstandardNth1gt11) - - gtu22*gtu31*PDstandardNth1gt12 - gtu21*gtu32*PDstandardNth1gt12 - - gtu31*gtu32*PDstandardNth1gt13 - gtu21*gtu33*PDstandardNth1gt13 - - gtu22*gtu32*PDstandardNth1gt22 - gtu22*gtu33*PDstandardNth1gt23 - - gtu32*gtu33*PDstandardNth1gt33 - PDstandardNth1gt23*SQR(gtu32); + CCTK_REAL dgtu321 = -(gtu21*gtu31*PDstandardNth1gt11) - (gtu22*gtu31 + + gtu21*gtu32)*PDstandardNth1gt12 - gtu31*gtu32*PDstandardNth1gt13 - + gtu21*gtu33*PDstandardNth1gt13 - gtu22*gtu32*PDstandardNth1gt22 - + gtu22*gtu33*PDstandardNth1gt23 - gtu32*gtu33*PDstandardNth1gt33 - + PDstandardNth1gt23*SQR(gtu32); CCTK_REAL dgtu331 = -2*(gtu31*gtu32*PDstandardNth1gt12 + gtu31*gtu33*PDstandardNth1gt13 + gtu32*gtu33*PDstandardNth1gt23) - @@ -327,27 +324,27 @@ void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const dir, int PDstandardNth2gt33*SQR(gtu31); CCTK_REAL dgtu212 = -(gtu11*gtu21*PDstandardNth2gt11) - - gtu11*gtu22*PDstandardNth2gt12 - gtu21*gtu31*PDstandardNth2gt13 - - gtu11*gtu32*PDstandardNth2gt13 - gtu21*gtu22*PDstandardNth2gt22 - - gtu22*gtu31*PDstandardNth2gt23 - gtu21*gtu32*PDstandardNth2gt23 - - gtu31*gtu32*PDstandardNth2gt33 - PDstandardNth2gt12*SQR(gtu21); + gtu21*gtu31*PDstandardNth2gt13 - gtu11*gtu32*PDstandardNth2gt13 - + gtu21*gtu22*PDstandardNth2gt22 - gtu22*gtu31*PDstandardNth2gt23 - + gtu21*gtu32*PDstandardNth2gt23 - gtu31*gtu32*PDstandardNth2gt33 - + PDstandardNth2gt12*(gtu11*gtu22 + SQR(gtu21)); - CCTK_REAL dgtu312 = -(gtu11*gtu31*PDstandardNth2gt11) - - gtu21*gtu31*PDstandardNth2gt12 - gtu11*gtu32*PDstandardNth2gt12 - - gtu11*gtu33*PDstandardNth2gt13 - gtu21*gtu32*PDstandardNth2gt22 - - gtu31*gtu32*PDstandardNth2gt23 - gtu21*gtu33*PDstandardNth2gt23 - - gtu31*gtu33*PDstandardNth2gt33 - PDstandardNth2gt13*SQR(gtu31); + CCTK_REAL dgtu312 = -(gtu11*gtu31*PDstandardNth2gt11) - (gtu21*gtu31 + + gtu11*gtu32)*PDstandardNth2gt12 - gtu11*gtu33*PDstandardNth2gt13 - + gtu21*gtu32*PDstandardNth2gt22 - gtu31*gtu32*PDstandardNth2gt23 - + gtu21*gtu33*PDstandardNth2gt23 - gtu31*gtu33*PDstandardNth2gt33 - + PDstandardNth2gt13*SQR(gtu31); CCTK_REAL dgtu222 = -2*(gtu21*gtu22*PDstandardNth2gt12 + gtu21*gtu32*PDstandardNth2gt13 + gtu22*gtu32*PDstandardNth2gt23) - PDstandardNth2gt11*SQR(gtu21) - PDstandardNth2gt22*SQR(gtu22) - PDstandardNth2gt33*SQR(gtu32); - CCTK_REAL dgtu322 = -(gtu21*gtu31*PDstandardNth2gt11) - - gtu22*gtu31*PDstandardNth2gt12 - gtu21*gtu32*PDstandardNth2gt12 - - gtu31*gtu32*PDstandardNth2gt13 - gtu21*gtu33*PDstandardNth2gt13 - - gtu22*gtu32*PDstandardNth2gt22 - gtu22*gtu33*PDstandardNth2gt23 - - gtu32*gtu33*PDstandardNth2gt33 - PDstandardNth2gt23*SQR(gtu32); + CCTK_REAL dgtu322 = -(gtu21*gtu31*PDstandardNth2gt11) - (gtu22*gtu31 + + gtu21*gtu32)*PDstandardNth2gt12 - gtu31*gtu32*PDstandardNth2gt13 - + gtu21*gtu33*PDstandardNth2gt13 - gtu22*gtu32*PDstandardNth2gt22 - + gtu22*gtu33*PDstandardNth2gt23 - gtu32*gtu33*PDstandardNth2gt33 - + PDstandardNth2gt23*SQR(gtu32); CCTK_REAL dgtu332 = -2*(gtu31*gtu32*PDstandardNth2gt12 + gtu31*gtu33*PDstandardNth2gt13 + gtu32*gtu33*PDstandardNth2gt23) - @@ -360,27 +357,27 @@ void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const dir, int PDstandardNth3gt33*SQR(gtu31); CCTK_REAL dgtu213 = -(gtu11*gtu21*PDstandardNth3gt11) - - gtu11*gtu22*PDstandardNth3gt12 - gtu21*gtu31*PDstandardNth3gt13 - - gtu11*gtu32*PDstandardNth3gt13 - gtu21*gtu22*PDstandardNth3gt22 - - gtu22*gtu31*PDstandardNth3gt23 - gtu21*gtu32*PDstandardNth3gt23 - - gtu31*gtu32*PDstandardNth3gt33 - PDstandardNth3gt12*SQR(gtu21); + gtu21*gtu31*PDstandardNth3gt13 - gtu11*gtu32*PDstandardNth3gt13 - + gtu21*gtu22*PDstandardNth3gt22 - gtu22*gtu31*PDstandardNth3gt23 - + gtu21*gtu32*PDstandardNth3gt23 - gtu31*gtu32*PDstandardNth3gt33 - + PDstandardNth3gt12*(gtu11*gtu22 + SQR(gtu21)); - CCTK_REAL dgtu313 = -(gtu11*gtu31*PDstandardNth3gt11) - - gtu21*gtu31*PDstandardNth3gt12 - gtu11*gtu32*PDstandardNth3gt12 - - gtu11*gtu33*PDstandardNth3gt13 - gtu21*gtu32*PDstandardNth3gt22 - - gtu31*gtu32*PDstandardNth3gt23 - gtu21*gtu33*PDstandardNth3gt23 - - gtu31*gtu33*PDstandardNth3gt33 - PDstandardNth3gt13*SQR(gtu31); + CCTK_REAL dgtu313 = -(gtu11*gtu31*PDstandardNth3gt11) - (gtu21*gtu31 + + gtu11*gtu32)*PDstandardNth3gt12 - gtu11*gtu33*PDstandardNth3gt13 - + gtu21*gtu32*PDstandardNth3gt22 - gtu31*gtu32*PDstandardNth3gt23 - + gtu21*gtu33*PDstandardNth3gt23 - gtu31*gtu33*PDstandardNth3gt33 - + PDstandardNth3gt13*SQR(gtu31); CCTK_REAL dgtu223 = -2*(gtu21*gtu22*PDstandardNth3gt12 + gtu21*gtu32*PDstandardNth3gt13 + gtu22*gtu32*PDstandardNth3gt23) - PDstandardNth3gt11*SQR(gtu21) - PDstandardNth3gt22*SQR(gtu22) - PDstandardNth3gt33*SQR(gtu32); - CCTK_REAL dgtu323 = -(gtu21*gtu31*PDstandardNth3gt11) - - gtu22*gtu31*PDstandardNth3gt12 - gtu21*gtu32*PDstandardNth3gt12 - - gtu31*gtu32*PDstandardNth3gt13 - gtu21*gtu33*PDstandardNth3gt13 - - gtu22*gtu32*PDstandardNth3gt22 - gtu22*gtu33*PDstandardNth3gt23 - - gtu32*gtu33*PDstandardNth3gt33 - PDstandardNth3gt23*SQR(gtu32); + CCTK_REAL dgtu323 = -(gtu21*gtu31*PDstandardNth3gt11) - (gtu22*gtu31 + + gtu21*gtu32)*PDstandardNth3gt12 - gtu31*gtu32*PDstandardNth3gt13 - + gtu21*gtu33*PDstandardNth3gt13 - gtu22*gtu32*PDstandardNth3gt22 - + gtu22*gtu33*PDstandardNth3gt23 - gtu32*gtu33*PDstandardNth3gt33 - + PDstandardNth3gt23*SQR(gtu32); CCTK_REAL dgtu333 = -2*(gtu31*gtu32*PDstandardNth3gt12 + gtu31*gtu33*PDstandardNth3gt13 + gtu32*gtu33*PDstandardNth3gt23) - -- cgit v1.2.3