MERGE divergence cleaning feature into trunk.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@244 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

1 files changed, 41 insertions, 13 deletions

diff --git a/interface.ccl b/interface.ccl
index de24a28..50d791a 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -73,17 +73,18 @@ void FUNCTION Con2PrimGen(CCTK_INT INOUT handle, CCTK_REAL INOUT dens, \
 
 void FUNCTION Con2PrimGenM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \
                            CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \
-                           CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \
+                           CCTK_REAL INOUT tau, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \
+			   CCTK_REAL INOUT rho, \
                            CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \
                            CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \
+                           CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \
+                           CCTK_REAL INOUT Bvecsq, \
                            CCTK_REAL INOUT w_lorentz, \
                            CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \
                            CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \
                            CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \
                            CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \
                            CCTK_REAL INOUT det, \
-                           CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \
-                           CCTK_REAL INOUT Bvecsq, \
                            CCTK_INT OUT epsnegative, \
                            CCTK_REAL OUT retval)
 
@@ -101,6 +102,23 @@ void FUNCTION Con2PrimPoly(CCTK_INT IN handle, CCTK_REAL OUT dens, \
                            CCTK_REAL IN r, CCTK_REAL IN rho_min, \
 			   CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed)
 
+void FUNCTION Con2PrimPolyM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \
+                           CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \
+                           CCTK_REAL INOUT sc, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \
+			   CCTK_REAL INOUT rho, \
+                           CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \
+                           CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \
+                           CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \
+                           CCTK_REAL INOUT Bvecsq, \
+                           CCTK_REAL INOUT w_lorentz, \
+                           CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \
+                           CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \
+                           CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \
+                           CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \
+                           CCTK_REAL INOUT det, \
+                           CCTK_INT OUT epsnegative, \
+                           CCTK_REAL OUT retval)
+
 #void FUNCTION Prim2Con CCTK_INT handle, CCTK_REAL gxx, CCTK_REAL gxy, CCTK_REAL gxz, CCTK_REAL gyy, CCTK_REAL gyz, CCTK_REAL gzz, CCTK_REAL det, CCTK_REAL dens, CCTK_REAL sx, CCTK_REAL sy, CCTK_REAL sz, CCTK_REAL tau, CCTK_REAL rho, CCTK_REAL velx, CCTK_REAL vely, CCTK_REAL velz, CCTK_REAL epsilon, CCTK_REAL press, CCTK_REAL w_lorentz
 
 void FUNCTION Prim2ConGen(CCTK_INT IN handle, \
@@ -134,11 +152,12 @@ void FUNCTION Prim2ConGenM(CCTK_INT IN handle, \
                           CCTK_REAL IN det, CCTK_REAL OUT dens, \
                           CCTK_REAL OUT sx, CCTK_REAL OUT sy, \
                           CCTK_REAL OUT sz, CCTK_REAL OUT tau, \
-                          CCTK_REAL IN Bvecx, CCTK_REAL IN Bvecy, \
-                          CCTK_REAL IN Bvecz, CCTK_REAL IN rho, CCTK_REAL IN velx, \
+                          CCTK_REAL OUT Bconsx, CCTK_REAL OUT Bconsy, \
+                          CCTK_REAL OUT Bconsz, CCTK_REAL IN rho, CCTK_REAL IN velx, \
                           CCTK_REAL IN vely, \
                           CCTK_REAL IN velz, CCTK_REAL IN epsilon, \
-                          CCTK_REAL OUT press, CCTK_REAL OUT w_lorentz)
+                          CCTK_REAL OUT press, CCTK_REAL IN Bvecx, CCTK_REAL IN Bvecy, \
+                          CCTK_REAL IN Bvecz, CCTK_REAL OUT w_lorentz)
 
 void FUNCTION Prim2ConPolyM(CCTK_INT IN handle, \
                            CCTK_REAL IN gxx, CCTK_REAL IN gxy, \
@@ -147,11 +166,12 @@ void FUNCTION Prim2ConPolyM(CCTK_INT IN handle, \
                            CCTK_REAL IN det, CCTK_REAL OUT dens, \
                            CCTK_REAL OUT sx, CCTK_REAL OUT sy, \
                            CCTK_REAL OUT sz, CCTK_REAL OUT tau, \
-                           CCTK_REAL IN Bvecx, CCTK_REAL IN Bvecy, \
-                           CCTK_REAL IN Bvecz, CCTK_REAL IN rho, CCTK_REAL IN velx, \
+                           CCTK_REAL OUT Bconsx, CCTK_REAL OUT Bconsy, \
+                           CCTK_REAL OUT Bconsz, CCTK_REAL IN rho, CCTK_REAL IN velx, \
                            CCTK_REAL IN vely, \
                            CCTK_REAL IN velz, CCTK_REAL OUT epsilon, \
-                           CCTK_REAL OUT press, CCTK_REAL OUT w_lorentz)
+                           CCTK_REAL OUT press,  CCTK_REAL IN Bvecx, CCTK_REAL IN Bvecy, \
+                           CCTK_REAL IN Bvecz, CCTK_REAL OUT w_lorentz)
 
 PROVIDES FUNCTION SpatialDet WITH SpatialDeterminant LANGUAGE Fortran
 PROVIDES FUNCTION UpperMet WITH UpperMetric LANGUAGE Fortran
