Fixed a few missed bugs

VirtualPlanetaryLaboratory · Sep 13, 2024 · d02a6d7 · d02a6d7
1 parent f706ce9
commit d02a6d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/examples/CosmicShoreline/CosmicShoreline.png b/examples/CosmicShoreline/CosmicShoreline.png
diff --git a/examples/CosmicShoreline/makeplot.py b/examples/CosmicShoreline/makeplot.py
@@ -20,17 +20,17 @@
 # Plot!
 fig = plt.figure(figsize=(8.5, 6))
 
-fxuv_earth = output.log.final.Earth.CumulativeFXUV
+fxuv_earth = output.log.final.Earth.CumulativeXUVFlux
 
 fxuv = []
-fxuv.append(output.log.final.Mercury.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.Venus.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.Earth.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.Mars.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.Jupiter.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.Saturn.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.George.CumulativeFXUV/fxuv_earth)
-fxuv.append(output.log.final.Neptune.CumulativeFXUV/fxuv_earth)
+fxuv.append(output.log.final.Mercury.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.Venus.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.Earth.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.Mars.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.Jupiter.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.Saturn.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.George.CumulativeXUVFlux/fxuv_earth)
+fxuv.append(output.log.final.Neptune.CumulativeXUVFlux/fxuv_earth)
 
 escvel = []
 escvel.append(output.log.final.Mercury.EscapeVelocity/1e3)

diff --git a/src/evolve.c b/src/evolve.c
@@ -652,7 +652,6 @@ void Evolve(BODY *body, CONTROL *control, FILES *files, MODULE *module,
 
   fvCumulative(body,control,system,dDt);
 
-
   /* Write out initial conditions */
   WriteOutput(body, control, files, output, system, update, fnWrite);
 
@@ -721,6 +720,8 @@ void Evolve(BODY *body, CONTROL *control, FILES *files, MODULE *module,
        was prior to loop. */
     PropertiesAuxiliary(body, control, system, update);
 
+  fvCumulative(body,control,system,dDt);
+
     // If control->Evolve.bFirstStep hasn't been switched off by now, do so.
     if (control->Evolve.bFirstStep) {
       control->Evolve.bFirstStep = 0;