Fix revert conflict in Outputs.py

softwareengineerprogrammer · Nov 13, 2023 · f119e46 · f119e46
1 parent 8a582ec
commit f119e46
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py
@@ -159,9 +159,9 @@ def PrintOutputs(self, model: Model):
                     f.write(f"      Geothermal gradient:                                {model.reserv.gradient.value[0]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
                 else:
                     for i in range(1, model.reserv.numseg.value):
-                        f.write(f"      Segment {str(i):s}   Geothermal gradient:                      {model.reserv.gradient.value[i-1]:10.4f} " + model.reserv.gradient.CurrentUnits.value +NL)
-                        f.write(f"      Segment {str(i):s}   Thickness (km):                           {model.reserv.layerthickness.value[i-1]:10.0f} " + model.reserv.layerthickness.CurrentUnits.value + NL)
-                        f.write(f"      Segment {str(i+1):s} Geothermal gradient:                      {model.reserv.gradient.value[i]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
+                        f.write(f"      Segment {str(i):s}   Geothermal gradient:                    {model.reserv.gradient.value[i-1]:10.4f} " + model.reserv.gradient.CurrentUnits.value +NL)
+                        f.write(f"      Segment {str(i):s}   Thickness:                         {model.reserv.layerthickness.value[i-1]:10.0f} " + model.reserv.layerthickness.CurrentUnits.value + NL)
+                    f.write(f"      Segment {str(i+1):s}   Geothermal gradient:                    {model.reserv.gradient.value[i]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
 
                 f.write(NL)
                 f.write(NL)
@@ -214,9 +214,11 @@ def PrintOutputs(self, model: Model):
                     f.write(f"      Geothermal gradient:                                {model.reserv.gradient.value[0]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
                 else:
                     for i in range(1, model.reserv.numseg.value):
-                        f.write(f"      Segment " + str(i) + " geothermal gradient:                   {model.reserv.gradient.value[i-1]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
-                        f.write(f"      Segment " + str(i) + " thickness:                           {model.reserv.layerthickness.value[i-1]:10.0f} " + model.reserv.layerthickness.CurrentUnits.value + NL)
-                        f.write(f"      Segment " + str(i+1) + " geothermal gradient:                   {model.reserv.gradient.value[i]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
+                        f.write(f"      Segment {str(i):s}   Geothermal gradient:                    {model.reserv.gradient.value[i-1]:10.4f} " + model.reserv.gradient.CurrentUnits.value +NL)
+                        f.write(f"      Segment {str(i):s}   Thickness:                         {model.reserv.layerthickness.value[i-1]:10.0f} " + model.reserv.layerthickness.CurrentUnits.value + NL)
+                    f.write(f"      Segment {str(i+1):s}   Geothermal gradient:                    {model.reserv.gradient.value[i]:10.4f} " + model.reserv.gradient.CurrentUnits.value + NL)
+
+
 
                 f.write(NL)
                 f.write(NL)