Changeset 26066

Timestamp:

03/10/21 11:57:45 (4 years ago)

Author:

jdquinn

Message:

BUG: Missing initialize member function; removed GIA from parameterization file; clean up

Location:

issm/trunk-jpl

Files:

• src/m/classes/dsl.m (modified) (2 diffs)
• src/m/classes/dsl.py (modified) (2 diffs)
• src/m/parameterization/parameterize.py (modified) (1 diff)
• test/Par/SquareSheetConstrained.par (modified) (1 diff)
• test/Par/SquareSheetConstrained.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/dsl.m

@@ -65 +65 @@
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
+
                         writejs1Darray(fid,[modelname '.dsl.global_average_thermosteric_sea_level'],self.global_average_thermosteric_sea_level);
                         writejs1Darray(fid,[modelname '.dsl.sea_surface_height_above_geoid'],self.sea_surface_height_above_geoid);
@@ -85 +85 @@
                                 disp('      no dsl.sea_water_pressure_at_sea_floor specified: transient values set at zero');
                         end
-
                 end % }}}
         

issm/trunk-jpl/src/m/classes/dsl.py

@@ -28 +28 @@
     #}}}
 
-    def extrude(self, md): #{{{
-        self.sea_surface_height_above_geoid = project3d(md, 'vector', self.sea_surface_height_above_geoid, 'type', 'node')
-        self.sea_water_pressure_at_sea_floor = project3d(md, 'vector', self.sea_water_pressure_at_sea_floor, 'type', 'node')
-        return self
+    def defaultoutputs(self, md): #{{{
+        return []
     #}}}
 
-    def defaultoutputs(self, md): #{{{
-        return []
+    def initialize(self, md): #{{{
+        if np.isnan(self.global_average_thermosteric_sea_level):
+            self.global_average_thermosteric_sea_level = np.array([0, 0]).reshape(-1, 1)
+            print('      no dsl.global_average_thermosteric_sea_level specified: transient values set at zero')
+
+        if np.isnan(self.sea_surface_height_above_geoid):
+            self.sea_surface_height_above_geoid = np.array(np.zeros(md.mesh.numberofvertices)).reshape(-1, 1)
+            print('      no dsl.sea_surface_height_above_geoid specified: transient values set at zero')
+
+        if np.isnan(self.sea_water_pressure_at_sea_floor):
+            self.sea_water_pressure_at_sea_floor = np.array(np.zeros(md.mesh.numberofvertices)).reshape(-1, 1)
+            print('      no dsl.sea_water_pressure_at_sea_floor specified: transient values set at zero')
     #}}}
 
@@ -53 +61 @@
     # }}}
 
+    def extrude(self, md): #{{{
+        self.sea_surface_height_above_geoid = project3d(md, 'vector', self.sea_surface_height_above_geoid, 'type', 'node')
+        self.sea_water_pressure_at_sea_floor = project3d(md, 'vector', self.sea_water_pressure_at_sea_floor, 'type', 'node')
+        return self
+    #}}}
+
     def marshall(self, prefix, md, fid):   #{{{
         yts = md.constants.yts

issm/trunk-jpl/src/m/parameterization/parameterize.py

@@ -4 +4 @@
 
 def parameterize(md, parametername):
-    '''
-    PARAMETERIZE - parameterize a model
+    """PARAMETERIZE - parameterize a model
 
-        From a parameter Python file, start filling in all the model fields 
-        that were not filled in by the mesh.py and mask.py model methods.
-        Warning: the parameter file must be able to be run in Python
+    From a parameter Python file, start filling in all the model fields that 
+    were not filled in by the mesh.py and mask.py model methods. Warning: the 
+    parameter file must be able to be run in Python
 
-        Usage:
-            md = parameterize(md, parametername)
+    Usage:
+        md = parameterize(md, parametername)
 
-        Example:
-            md = parameterize(md, 'Square.par')
-    '''
+    Example:
+        md = parameterize(md, 'Square.py')
+    """
 
     #some checks

issm/trunk-jpl/test/Par/SquareSheetConstrained.par

@@ -60 +60 @@
 md.groundingline.migration='None';
 
-
 %Boundary conditions:
 md=SetIceSheetBC(md);

issm/trunk-jpl/test/Par/SquareSheetConstrained.py

@@ -19 +19 @@
 md.geometry.thickness = hmax + (hmin - hmax) * (md.mesh.y - ymin) / (ymax - ymin) + 0.1 * (hmin - hmax) * (md.mesh.x - xmin) / (xmax - xmin)
 md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness + 20.
+md.geometry.bed = md.geometry.base
 md.geometry.surface = md.geometry.base + md.geometry.thickness
 
@@ -61 +62 @@
 md.groundingline.migration = 'None'
 
-#GIA:
-md.gia.lithosphere_thickness = 100. * np.ones((md.mesh.numberofvertices))  # in km
-md.gia.mantle_viscosity = 1.e21 * np.ones((md.mesh.numberofvertices))  # in Pa.s
-md.materials.lithosphere_shear_modulus = 6.7e10  # in Pa
-md.materials.lithosphere_density = 3.32  # in g / cm^ - 3
-md.materials.mantle_shear_modulus = 1.45e11  # in Pa
-md.materials.mantle_density = 3.34  # in g / cm^ - 3
-
 #Boundary conditions:
 md = SetIceSheetBC(md)