ngiab-data-preprocess 4.0.1__tar.gz → 4.0.3__tar.gz

{ngiab_data_preprocess-4.0.1 → ngiab_data_preprocess-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ngiab_data_preprocess
-Version: 4.0.1
+Version: 4.0.3
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess

{ngiab_data_preprocess-4.0.1 → ngiab_data_preprocess-4.0.3}/modules/data_sources/em-realization-template.json

@@ -10,29 +10,7 @@
           "init_config": "",
           "allow_exceed_end_time": true,
           "main_output_variable": "land_surface_water__runoff_depth",
-          "modules": [
-            {
-              "name": "bmi_c++",
-              "params": {
-                "name": "bmi_c++",
-                "model_type_name": "SLOTH",
-                "main_output_variable": "z",
-                "init_config": "/dev/null",
-                "allow_exceed_end_time": true,
-                "fixed_time_step": false,
-                "uses_forcing_file": false,
-                "model_params": {
-                  "land_surface_air__pressure": 0.0,
-                  "atmosphere_air_water~vapor__relative_saturation": 0.0,
-                  "land_surface_radiation~incoming~shortwave__energy_flux": 0.0,
-                  "land_surface_radiation~incoming~longwave__energy_flux": 0.0,
-                  "land_surface_wind__x_component_of_velocity": 0.0,
-                  "land_surface_wind__y_component_of_velocity": 0.0
-                },
-                "library_file": "/dmod/shared_libs/libslothmodel.so",
-                "registration_function": "none"
-              }
-            },
+          "modules": [            
             {
               "name": "bmi_python",
               "params": {

{ngiab_data_preprocess-4.0.1 → ngiab_data_preprocess-4.0.3}/modules/ngiab_data_cli/__main__.py

@@ -194,12 +194,12 @@ def main() -> None:
                 num_partitions = int(f.read())
 
             try:
-                subprocess.run("docker pull joshcu/ngiab", shell=True)
+                subprocess.run("docker pull awiciroh/ciroh-ngen-image:latest", shell=True)
             except:
                 logging.error("Docker is not running, please start Docker and try again.")
             try:
-                command = f'docker run --rm -it -v "{str(paths.subset_dir)}:/ngen/ngen/data" joshcu/ngiab /ngen/ngen/data/ auto {num_partitions} local'
-                # command = f'docker run --rm -it -v "{str(paths.subset_dir)}:/ngen/ngen/data" awiciroh/ciroh-ngen-image:latest-x86 /ngen/ngen/data/ auto {num_partitions}'
+                #command = f'docker run --rm -it -v "{str(paths.subset_dir)}:/ngen/ngen/data" joshcu/ngiab /ngen/ngen/data/ auto {num_partitions} local'
+                command = f'docker run --rm -it -v "{str(paths.subset_dir)}:/ngen/ngen/data" awiciroh/ciroh-ngen-image:latest /ngen/ngen/data/ auto {num_partitions} local'
                 subprocess.run(command, shell=True)
                 logging.info("Next Gen run complete.")
             except:

{ngiab_data_preprocess-4.0.1 → ngiab_data_preprocess-4.0.3}/modules/ngiab_data_preprocess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ngiab_data_preprocess
-Version: 4.0.1
+Version: 4.0.3
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess

{ngiab_data_preprocess-4.0.1 → ngiab_data_preprocess-4.0.3}/pyproject.toml

@@ -12,7 +12,7 @@ exclude = ["tests*"]
 
 [project]
 name = "ngiab_data_preprocess"
-version = "v4.0.1"
+version = "v4.0.3"
 authors = [{ name = "Josh Cunningham", email = "jcunningham8@ua.edu" }]
 description = "Graphical Tools for creating Next Gen Water model input data."
 readme = "README.md"