Merge pull request #93 from changliao1025/development

Development
changliao1025 · May 9, 2024 · da49f6b · da49f6b
2 parents 736887e + 596bfa6
commit da49f6b
Show file tree

Hide file tree

Showing 19 changed files with 402 additions and 322 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -3,8 +3,8 @@ message: "If you use this software, please cite it as below."
 authors:
   - family-names: Liao
     given-names: Chang
-    orcid: https://orcid.org/0000-0002-7348-8858  
+    orcid: https://orcid.org/0000-0002-7348-8858
 title: "HexWatershed: a mesh-independent flow direction model for hydrologic models"
-version: 0.2.29
+version: 0.2.30
 doi: 10.5281/zenodo.6425881
 date-released: 2022-03-31
diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
@@ -16,14 +16,14 @@ build_string: py38_0
 test:
   imports:
     - pyhexwatershed
-  
+
 
 # Define the package metadata
 metadata:
   # Package name
   name: hexwatershed
   # Package version
-  version: "0.2.29"
+  version: "0.2.30"
   # Package summary
   summary: A mesh-independent flow direction model for hydrologic models
   # Package homepage
@@ -46,4 +46,4 @@ metadata:
     - python
     - setuptools
     - pip
-    
+
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "hexwatershed" %}
 {% set git_rev = "main" %}
-{% set version = "0.2.29" %}
+{% set version = "0.2.30" %}
 
 package:
   name: {{ name|lower }}
@@ -13,29 +13,29 @@ source:
   #git_rev: {{ git_rev }}
   #git_url: https://github.com/changliao1025/pyhexwatershed
 
-build:  
+build:
   noarch: python
   #script:
-  #  - pip install . 
+  #  - pip install .
   #  - python setup.py build_external -vv
-    
+
   number: 0
-  
-requirements:  
-  
+
+requirements:
+
   build:
     - cmake
     - make
     - {{ compiler('cxx') }}
-    - python >=3.8    
+    - python >=3.8
     - setuptools
     - pip
-  
+
   host:
-    - python >=3.8  
+    - python >=3.8
     - pip
     - {{ compiler('cxx') }}
- 
+
   run:
     - python >=3.8
     - numpy
@@ -46,7 +46,7 @@ requirements:
 test:
   imports:
     - pyhexwatershed
-  
+
 
 about:
   home: https://github.com/changliao1025/pyhexwatershed

diff --git a/docs/conf.py b/docs/conf.py
@@ -21,7 +21,7 @@
 import sys
 sys.path.insert(0, os.path.abspath('..'))
 
-import pyhexwatershed
+import pyhexwatershed.configuration as configuration
 
 # -- General configuration ---------------------------------------------
 
@@ -55,9 +55,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = pyhexwatershed.__version__
+version = configuration.__version__
 # The full version, including alpha/beta/rc tags.
-release = pyhexwatershed.__version__
+release = configuration.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/examples/create_model_condfiguration.py b/examples/create_model_condfiguration.py
@@ -11,8 +11,8 @@
 logging.warning('is the time pyhexwatershed simulation started.')
 
 from pyhexwatershed.classes.pycase import hexwatershedcase
-from pyhexwatershed.pyhexwatershed_read_model_configuration_file import pyhexwatershed_read_model_configuration_file
-from pyhexwatershed.pyhexwatershed_create_template_configuration_file import pyhexwatershed_create_template_configuration_file
+from pyhexwatershed.configuration.read_configuration_file import pyhexwatershed_read_model_configuration_file
+from pyhexwatershed.configuration.create_template_configuration_file import pyhexwatershed_create_template_configuration_file
 
 
 sMesh_type = 'latlon'
@@ -30,7 +30,7 @@
 sWorkspace_output = '/compyfs/liao313/04model/pyhexwatershed/susquehanna'
 
 