@@ -159,6 +179,7 @@ PROVIDES FUNCTION UpperMet WITH UpperMetric LANGUAGE Fortran
 PROVIDES FUNCTION Con2PrimPoly WITH Con2Prim_ptPolytype LANGUAGE Fortran
 PROVIDES FUNCTION Con2PrimGenM WITH GRHydro_Con2PrimM_pt LANGUAGE Fortran
 PROVIDES FUNCTION Con2PrimGen WITH Con2Prim_pt LANGUAGE Fortran
+PROVIDES FUNCTION Con2PrimPolyM WITH GRHydro_Con2PrimM_Polytype_pt LANGUAGE Fortran
 PROVIDES FUNCTION Prim2ConGen WITH prim2con LANGUAGE Fortran
 PROVIDES FUNCTION Prim2ConPoly WITH prim2conpolytype LANGUAGE Fortran
 PROVIDES FUNCTION Prim2ConGenM WITH prim2conM LANGUAGE Fortran
@@ -310,6 +331,8 @@ real tau  type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolo
 
 real scon[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta"
 
+real Bcons[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "B-field conservative variable"
+
 real Y_e_con type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Conserved electron fraction"
 
 #real bcom[3] type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "comoving magnetic field components"
@@ -328,7 +351,7 @@ real psidc type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prol
 real densrhs type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Update term for dens"
 real taurhs  type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Update term for tau"
 real srhs[3] type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Update term for s"
-real Bvecrhs[3] type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Update term for Bvec"
+real Bconsrhs[3] type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Update term for Bcons"
 
 real psidcrhs type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Update term for psidc"
 
@@ -391,7 +414,7 @@ real GRHydro_fluxes type = GF Timelevels = 1 tags='Prolongation="None" checkpoin
 
 real GRHydro_Bfluxes type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 {
-  Bvecxflux, Bvecyflux, Bveczflux
+  Bconsxflux, Bconsyflux, Bconszflux
 } "Fluxes for each B-field variable"
 
 real GRHydro_psifluxes type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
@@ -417,13 +440,18 @@ real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpo
 
 real GRHydro_MHD_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 {
-  Bvecxplus,Bvecyplus,Bveczplus,Bvecxminus,Bvecyminus,Bveczminus
+  Bconsxplus,Bconsyplus,Bconszplus,Bconsxminus,Bconsyminus,Bconszminus
 } "Conservative variables extended to the cell boundaries"
 
+real GRHydro_MHD_prim_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
+{
+  Bvecxplus,Bvecyplus,Bveczplus,Bvecxminus,Bvecyminus,Bveczminus
+} "Primitive mhd variables extended to the cell boundaries"
+
 real GRHydro_MHD_psidc_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 {
   psidcplus,psidcminus
-} "Conservative variables extended to the cell boundaries for diverence cleaning"
+} "Divergence cleaning variable extended to the cell boundaries for diverence cleaning"
 
 # real fluxweightvolume type = GF Timelevels = 1
 # {