Merge pull request #199 from HARPgroup/develop-state-reorg

Develop state reorg

Author: PaulDudaRESPEC

src/hsp2/hsp2/HYDR.py

@@ -19,7 +19,7 @@
 from hsp2.hsp2.utilities import initm, make_numba_dict
 
 # the following imports added by rb to handle dynamic code and special actions
-from hsp2.hsp2.state import hydr_get_ix, hydr_init_ix, hydr_state_vars
+from hsp2.state.state import hydr_get_ix, hydr_init_ix, hydr_state_vars
 from hsp2.hsp2.om import pre_step_model, step_model, model_domain_dependencies
 from numba.typed import Dict
 
@@ -159,7 +159,7 @@ def hydr(io_manager, siminfo, parameters, ts, ftables, state):
     if hsp2_local_py != False:
         from hsp2_local_py import state_step_hydr
     else:
-        from hsp2.hsp2.state_fn_defaults import state_step_hydr
+        from hsp2.state.state_fn_defaults import state_step_hydr
     # initialize the hydr paths in case they don't already reside here
     hydr_init_ix(state, state["domain"])
     # must split dicts out of state Dict since numba cannot handle mixed-type nested Dicts

src/hsp2/hsp2/RQUAL.py

@@ -12,7 +12,7 @@
 from hsp2.hsp2.utilities import initm, initmd, make_numba_dict
 
 # the following imports added to handle special actions
-from hsp2.hsp2.state import rqual_init_ix, rqual_state_vars
+from hsp2.state.state import rqual_init_ix, rqual_state_vars
 from hsp2.hsp2.om import model_domain_dependencies
 
 ERRMSGS_oxrx = (

src/hsp2/hsp2/RQUAL_Class.py

@@ -10,7 +10,7 @@
 from hsp2.hsp2.PLANK_Class import PLANK_Class
 
 # the following imports added to handle special actions
-from hsp2.hsp2.state import rqual_get_ix
+from hsp2.state.state import rqual_get_ix
 from hsp2.hsp2.om import pre_step_model, step_model
 
 if os.environ.get("NUMBA_DISABLE_JIT", 0):  # jit should be on by default.

src/hsp2/hsp2/SEDMNT.py

@@ -13,7 +13,7 @@
 from hsp2.hsp2.utilities import hourflag, initm, make_numba_dict
 
 # the following imports added to handle special actions
-from hsp2.hsp2.state import sedmnt_get_ix, sedmnt_init_ix, sedmnt_state_vars
+from hsp2.state.state import sedmnt_get_ix, sedmnt_init_ix, sedmnt_state_vars
 from hsp2.hsp2.om import pre_step_model, step_model, model_domain_dependencies
 from numba.typed import Dict
 

src/hsp2/hsp2/SEDTRN.py

@@ -10,7 +10,7 @@
 from hsp2.hsp2.utilities import make_numba_dict
 
 # the following imports added to handle special actions
-from hsp2.hsp2.state import sedtrn_get_ix, sedtrn_init_ix, sedtrn_state_vars
+from hsp2.state.state import sedtrn_get_ix, sedtrn_init_ix, sedtrn_state_vars
 from hsp2.hsp2.om import pre_step_model, step_model, model_domain_dependencies
 from numba.typed import Dict
 
@@ -110,7 +110,7 @@ def sedtrn(io_manager, siminfo, parameters, ts, state):
     # if (hsp2_local_py != False):
     #     from hsp2_local_py import state_step_hydr
     # else:
-    #     from hsp2.hsp2.state_fn_defaults import state_step_hydr
+    #     from hsp2.state.state_fn_defaults import state_step_hydr
     # must split dicts out of state Dict since numba cannot handle mixed-type nested Dicts
     # initialize the sedtrn paths in case they don't already reside here
     sedtrn_init_ix(state, state["domain"])

src/hsp2/hsp2/main.py

@@ -18,7 +18,7 @@
     get_gener_timeseries,
 )
 from hsp2.hsp2.configuration import activities, noop, expand_masslinks
-from hsp2.hsp2.state import (
+from hsp2.state.state import (
     init_state_dicts,
     state_siminfo_hsp2,
     state_load_dynamics_hsp2,

src/hsp2/hsp2/om.py

@@ -10,7 +10,7 @@
 import time
 from numpy import zeros
 from numba import njit  # import the types
-from hsp2.hsp2.state import append_state, get_ix_path
+from hsp2.state.state import append_state, get_ix_path
 
 
 def get_exec_order(model_exec_list, var_ix):

src/hsp2/hsp2/om_equation.py

@@ -7,12 +7,12 @@
 """
 
 from hsp2.hsp2.om import is_float_digit
-from hsp2.hsp2.state import set_state, get_state_ix
+from hsp2.state.state import set_state, get_state_ix
 from hsp2.hsp2.om_model_object import ModelObject, ModelConstant
 from numba import njit
 from numpy import array, append
 
-# from hsp2.hsp2.state import set_state, get_state_ix
+# from hsp2.state.state import set_state, get_state_ix
 # from numba.typed import Dict
 # from hsp2.hsp2.om import get_exec_order, is_float_digit
 # from pandas import Series, DataFrame, concat, HDFStore, set_option, to_numeric

src/hsp2/hsp2/om_model_linkage.py

@@ -4,7 +4,7 @@
 during a model simulation.
 """
 
-from hsp2.hsp2.state import state_add_ts, get_state_ix
+from hsp2.state.state import state_add_ts, get_state_ix
 from hsp2.hsp2.om import *
 from hsp2.hsp2.om_model_object import ModelObject
 from numba import njit

src/hsp2/hsp2/om_model_object.py

@@ -4,7 +4,7 @@
 All runtime exec is done by child classes.
 """
 
-from hsp2.hsp2.state import set_state, get_state_ix
+from hsp2.state.state import set_state, get_state_ix
 from numba.typed import Dict
 from hsp2.hsp2.om import get_exec_order, is_float_digit
 from pandas import HDFStore