-sFilename_configuration_in = sPath +  '/tests/configurations/pyhexwatershed_susquehanna_latlon.json' 
+sFilename_configuration_in = sPath +  '/tests/configurations/pyhexwatershed_susquehanna_latlon.json'
 sWorkspace_data = realpath( sPath +  '/data/susquehanna' )
 oPyhexwatershed = pyhexwatershed_create_template_configuration_file(sFilename_configuration_in, sWorkspace_input, sWorkspace_output, iFlag_use_mesh_dem_in = 0, sMesh_type_in=sMesh_type, iCase_index_in = iCase_index, sDate_in = sDate)
 print(oPyhexwatershed.tojson())

diff --git a/examples/susquehanna/run_simulation_hexagon.py b/examples/susquehanna/run_simulation_hexagon.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from os.path import realpath
 
-from pyhexwatershed.pyhexwatershed_read_model_configuration_file import pyhexwatershed_read_model_configuration_file
+from pyhexwatershed.configuration.read_configuration_file import pyhexwatershed_read_model_configuration_file
 
 #===========================
 #setup workspace path
@@ -37,7 +37,7 @@
     oPyhexwatershed = pyhexwatershed_read_model_configuration_file(sFilename_configuration_in,\
         iCase_index_in=iCase_index, \
             dResolution_meter_in = dResolution_meter, \
-                sDate_in= sDate, sMesh_type_in= sMesh_type)   
+                sDate_in= sDate, sMesh_type_in= sMesh_type)
 
     if oPyhexwatershed.iFlag_global==1:
         #global simulation
@@ -48,7 +48,7 @@
         if oPyhexwatershed.iFlag_multiple_outlet ==1:
             pass
         else:
-            #single basin example  
+            #single basin example
             #use dem
             oPyhexwatershed.pPyFlowline.aBasin[0].dLatitude_outlet_degree=39.4620
             oPyhexwatershed.pPyFlowline.aBasin[0].dLongitude_outlet_degree=-76.0093
@@ -61,16 +61,16 @@
             aCell_out = oPyhexwatershed.assign_elevation_to_cells()
             aCell_new = oPyhexwatershed.update_outlet(aCell_origin)
             oPyhexwatershed.pPyFlowline.export()
-            oPyhexwatershed.export_config_to_json()                
+            oPyhexwatershed.export_config_to_json()
             oPyhexwatershed.run_hexwatershed()
             oPyhexwatershed.analyze()
             oPyhexwatershed.export()
             pass
-    
+
     iCase_index = iCase_index + 1
-           
-           
-                 
+
+
+
 
 print('Finished')
 
diff --git a/examples/susquehanna/run_simulation_latlon.py b/examples/susquehanna/run_simulation_latlon.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from os.path import realpath
 
-from pyhexwatershed.pyhexwatershed_read_model_configuration_file import pyhexwatershed_read_model_configuration_file
+from pyhexwatershed.configuration.read_configuration_file import pyhexwatershed_read_model_configuration_file
 
 #===========================
 #setup workspace path
@@ -37,7 +37,7 @@
     oPyhexwatershed = pyhexwatershed_read_model_configuration_file(sFilename_configuration_in,\
         iCase_index_in=iCase_index, \
             dResolution_meter_in = dResolution_meter, \
-                sDate_in= sDate, sMesh_type_in= sMesh_type)   
+                sDate_in= sDate, sMesh_type_in= sMesh_type)
 
     if oPyhexwatershed.iFlag_global==1:
         #global simulation
@@ -48,7 +48,7 @@
         if oPyhexwatershed.iFlag_multiple_outlet ==1:
             pass
         else:
-            #single basin example  
+            #single basin example
             #use dem
             oPyhexwatershed.pPyFlowline.aBasin[0].dLatitude_outlet_degree=39.4620
             oPyhexwatershed.pPyFlowline.aBasin[0].dLongitude_outlet_degree=-76.0093
@@ -61,16 +61,16 @@
             aCell_out = oPyhexwatershed.assign_elevation_to_cells()
             aCell_new = oPyhexwatershed.update_outlet(aCell_origin)
             oPyhexwatershed.pPyFlowline.export()
