Update auto-generated code

9 files changed, 22 insertions, 16 deletions

diff --git a/ML_BSSN/param.ccl b/ML_BSSN/param.ccl
index 920b866..16cb26b 100644
--- a/ML_BSSN/param.ccl
+++ b/ML_BSSN/param.ccl
@@ -109,7 +109,13 @@ CCTK_INT ShiftAlphaPower "ShiftAlphaPower"
 } 0
 
 restricted:
-CCTK_INT conformalmethod "0 for phi method, 1 for W method"
+CCTK_INT conformalMethod "Treatment of conformal factor"
+{
+  *:* :: ""
+} 0
+
+restricted:
+CCTK_INT useMatter "Add matter terms"
 {
   *:* :: ""
 } 0
diff --git a/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c b/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
index d33ed61..bec587d 100644
--- a/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
+++ b/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
@@ -171,7 +171,7 @@ void ML_BSSN_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir,
     /* Precompute derivatives (old style) */
     
     /* Calculate temporaries and grid functions */
-    e4phi  =  IfThen(conformalmethod,pow(phiL,-2),exp(4*phiL));
+    e4phi  =  IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
     g11  =  e4phi*gt11L;
     
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.c b/ML_BSSN/src/ML_BSSN_Minkowski.c
index 75df735..28229b7 100644
--- a/ML_BSSN/src/ML_BSSN_Minkowski.c
+++ b/ML_BSSN/src/ML_BSSN_Minkowski.c
@@ -127,7 +127,7 @@ void ML_BSSN_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_I
     /* Precompute derivatives (old style) */
     
     /* Calculate temporaries and grid functions */
-    phiL  =  IfThen(conformalmethod,1,0);
+    phiL  =  IfThen(conformalMethod,1,0);
     
     gt11L  =  1;
     
diff --git a/ML_BSSN/src/ML_BSSN_RHS.c b/ML_BSSN/src/ML_BSSN_RHS.c
index d788aa5..5dcf923 100644
--- a/ML_BSSN/src/ML_BSSN_RHS.c
+++ b/ML_BSSN/src/ML_BSSN_RHS.c
@@ -741,7 +741,7 @@ void ML_BSSN_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT con
         gt11L*gtu33*SQR(Gt133) + gt22L*gtu11*SQR(Gt213) + gt22L*gtu22*SQR(Gt223) + 2*gt23L*gtu32*SQR(Gt223) + 
         gt22L*gtu33*SQR(Gt233) + 3*gt33L*gtu11*SQR(Gt313) + 3*gt33L*gtu22*SQR(Gt323) + 3*gt33L*gtu33*SQR(Gt333);
     
-    fac1  =  IfThen(conformalmethod,-(khalf*INV(phiL)),1);
+    fac1  =  IfThen(conformalMethod,-(khalf*INV(phiL)),1);
     
     cdphi1  =  fac1*PDstandardNth1phi;
     
@@ -749,7 +749,7 @@ void ML_BSSN_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT con
     
     cdphi3  =  fac1*PDstandardNth3phi;
     
-    fac2  =  IfThen(conformalmethod,khalf*pow(phiL,-2),0);
+    fac2  =  IfThen(conformalMethod,khalf*pow(phiL,-2),0);
     
     cdphi211  =  -(fac1*(-PDstandardNth11phi + Gt111*PDstandardNth1phi + Gt211*PDstandardNth2phi + 
              Gt311*PDstandardNth3phi)) + fac2*SQR(PDstandardNth1phi);
@@ -825,7 +825,7 @@ void ML_BSSN_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT con
     
     Atu33  =  Atm31*gtu31 + Atm32*gtu32 + Atm33*gtu33;
     
-    e4phi  =  IfThen(conformalmethod,pow(phiL,-2),exp(4*phiL));
+    e4phi  =  IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
     em4phi  =  INV(e4phi);
     
@@ -903,8 +903,8 @@ void ML_BSSN_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT con
     
     phirhsL  =  PDupwindNth1(phi, i, j, k)*beta1L + PDupwindNth2(phi, i, j, k)*beta2L + 
         PDupwindNth3(phi, i, j, k)*beta3L + (PDstandardNth1beta1 + PDstandardNth2beta2 + PDstandardNth3beta3)*
-         IfThen(conformalmethod,-(kthird*phiL),0.16666666666666666) + 
-        alphaL*trKL*IfThen(conformalmethod,kthird*phiL,-0.16666666666666666);
+         IfThen(conformalMethod,-(kthird*phiL),0.16666666666666666) + 
+        alphaL*trKL*IfThen(conformalMethod,kthird*phiL,-0.16666666666666666);
     
     gt11rhsL  =  -2*alphaL*At11L + PDupwindNth1(gt11, i, j, k)*beta1L + PDupwindNth2(gt11, i, j, k)*beta2L + 
         PDupwindNth3(gt11, i, j, k)*beta3L + 2*(gt12L*PDstandardNth1beta2 + gt13L*PDstandardNth1beta3) + 
