Merge pull request #76 from JETSCAPE/roch/in_memory_fixes

Hendrik1704 · web-flow · commit 1a24fb115525 · 2025-03-20T16:31:34.000-04:00
Logic for checking preequilibrium nullptr in XSCAPE mode
diff --git a/src/hydro/MusicWrapper.cc b/src/hydro/MusicWrapper.cc
@@ -255,7 +255,7 @@ void MpiMusic::InitializeHydroEnergyProfile() {
       pre_eq_ptr->pi33_, pre_eq_ptr->bulk_Pi_);
   }
 
-  if (pre_eq_ptr == nullptr) {
+  if (pre_eq_ptr == nullptr && (initialProfile_ != 13 && initialProfile_ != 131)) {
     JSWARN << "Missing the pre-equilibrium module ...";
     exit(1);
   }
@@ -298,7 +298,7 @@ void MpiMusic::EvolveHydro() {
     has_source_terms = true;
   }
 
-  if (flag_preEq_output_evo_to_memory == 1) {
+  if (flag_preEq_output_evo_to_memory == 1 && pre_eq_ptr != nullptr) {
     double tau0 = pre_eq_ptr->GetPreequilibriumEndTime();
     JSINFO << "hydro initial time set by PreEq module tau0 = "
            << tau0 << " fm/c";

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ void MpiMusic::InitializeHydroEnergyProfile() {`
`255`	`255`	`pre_eq_ptr->pi33_, pre_eq_ptr->bulk_Pi_);`
`256`	`256`	`}`
`257`	`257`
`258`		`- if (pre_eq_ptr == nullptr) {`
	`258`	`+ if (pre_eq_ptr == nullptr && (initialProfile_ != 13 && initialProfile_ != 131)) {`
`259`	`259`	`JSWARN << "Missing the pre-equilibrium module ...";`
`260`	`260`	`exit(1);`
`261`	`261`	`}`
`@@ -298,7 +298,7 @@ void MpiMusic::EvolveHydro() {`
`298`	`298`	`has_source_terms = true;`
`299`	`299`	`}`
`300`	`300`
`301`		`- if (flag_preEq_output_evo_to_memory == 1) {`
	`301`	`+ if (flag_preEq_output_evo_to_memory == 1 && pre_eq_ptr != nullptr) {`
`302`	`302`	`double tau0 = pre_eq_ptr->GetPreequilibriumEndTime();`
`303`	`303`	`JSINFO << "hydro initial time set by PreEq module tau0 = "`
`304`	`304`	`<< tau0 << " fm/c";`