Merge branch 'main' into main

jaykalinani · Sep 11, 2024 · f555009 · f555009
2 parents 69b0757 + 985e0a3
commit f555009
Show file tree

Hide file tree

Showing 50 changed files with 768 additions and 698 deletions.
diff --git a/AsterSeeds/configuration.ccl b/AsterSeeds/configuration.ccl
@@ -1,3 +1,3 @@
 # Configuration definitions for thorn AsterSeeds
 
-REQUIRES Loop EOSX
+REQUIRES Loop EOSX AsterUtils
diff --git a/AsterSeeds/interface.ccl b/AsterSeeds/interface.ccl
@@ -5,6 +5,7 @@ INHERITS: HydroBaseX AsterX
 
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: eos.hxx eos_idealgas.hxx
+USES INCLUDE HEADER: aster_fd.hxx aster_interp.hxx aster_utils.hxx
 
 CCTK_REAL Avec_cent TYPE=gf CENTERING={ccc} TAGS='checkpoint="no"'
 {

diff --git a/AsterSeeds/param.ccl b/AsterSeeds/param.ccl
@@ -26,6 +26,7 @@ KEYWORD test_case "Name of the testcase" STEERABLE=never
 
   "spherical shock"          :: ""
   "magTOV"                   :: ""
+  "magBNS"                   :: ""
 } "Balsara1"
 
 private:
@@ -114,17 +115,19 @@ REAL r0 "Characteristic radial offset" STEERABLE=ALWAYS
   *:*     :: "Anything"
 } 0.0
 
-REAL dipole_x "x-coordinate of dipole center" STEERABLE=ALWAYS
+# coordinates of dipole center, to be based on the location of maximum of rho
+
+REAL dipole_x[2] "x-coordinate of dipole center" STEERABLE=ALWAYS
 {
   *:*     :: "Anything"
 } 0.0
 
-REAL dipole_y "y-coordinate of the dipole center" STEERABLE=ALWAYS
+REAL dipole_y[2] "y-coordinate of the dipole center" STEERABLE=ALWAYS
 {
   *:*     :: "Anything"
 } 0.0
 
-REAL dipole_z "z-coordinate of the dipole center" STEERABLE=ALWAYS
+REAL dipole_z[2] "z-coordinate of the dipole center" STEERABLE=ALWAYS
 {
   *:*     :: "Anything"
 } 0.0

diff --git a/AsterSeeds/schedule.ccl b/AsterSeeds/schedule.ccl
@@ -53,19 +53,41 @@ if (CCTK_Equals(test_type, "3DTest")) {
   if (CCTK_Equals(test_case, "magTOV")) {
 
     STORAGE: Avec_cent
-    SCHEDULE AsterSeeds_InitializeCenteredAvec AT initial AFTER HydroBaseX_PostInitial BEFORE AsterX_InitialGroup {
+    SCHEDULE AsterSeeds_InitializeCenteredAvec_TOV AT initial AFTER HydroBaseX_PostInitial BEFORE AsterX_InitialGroup {
     LANG: C 
     READS: HydroBaseX::press(everywhere) 
     WRITES: Avec_x_cent(everywhere) Avec_y_cent(everywhere) Avec_z_cent(everywhere)
     }
     "Set up initial conditions for the cell-centered vector potential"
 
-    SCHEDULE AsterSeeds_InitializeStagAvec AT initial AFTER AsterSeeds_InitializeCenteredAvec BEFORE AsterX_InitialGroup {
+    SCHEDULE AsterSeeds_InitializeStagAvec_TOV AT initial AFTER AsterSeeds_InitializeCenteredAvec_TOV BEFORE AsterX_InitialGroup {
     LANG: C 
     READS: Avec_x_cent(everywhere) Avec_y_cent(everywhere) Avec_z_cent(everywhere) 
     WRITES: AsterX::Avec_x(interior) AsterX::Avec_y(interior) AsterX::Avec_z(interior) 
     SYNC: AsterX::Avec_x AsterX::Avec_y AsterX::Avec_z
     }
     "Set up initial conditions for the vector potential"
   }
+
+  #Initial conditions for magnetic field for BNS
+
+  if (CCTK_Equals(test_case, "magBNS")) {
+
+    STORAGE: Avec_cent
+    SCHEDULE AsterSeeds_InitializeCenteredAvec_BNS AT initial AFTER HydroBaseX_PostInitial BEFORE AsterX_InitialGroup {
+    LANG: C
+    READS: HydroBaseX::press(everywhere)
+    WRITES: Avec_x_cent(everywhere) Avec_y_cent(everywhere) Avec_z_cent(everywhere)
+    }
+    "Set up initial conditions for the cell-centered vector potential"
+
+    SCHEDULE AsterSeeds_InitializeStagAvec_BNS AT initial AFTER AsterSeeds_InitializeCenteredAvec_BNS BEFORE AsterX_InitialGroup {
+    LANG: C
+    READS: Avec_x_cent(everywhere) Avec_y_cent(everywhere) Avec_z_cent(everywhere)
+    WRITES: AsterX::Avec_x(interior) AsterX::Avec_y(interior) AsterX::Avec_z(interior)
+    SYNC: AsterX::Avec_x AsterX::Avec_y AsterX::Avec_z
+    }
+    "Set up initial conditions for the vector potential"
+  }
+
 }