diff --git a/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c b/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c
index a2a25c8..cd5b2d2 100644
--- a/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c
+++ b/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c
@@ -185,7 +185,7 @@ void ML_BSSN_RHSRadiativeBoundary_Body(cGH const * const cctkGH, CCTK_INT const
     
     gtu33  =  INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    em4phi  =  IfThen(conformalmethod,SQR(phiL),exp(-4*phiL));
+    em4phi  =  IfThen(conformalMethod,SQR(phiL),exp(-4*phiL));
     
     gu11  =  em4phi*gtu11;
     
diff --git a/ML_BSSN/src/ML_BSSN_boundary.c b/ML_BSSN/src/ML_BSSN_boundary.c
index 18e4726..c44bca2 100644
--- a/ML_BSSN/src/ML_BSSN_boundary.c
+++ b/ML_BSSN/src/ML_BSSN_boundary.c
@@ -127,7 +127,7 @@ void ML_BSSN_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
     /* Precompute derivatives (old style) */
     
     /* Calculate temporaries and grid functions */
-    phiL  =  IfThen(conformalmethod,1,0);
+    phiL  =  IfThen(conformalMethod,1,0);
     
     gt11L  =  1;
     
diff --git a/ML_BSSN/src/ML_BSSN_constraints.c b/ML_BSSN/src/ML_BSSN_constraints.c
index e1e1ba3..bab2155 100644
--- a/ML_BSSN/src/ML_BSSN_constraints.c
+++ b/ML_BSSN/src/ML_BSSN_constraints.c
@@ -663,7 +663,7 @@ void ML_BSSN_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
         gt11L*gtu33*SQR(Gt133) + gt22L*gtu11*SQR(Gt213) + gt22L*gtu22*SQR(Gt223) + 2*gt23L*gtu32*SQR(Gt223) + 
         gt22L*gtu33*SQR(Gt233) + 3*gt33L*gtu11*SQR(Gt313) + 3*gt33L*gtu22*SQR(Gt323) + 3*gt33L*gtu33*SQR(Gt333);
     
-    fac1  =  IfThen(conformalmethod,-(khalf*INV(phiL)),1);
+    fac1  =  IfThen(conformalMethod,-(khalf*INV(phiL)),1);
     
     cdphi1  =  fac1*PDstandardNth1phi;
     
@@ -671,7 +671,7 @@ void ML_BSSN_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
     
     cdphi3  =  fac1*PDstandardNth3phi;
     
-    fac2  =  IfThen(conformalmethod,khalf*pow(phiL,-2),0);
+    fac2  =  IfThen(conformalMethod,khalf*pow(phiL,-2),0);
     
     cdphi211  =  -(fac1*(-PDstandardNth11phi + Gt111*PDstandardNth1phi + Gt211*PDstandardNth2phi + 
              Gt311*PDstandardNth3phi)) + fac2*SQR(PDstandardNth1phi);
@@ -717,7 +717,7 @@ void ML_BSSN_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
              2*(cdphi213*gtu31 + cdphi223*gtu32) + cdphi233*gtu33 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
              gtu22*(cdphi222 + 2*SQR(cdphi2))) + 2*(-1 + gt33L*gtu33)*SQR(cdphi3));
     
-    e4phi  =  IfThen(conformalmethod,pow(phiL,-2),exp(4*phiL));
+    e4phi  =  IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
     em4phi  =  INV(e4phi);
     
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
index 45b9fda..90cd41c 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
@@ -189,9 +189,9 @@ void ML_BSSN_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const di
     
     gu33  =  INV(detg)*(g11*g22 - SQR(g12));
     
-    phiL  =  IfThen(conformalmethod,pow(detg,-0.16666666666666666),Log(detg)/12.);
+    phiL  =  IfThen(conformalMethod,pow(detg,-0.16666666666666666),Log(detg)/12.);
     
-    em4phi  =  IfThen(conformalmethod,SQR(phiL),exp(-4*phiL));
+    em4phi  =  IfThen(conformalMethod,SQR(phiL),exp(-4*phiL));
     
     gt11L  =  em4phi*g11;
     
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBase.c b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
index 1fd7424..be7aed4 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
@@ -178,7 +178,7 @@ void ML_BSSN_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir,
     
     dir3  =  Sign(beta3L);
     
-    e4phi  =  IfThen(conformalmethod,pow(phiL,-2),exp(4*phiL));
+    e4phi  =  IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
     g11  =  e4phi*gt11L;