some tweaks

blue-marble · Jan 9, 2025 · d77c2eb · d77c2eb
1 parent 4420578
commit d77c2eb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 139 deletions.
diff --git a/...ect/opchar/var_profiles/common_methods.py → data_toolkit/project/common_methods.py b/...ect/opchar/var_profiles/common_methods.py → data_toolkit/project/common_methods.py
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Blue Marble Analytics LLC.
+# Copyright 2016-2025 Blue Marble Analytics LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,13 @@
 
 
 def create_iterations_csv(
-    iterations_directory, project, profile_id, profile_name, overwrite
+    iterations_directory,
+    project,
+    profile_id,
+    profile_name,
+    varies_by_weather,
+    varies_by_hydro,
+    overwrite,
 ):
     filename = os.path.join(
         iterations_directory,
@@ -28,8 +34,8 @@ def create_iterations_csv(
 
     df = pd.DataFrame(
         {
-            "varies_by_weather_iteration": [1],
-            "varies_by_hydro_iteration": [0],
+            "varies_by_weather_iteration": [varies_by_weather],
+            "varies_by_hydro_iteration": [varies_by_hydro],
         }
     )
 

diff --git a/data_toolkit/project/create_monte_carlo_gen_input_csvs_common.py b/data_toolkit/project/create_monte_carlo_gen_input_csvs_common.py
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Blue Marble Analytics LLC.
+# Copyright 2016-2025 Blue Marble Analytics LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 import os.path
 import pandas as pd
 
-from data_toolkit.project.opchar.var_profiles.common_methods import (
+from data_toolkit.project.common_methods import (
     create_iterations_csv,
 )
 from db.common_functions import connect_to_database
@@ -212,6 +212,8 @@ def create_project_csv(
             project=project,
             profile_id=profile_scenario_id,
             profile_name=profile_scenario_name,
+            varies_by_weather=1,
+            varies_by_hydro=0,
             overwrite=True,
         )
 

diff --git a/data_toolkit/project/opchar/var_profiles/create_sync_var_gen_input_csvs.py b/data_toolkit/project/opchar/var_profiles/create_sync_var_gen_input_csvs.py
@@ -50,7 +50,7 @@
 import os.path
 import sys
 
-from data_toolkit.project.opchar.var_profiles.common_methods import (
+from data_toolkit.project.common_methods import (
     create_iterations_csv,
 )
 from db.common_functions import connect_to_database
@@ -148,6 +148,8 @@ def create_variable_profile_csvs_pool(pool_datum):
         project=project,
         profile_id=variable_generator_profile_scenario_id,
         profile_name=variable_generator_profile_scenario_name,
+        varies_by_weather=1,
+        varies_by_hydro=0,
         overwrite=True,
     )