update parameter list

project-pareto · Sep 26, 2023 · a9d4f4b · a9d4f4b
1 parent 0ecf1b5
commit a9d4f4b
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 65 deletions.
diff --git a/backend/app/internal/get_data.py b/backend/app/internal/get_data.py
@@ -621,69 +621,78 @@ def get_input_lists():
     ]
 
     parameter_list = [
-    "Units",
-    "PNA",
-    "CNA",
-    "CCA",
-    "NNA",
-    "NCA",
-    "NKA",
-    "NRA",
-    "NSA",
-    "FCA",
-    "RCA",
-    "RNA",
-    "RSA",
-    "SCA",
-    "SNA",
-    "PCT",
-    "PKT",
-    "FCT",
-    "CST",
-    "CCT",
-    "CKT",
-    "Elevation",
-    "CompletionsPadOutsideSystem",
-    "DesalinationTechnologies",
-    "DesalinationSites",
-    "TruckingTime",
-    "CompletionsDemand",
-    "PadRates",
-    "FlowbackRates",
-    "WellPressure",
-    "NodeCapacities",
-    "InitialPipelineCapacity",
-    "InitialPipelineDiameters",
-    "InitialDisposalCapacity",
-    "InitialTreatmentCapacity",
-    "FreshwaterSourcingAvailability",
-    "PadOffloadingCapacity",
-    "CompletionsPadStorage",
-    "DisposalOperationalCost",
-    "TreatmentOperationalCost",
-    "ReuseOperationalCost",
-    "PipelineOperationalCost",
-    "FreshSourcingCost",
-    "TruckingHourlyCost",
-    "PipelineDiameterValues",
-    "DisposalCapacityIncrements",
-    "InitialStorageCapacity",
-    "StorageCapacityIncrements",
-    "TreatmentCapacityIncrements",
-    "TreatmentEfficiency",
-    "RemovalEfficiency",
-    "DisposalExpansionCost",
-    "StorageExpansionCost",
-    "TreatmentExpansionCost",
-    "PipelineCapexDistanceBased",
-    "PipelineCapexCapacityBased",
-    "PipelineCapacityIncrements",
-    "PipelineExpansionDistance",
-    "Hydraulics",
-    "Economics",
-    "PadWaterQuality",
-    "StorageInitialWaterQuality",
-    "PadStorageInitialWaterQuality",
-    "DisposalOperatingCapacity",
+        "Units",
+        "PNA",
+        "CNA",
+        "CCA",
+        "NNA",
+        "NCA",
+        "NKA",
+        "NRA",
+        "NSA",
+        "FCA",
+        "RCA",
+        "RNA",
+        "RSA",
+        "SCA",
+        "SNA",
+        "ROA",
+        "SOA",
+        "NOA",
+        "PCT",
+        "PKT",
+        "FCT",
+        "CST",
+        "CCT",
+        "CKT",
+        "RST",
+        "ROT",
+        "SOT",
+        "Elevation",
+        "CompletionsPadOutsideSystem",
+        "DesalinationTechnologies",
+        "DesalinationSites",
+        "BeneficialReuseCredit",
+        "TruckingTime",
+        "CompletionsDemand",
+        "PadRates",
+        "FlowbackRates",
+        "WellPressure",
+        "NodeCapacities",
+        "InitialPipelineCapacity",
+        "InitialPipelineDiameters",
+        "InitialDisposalCapacity",
+        "InitialTreatmentCapacity",
+        "ReuseMinimum",
+        "ReuseCapacity",
+        "FreshwaterSourcingAvailability",
+        "PadOffloadingCapacity",
+        "CompletionsPadStorage",
+        "DisposalOperationalCost",
+        "TreatmentOperationalCost",
+        "ReuseOperationalCost",
+        "PipelineOperationalCost",
+        "FreshSourcingCost",
+        "TruckingHourlyCost",
+        "PipelineDiameterValues",
+        "DisposalCapacityIncrements",
+        "InitialStorageCapacity",
+        "StorageCapacityIncrements",
+        "TreatmentCapacityIncrements",
+        "TreatmentEfficiency",
+        "RemovalEfficiency",
+        "DisposalExpansionCost",
+        "StorageExpansionCost",
+        "TreatmentExpansionCost",
+        "PipelineCapexDistanceBased",
+        "PipelineCapexCapacityBased",
+        "PipelineCapacityIncrements",
+        "PipelineExpansionDistance",
+        "Hydraulics",
+        "Economics",
+        "PadWaterQuality",
+        "StorageInitialWaterQuality",
+        "PadStorageInitialWaterQuality",
+        "DisposalOperatingCapacity",
     ]
     return [set_list, parameter_list]
diff --git a/backend/app/internal/pareto_stategic_model.py b/backend/app/internal/pareto_stategic_model.py
@@ -90,7 +90,7 @@ def run_strategic_model(input_file, output_file, id, modelParameters, overrideVa
         optimality_gap = int(modelParameters["optimalityGap"])/100
     except:
         optimality_gap = 0
-    _log.info(f'optimality gap is {optimality_gap}')
+    # _log.info(f'optimality gap is {optimality_gap}')
     options = {
         "deactivate_slacks": True,
         "scale_model": modelParameters["scale_model"],