Merge branch 'main' into integrate_desal

Sakshi21299 · Jun 3, 2024 · 6df9bb4 · 6df9bb4
2 parents 03d6074 + 243ece6
commit 6df9bb4
Show file tree

Hide file tree

Showing 31 changed files with 1,620 additions and 2,032 deletions.
diff --git a/docs/utilities/Get_Data.rst b/docs/utilities/Get_Data.rst
@@ -25,7 +25,7 @@ Get Data
 **Method Description:**
 
 This method uses Pandas methods to read data for sets and parameters from an
-Excel spreadsheet. Sets are assumed to not have neither a header nor an index column.
+Excel spreadsheet. Sets are assumed to have neither a header nor an index column.
 In addition, the data should be placed in column A, row 2, for example:
 
 
@@ -52,12 +52,17 @@ and a dictionary that contains parameters in the following format:
 
 **How to Use**::
 
- set_list = ['ProductionPads','CompletionsPads'], parameter_list = ['DriveTimes', 'CompletionsDemand]
+ set_list = ['ProductionPads','CompletionsPads']
+ parameter_list = ['DriveTimes', 'CompletionsDemand']
  fpath = 'path\\to\\excel\\file.xlsx’
+ # Note: set_list and parameter_list are optional parameters. When not given, only tabs with valid PARETO input tab names will be read.
  [df_sets, df_parameters] = get_data(fpath, set_list, parameter_list)
 
 
 
+.. note::
+    Custom data tabs can optionally be passed to the function as shown above. If the custom data tabs include invalid PARETO input, the data is not incorporated into the PARETO model unless the models are modified.
+
 .. _get_data_set_consistency_check:
 
 Set Consistency Check

diff --git a/pareto/examples/multiobjective_optimization/seismicity_vs_cost_MOO.ipynb b/pareto/examples/multiobjective_optimization/seismicity_vs_cost_MOO.ipynb
@@ -50,122 +50,11 @@
     "from pyomo.environ import Constraint, Param, value, TerminationCondition, SolverStatus\n",
     "from importlib import resources\n",
     "\n",
-    "# This emulates what the pyomo command-line tools does\n",
-    "# Tabs in the input Excel spreadsheet\n",
-    "set_list = [\n",
-    "    \"ProductionPads\",\n",
-    "    \"CompletionsPads\",\n",
-    "    \"SWDSites\",\n",
-    "    \"ExternalWaterSources\",\n",
-    "    \"WaterQualityComponents\",\n",
-    "    \"StorageSites\",\n",
-    "    \"TreatmentSites\",\n",
-    "    \"ReuseOptions\",\n",
-    "    \"NetworkNodes\",\n",
-    "    \"PipelineDiameters\",\n",
-    "    \"StorageCapacities\",\n",
-    "    \"InjectionCapacities\",\n",
-    "    \"TreatmentCapacities\",\n",
-    "    \"TreatmentTechnologies\",\n",
-    "]\n",
-    "parameter_list = [\n",
-    "    \"Units\",\n",
-    "    \"PNA\",\n",
-    "    \"CNA\",\n",
-    "    \"CCA\",\n",
-    "    \"NNA\",\n",
-    "    \"NCA\",\n",
-    "    \"NKA\",\n",
-    "    \"NRA\",\n",
-    "    \"NSA\",\n",
-    "    \"FCA\",\n",
-    "    \"RCA\",\n",
-    "    \"RNA\",\n",
-    "    \"RSA\",\n",
-    "    \"SCA\",\n",
-    "    \"SNA\",\n",
-    "    \"ROA\",\n",
-    "    \"RKA\",\n",
-    "    \"SOA\",\n",
-    "    \"NOA\",\n",
-    "    \"PCT\",\n",
-    "    \"PKT\",\n",
-    "    \"FCT\",\n",
-    "    \"CST\",\n",
-    "    \"CCT\",\n",
-    "    \"CKT\",\n",
-    "    \"RST\",\n",
-    "    \"ROT\",\n",
-    "    \"SOT\",\n",
-    "    \"RKT\",\n",
-    "    \"Elevation\",\n",
-    "    \"CompletionsPadOutsideSystem\",\n",
-    "    \"DesalinationTechnologies\",\n",
-    "    \"DesalinationSites\",\n",
-    "    \"BeneficialReuseCost\",\n",
-    "    \"BeneficialReuseCredit\",\n",
-    "    \"TruckingTime\",\n",
-    "    \"CompletionsDemand\",\n",
-    "    \"PadRates\",\n",
-    "    \"FlowbackRates\",\n",
-    "    \"WellPressure\",\n",
-    "    \"NodeCapacities\",\n",
-    "    \"InitialPipelineCapacity\",\n",
-    "    \"InitialPipelineDiameters\",\n",
-    "    \"InitialDisposalCapacity\",\n",
-    "    \"InitialTreatmentCapacity\",\n",
-    "    \"ReuseMinimum\",\n",
-    "    \"ReuseCapacity\",\n",
-    "    \"ExtWaterSourcingAvailability\",\n",
-    "    \"PadOffloadingCapacity\",\n",
-    "    \"CompletionsPadStorage\",\n",
-    "    \"DisposalOperationalCost\",\n",
-    "    \"TreatmentOperationalCost\",\n",
-    "    \"ReuseOperationalCost\",\n",
-    "    \"PipelineOperationalCost\",\n",
-    "    \"ExternalSourcingCost\",\n",
-    "    \"TruckingHourlyCost\",\n",
-    "    \"PipelineDiameterValues\",\n",
-    "    \"DisposalCapacityIncrements\",\n",
-    "    \"InitialStorageCapacity\",\n",
-    "    \"StorageCapacityIncrements\",\n",
-    "    \"TreatmentCapacityIncrements\",\n",
-    "    \"TreatmentEfficiency\",\n",
-    "    \"RemovalEfficiency\",\n",
-    "    \"DisposalExpansionCost\",\n",
-    "    \"StorageExpansionCost\",\n",
-    "    \"TreatmentExpansionCost\",\n",
-    "    \"PipelineCapexDistanceBased\",\n",
-    "    \"PipelineCapexCapacityBased\",\n",
-    "    \"PipelineCapacityIncrements\",\n",
-    "    \"PipelineExpansionDistance\",\n",
-    "    \"Hydraulics\",\n",
-    "    \"Economics\",\n",
-    "    \"ExternalWaterQuality\",\n",
-    "    \"PadWaterQuality\",\n",
-    "    \"StorageInitialWaterQuality\",\n",
-    "    \"PadStorageInitialWaterQuality\",\n",
-    "    \"DisposalOperatingCapacity\",\n",
-    "    \"TreatmentExpansionLeadTime\",\n",
-    "    \"DisposalExpansionLeadTime\",\n",
-    "    \"StorageExpansionLeadTime\",\n",
-    "    \"PipelineExpansionLeadTime_Dist\",\n",
-    "    \"PipelineExpansionLeadTime_Capac\",\n",
-    "    \"SWDDeep\",\n",
-    "    \"SWDAveragePressure\",\n",
-    "    \"SWDProxPAWell\",\n",
-    "    \"SWDProxInactiveWell\",\n",
-    "    \"SWDProxEQ\",\n",
-    "    \"SWDProxFault\",\n",
-    "    \"SWDProxHpOrLpWell\",\n",
-    "    \"SWDRiskFactors\",\n",
-    "]\n",
-    "\n",
     "with resources.path(\n",
     "    \"pareto.case_studies\",\n",
     "    \"strategic_toy_case_study.xlsx\",\n",
     ") as fpath:\n",
-    "    [df_sets, df_parameters] = get_data(fpath, set_list, parameter_list)"
+    "    [df_sets, df_parameters] = get_data(fpath)"
    ]
   },
   {