Merge pull request #18 from hardsnow-sandia/tredwar-dev

Tredwar dev
IDAES · Jul 5, 2024 · b3c96ec · b3c96ec
2 parents 3951ab7 + cbed644
commit b3c96ec
Show file tree

Hide file tree

Showing 4 changed files with 804 additions and 114 deletions.
diff --git a/.gitignore b/.gitignore
@@ -168,4 +168,8 @@ cython_debug/
 *.json
 
 # ignore .DS_Store
-*.DS_Store
+*.DS_Store
+
+# ignore "data"
+*.csv
+*.xlsx
diff --git a/gtep/driver.py b/gtep/driver.py
@@ -27,19 +27,29 @@
 mod_object.results = opt.solve(mod_object.model)
 
 
-save_numerical_results = False
-if save_numerical_results:
-
-    sol_object = ExpansionPlanningSolution()
-
-    sol_object.load_from_model(mod_object)
-    sol_object.dump_json()
-load_numerical_results = False
-if load_numerical_results:
-    # sol_object.read_json("./gtep_solution.json")
-    sol_object.read_json("./bigger_longer_wigglier_gtep_solution.json")
-plot_results = False
-if plot_results:
-    sol_object.plot_levels(save_dir="./plots/")
+sol_object.import_data_object(data_object)
+
+# sol_object.read_json("./gtep_lots_of_buses_solution.json")  # "./gtep/data/WECC_USAEE"
+sol_object.read_json("./gtep_11bus_solution.json")  # "./gtep/data/WECC_Reduced_USAEE"
+# sol_object.read_json("./gtep_solution.json")
+# sol_object.read_json("./updated_gtep_solution_test.json")
+# sol_object.read_json("./gtep_wiggles.json")
+sol_object.plot_levels(save_dir="./plots/")
+
+# save_numerical_results = False
+# if save_numerical_results:
+
+#     sol_object = ExpansionPlanningSolution()
+
+#     sol_object.load_from_model(mod_object)
+#     sol_object.dump_json()
+# load_numerical_results = False
+# if load_numerical_results:
+#     # sol_object.read_json("./gtep_solution.json")
+#     sol_object.read_json("./bigger_longer_wigglier_gtep_solution.json")
+# plot_results = False
+# if plot_results:
+#     sol_object.plot_levels(save_dir="./plots/")
+
 
 pass