Changeset 27832

Timestamp:

07/18/23 13:07:22 (20 months ago)

Author:

musselman

Message:

CHG: updating to 07-11 versions of musselman netcdf.

Location:

issm/trunk-jpl/src/m/contrib/musselman

Files:

• read_netCDF_commit.py (modified) (1 diff)
• write_netCDF_beta.py (modified) (1 diff)
• write_netCDF_commit.py (modified) (1 diff)

issm/trunk-jpl/src/m/contrib/musselman/read_netCDF_commit.py

@@ -76 +76 @@
 
 def copy_variable_data_to_new_model(location_of_variable_in_file, location_of_variable_in_model, variable_name):
-    # this should be as simple as navigating to the location_of_variable_in_model and setting it equal to the location_of_variable_in_file
-    setattr(eval('model_copy.' + location_of_variable_in_model), variable_name, eval(location_of_variable_in_file + '[:]'))
+    # as simple as navigating to the location_of_variable_in_model and setting it equal to the location_of_variable_in_file
+    
+    # but there are a couple of cases we need to compensate for, like an arrary of a single integer should just be an integer and not an array
+    if len(eval(location_of_variable_in_file))>1:
+        setattr(eval('model_copy.' + location_of_variable_in_model), variable_name, eval(location_of_variable_in_file + '[:]'))
+    else:
+        setattr(eval('model_copy.' + location_of_variable_in_model), variable_name, eval(location_of_variable_in_file + '[:][0]')) # note the [0] on the end
+        
     print('Successfully saved ' + location_of_variable_in_model + '.' + variable_name + ' to model.')

issm/trunk-jpl/src/m/contrib/musselman/write_netCDF_beta.py

@@ -105 +105 @@
             adress_of_child_in_empty_class = 'empty_model' + adress_of_child.removeprefix(str(model_name))
             print('adress_of_child_in_empty_class: '+ adress_of_child_in_empty_class + '\n')
-            if type(child) == type(eval(adress_of_child_in_empty_class)):
-                print('passed a non-variable\n')
-                walk_through_subclasses(model_var, adress_of_child, model_name)
-            # If it has been modified, record it in the NetCDF file
-            else:
+            # using try/except here because sometimes a model can have class instances/attributes that are not 
+            # in the framework of an empty model. If this is the case, we move to the except statement
+            try:
+                if type(child) == type(eval(adress_of_child_in_empty_class)):
+                    print('passed a non-variable\n')
+                    walk_through_subclasses(model_var, adress_of_child, model_name)
+                # If it has been modified, record it in the NetCDF file
+                else:
+                    create_group(model_var, adress_of_child)
+                    walk_through_subclasses(model_var, adress_of_child, model_name)
+            except AttributeError:
                 create_group(model_var, adress_of_child)
                 walk_through_subclasses(model_var, adress_of_child, model_name)

issm/trunk-jpl/src/m/contrib/musselman/write_netCDF_commit.py

@@ -89 +89 @@
             # If the attribute is unchanged, move onto the next layer
             adress_of_child_in_empty_class = 'empty_model' + adress_of_child.removeprefix(str(model_name))
-            # using try/except here because sometimes a model can have class instances/attributes that are not 
-            # in the framework of an empty model. If this is the case, we move to the except statement
-            try:
-                if type(child) == type(eval(adress_of_child_in_empty_class)):
-                    walk_through_subclasses(model_var, adress_of_child, model_name)
-                # If it has been modified, record it in the NetCDF file
-                else:
-                    create_group(model_var, adress_of_child)
-                    walk_through_subclasses(model_var, adress_of_child, model_name)
-            except AttributeError:
+            if type(child) == type(eval(adress_of_child_in_empty_class)):
+                walk_through_subclasses(model_var, adress_of_child, model_name)
+            # If it has been modified, record it in the NetCDF file
+            else:
                 create_group(model_var, adress_of_child)
                 walk_through_subclasses(model_var, adress_of_child, model_name)