Order client result fields such that total opex is displayed as last line item by default

Author: softwareengineerprogrammer

src/geophires_x_client/geophires_x_result.py

@@ -284,14 +284,14 @@ class GeophiresXResult:
                 'Annual District Heating O&M Cost',
                 'Average Annual Peaking Fuel Cost',
                 'Average annual pumping costs',
-                'Total operating and maintenance costs',
-                # AGS/CLGS
-                'OPEX',
                 # SUTRA
                 'Average annual auxiliary fuel cost',
                 'Average annual pumping cost',
                 'Redrilling costs',
                 'Total average annual O&M costs',
+                'Total operating and maintenance costs',
+                # AGS/CLGS
+                'OPEX',
             ],
             'SURFACE EQUIPMENT SIMULATION RESULTS': [
                 'Initial geofluid availability',

src/geophires_x_schema_generator/geophires-result.json

@@ -436,20 +436,20 @@
           "units": "MUSD/yr"
         },
         "Average annual pumping costs": {},
-        "Total operating and maintenance costs": {
-          "type": "number",
-          "description": "Total O&M Cost",
-          "units": "MUSD/yr"
-        },
-        "OPEX": {},
         "Average annual auxiliary fuel cost": {},
         "Average annual pumping cost": {},
         "Redrilling costs": {
           "type": "number",
           "description": "Total redrilling costs over the Plant Lifetime are calculated as (Drilling and completion costs + Stimulation costs) \u00d7 Number of times redrilling. The total is then divided over Plant Lifetime years to calculate Redrilling costs per year.",
           "units": "MUSD/yr"
         },
-        "Total average annual O&M costs": {}
+        "Total average annual O&M costs": {},
+        "Total operating and maintenance costs": {
+          "type": "number",
+          "description": "Total O&M Cost",
+          "units": "MUSD/yr"
+        },
+        "OPEX": {}
       }
     },
     "SURFACE EQUIPMENT SIMULATION RESULTS": {