-            oPyhexwatershed.export_config_to_json()                
+            oPyhexwatershed.export_config_to_json()
             oPyhexwatershed.run_hexwatershed()
             oPyhexwatershed.analyze()
             oPyhexwatershed.export()
             pass
-    
+
     iCase_index = iCase_index + 1
-           
-           
-                 
+
+
+
 
 print('Finished')
 
diff --git a/examples/susquehanna/run_simulation_mpas.py b/examples/susquehanna/run_simulation_mpas.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from os.path import realpath
 
-from pyhexwatershed.pyhexwatershed_read_model_configuration_file import pyhexwatershed_read_model_configuration_file
+from pyhexwatershed.configuration.read_configuration_file import pyhexwatershed_read_model_configuration_file
 
 #===========================
 #setup workspace path
@@ -33,7 +33,7 @@
 sDate='20220801'
 
 oPyhexwatershed = pyhexwatershed_read_model_configuration_file(sFilename_configuration_in,\
-    iCase_index_in=iCase_index, sDate_in= sDate, sMesh_type_in= sMesh_type)   
+    iCase_index_in=iCase_index, sDate_in= sDate, sMesh_type_in= sMesh_type)
 
 if oPyhexwatershed.iFlag_global==1:
     #global simulation
@@ -44,7 +44,7 @@
     if oPyhexwatershed.iFlag_multiple_outlet ==1:
         pass
     else:
-        #single basin example       
+        #single basin example
         #mpas mesh has elevation built-in
         oPyhexwatershed.pPyFlowline.aBasin[0].dLatitude_outlet_degree=39.4620
         oPyhexwatershed.pPyFlowline.aBasin[0].dLongitude_outlet_degree=-76.0093
@@ -60,7 +60,7 @@
         oPyhexwatershed.analyze()
         oPyhexwatershed.export()
         pass
-    pass            
+    pass
 
 print('Finished')
 
diff --git a/examples/susquehanna/run_simulation_square.py b/examples/susquehanna/run_simulation_square.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from os.path import realpath
 
-from pyhexwatershed.pyhexwatershed_read_model_configuration_file import pyhexwatershed_read_model_configuration_file
+from pyhexwatershed.configuration.read_configuration_file import pyhexwatershed_read_model_configuration_file
 
 #===========================
 #setup workspace path
@@ -37,7 +37,7 @@
     oPyhexwatershed = pyhexwatershed_read_model_configuration_file(sFilename_configuration_in,\
         iCase_index_in=iCase_index, \
             dResolution_meter_in = dResolution_meter, \
-                sDate_in= sDate, sMesh_type_in= sMesh_type)   
+                sDate_in= sDate, sMesh_type_in= sMesh_type)
 
     if oPyhexwatershed.iFlag_global==1:
         #global simulation
@@ -48,7 +48,7 @@
         if oPyhexwatershed.iFlag_multiple_outlet ==1:
             pass
         else:
-            #single basin example  
+            #single basin example
             #use dem
             oPyhexwatershed.pPyFlowline.aBasin[0].dLatitude_outlet_degree=39.4620
             oPyhexwatershed.pPyFlowline.aBasin[0].dLongitude_outlet_degree=-76.0093
@@ -61,16 +61,16 @@
             aCell_out = oPyhexwatershed.assign_elevation_to_cells()
             aCell_new = oPyhexwatershed.update_outlet(aCell_origin)
             oPyhexwatershed.pPyFlowline.export()
-            oPyhexwatershed.export_config_to_json()                
+            oPyhexwatershed.export_config_to_json()
             oPyhexwatershed.run_hexwatershed()
             oPyhexwatershed.analyze()
             oPyhexwatershed.export()
             pass
-    
+
     iCase_index = iCase_index + 1
-           
-           
-                 
+
+
+
 
 print('Finished')