small clean-ups to SPECL functionality

HSP2/SPECL.py

@@ -11,26 +11,27 @@
 import h5py
 
 def specl_load_actions(state, io_manager, siminfo):
-    dc = state['specactions']['ACTIONS']
-    #print(dc.index)
-    #print("speca entry 0:0", dc[0:0])
-    #print("speca entry 0:1", dc[0:1])
-    #print("speca entry 1:2", dc[1:2])
-    #print("speca entry 0:", dc[0:])
-    #print("speca entry 1:", dc[1:])
-    #print("speca entry 1:1", dc[1:1])
-    for ix in dc.index:
-        # add the items to the state['model_data'] dict 
-        speca = dc[ix:(ix+1)]
-        # need to add a name attribute
-        opname = 'SPEC' + 'ACTION' + str(ix)
-        state['model_data'][opname] = {}
-        state['model_data'][opname]['name'] = opname
-        for ik in speca.keys(): 
-            #print("looking for speca key ", ik)
-            state['model_data'][opname][ik] = speca.to_dict()[ik][ix]
-        state['model_data'][opname]['object_class'] = 'SpecialAction'
-        #print("model_data", ix, " = ", state['model_data'][opname])
+    if 'ACTIONS' in state['specactions']:
+        dc = state['specactions']['ACTIONS']
+        #print(dc.index)
+        #print("speca entry 0:0", dc[0:0])
+        #print("speca entry 0:1", dc[0:1])
+        #print("speca entry 1:2", dc[1:2])
+        #print("speca entry 0:", dc[0:])
+        #print("speca entry 1:", dc[1:])
+        #print("speca entry 1:1", dc[1:1])
+        for ix in dc.index:
+            # add the items to the state['model_data'] dict
+            speca = dc[ix:(ix+1)]
+            # need to add a name attribute
+            opname = 'SPEC' + 'ACTION' + str(ix)
+            state['model_data'][opname] = {}
+            state['model_data'][opname]['name'] = opname
+            for ik in speca.keys():
+                #print("looking for speca key ", ik)
+                state['model_data'][opname][ik] = speca.to_dict()[ik][ix]
+            state['model_data'][opname]['object_class'] = 'SpecialAction'
+            #print("model_data", ix, " = ", state['model_data'][opname])
     return
 
 def state_load_dynamics_specl(state, io_manager, siminfo):

HSP2/main.py

@@ -59,29 +59,31 @@ def main(io_manager:IOManager, saveall:bool=False, jupyterlab:bool=True) -> None
     gener_instances = {}
 
     #######################################################################################
-    # initilize STATE dicts
+    # initialize STATE dicts
     #######################################################################################
-    # Set up Things in state that will be used in all modular activitis like SPECL
+    # Set up Things in state that will be used in all modular activities like SPECL
     state = init_state_dicts()
     state_siminfo_hsp2(uci_obj, siminfo)
-    # Add support for dynamic functins to operate on STATE
+    # Add support for dynamic functions to operate on STATE
     # - Load any dynamic components if present, and store variables on objects 
     state_load_dynamics_hsp2(state, io_manager, siminfo)
     # Iterate through all segments and add crucial paths to state 
     # before loading dynamic components that may reference them
     for _, operation, segment, delt in opseq.itertuples():
-        for activity, function in activities[operation].items():
-            if activity == 'HYDR':
-                state_context_hsp2(state, operation, segment, activity)
-                print("Init HYDR state context for domain", state['domain'])
-                hydr_init_ix(state['state_ix'], state['state_paths'], state['domain'])
+        if operation != 'GENER' and operation != 'COPY':
+            for activity, function in activities[operation].items():
+                if activity == 'HYDR':
+                    state_context_hsp2(state, operation, segment, activity)
+                    print("Init HYDR state context for domain", state['domain'])
+                    hydr_init_ix(state['state_ix'], state['state_paths'], state['domain'])
     # - finally stash specactions in state, not domain (segment) dependent so do it once
     state['specactions'] = specactions # stash the specaction dict in state
     state_load_dynamics_specl(state, io_manager, siminfo)
     state_load_dynamics_om(state, io_manager, siminfo)
     # finalize all dynamically loaded components and prepare to run the model
     state_om_model_run_prep(state, io_manager, siminfo)
     #######################################################################################
+
     # main processing loop
     msg(1, f'Simulation Start: {start}, Stop: {stop}')
     tscat = {}

HSP2/om_special_action.py

@@ -71,14 +71,13 @@ def handle_ac(self, ac):
         # 11 LN T= Ln(A) 
         # 12 LOG T= Log10(A)
         # 13 MOD T= Mod(T,A)
-        if !is_float_digit(self.ac):
-            if !(self in cop_codes.values())
-               raise Exception("Error: in "+ self.name + " AC (" + self.ac + ") not supported.  Object creation halted. Path to object with error is " + self.state_path)
-            ac = self.ac
-        else:
-            # this will fail catastrophically if the requested function is not supported
-            # which is a good thing
-            ac = cop_codes[self.ac]
+        if not is_float_digit(ac):
+            if not ac in cop_codes:
+               raise Exception("Error: in "+ self.name + " AC (" + ac + ") not supported.  Object creation halted. Path to object with error is " + self.state_path)
+            else:
+                # this will fail catastrophically if the requested function is not supported
+                # which is a good thing
+                ac = cop_codes[ac]
         self.opid = ac
 
     def tokenize(self):