Changeset 25385

Timestamp:

08/12/20 11:02:04 (5 years ago)

Author:

schlegel

Message:

NEW: add p1p2 pdd test in python

Location:

issm/trunk-jpl

Files:

• src/m/classes/SMBd18opdd.py (modified) (1 diff)
• src/m/classes/frictionjosh.py (added)
• src/m/classes/initialization.py (modified) (1 diff)
• src/m/classes/matice.py (modified) (1 diff)
• src/m/consistency/checkfield.py (modified) (2 diffs)
• test/NightlyRun/test247.py (added)

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

@@ -89 +89 @@
             self.temperatures_reconstructed = project3d(md, 'vector', self.temperatures_reconstructed, 'type', 'node')
         if self.isprecipscaled == 0:
-            self.temperatures_reconstructed = project3d(md, 'vector', self.precipitations_reconstructed, 'type', 'node')
-        if self.isd18opd:
-            self.precipitations_presentday = project3d(md, 'vector', self.precipitations_presentday, 'type', 'node')
+            self.precipitations_reconstructed = project3d(md, 'vector', self.precipitations_reconstructed, 'type', 'node')
         self.s0p = project3d(md, 'vector', self.s0p, 'type', 'node')
         self.s0t = project3d(md, 'vector', self.s0t, 'type', 'node')

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

@@ -104 +104 @@
             md = checkfield(md, 'fieldname', 'initialization.vx', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
             md = checkfield(md, 'fieldname', 'initialization.vy', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
-            md = checkfield(md, 'fieldname', 'initialization.temperature', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
+            md = checkfield(md, 'fieldname', 'initialization.temperature', 'NaN', 1, 'Inf', 1, 'size', 'universal')
             if md.mesh.dimension() == 3:
                 md = checkfield(md, 'fieldname', 'initialization.vz', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])

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

@@ -124 +124 @@
             md = checkfield(md, 'fieldname', 'materials.rho_freshwater', '>', 0)
             md = checkfield(md, 'fieldname', 'materials.mu_water', '>', 0)
-            md = checkfield(md, 'fieldname', 'materials.rheology_B', '>', 0, 'timeseries', 1, 'NaN', 1, 'Inf', 1)
+            md = checkfield(md, 'fieldname', 'materials.rheology_B', '>', 0, 'universal', 1, 'NaN', 1, 'Inf', 1)
             md = checkfield(md, 'fieldname', 'materials.rheology_n', '>', 0, 'size', [md.mesh.numberofelements])
             md = checkfield(md, 'fieldname', 'materials.rheology_law', 'values', ['None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius', 'LliboutryDuval', 'NyeCO2', 'NyeH2O'])

issm/trunk-jpl/src/m/consistency/checkfield.py

@@ -84 +84 @@
                 #Uniform field
                 if (np.size(field, 0) == 1):
-                    if (np.shape(field)[1] != 1):
+                    if (np.ndim(field) > 1 and np.shape(field)[1] != 1):
                         md = md.checkmessage(options.getfieldvalue('message', "field '{}' is not supported".format(fieldname)))
 
                 #vertex oriented input, only one column allowed
                 elif (np.shape(field)[0] == md.mesh.numberofvertices):
-                    if (np.shape(field)[1] != 1):
+                    if (np.ndim(field) > 1 and np.shape(field)[1] != 1):
                         md = md.checkmessage(options.getfieldvalue('message', "field '{}' is not supported".format(fieldname)))
 
@@ -99 +99 @@
                 #vertex time series
                 elif (np.shape(field)[0] == md.mesh.numberofvertices + 1):
-                    if (np.shape(field)[1] <= 1):
+                    if (np.ndim(field) > 1 and np.shape(field)[1] <= 1):
                         md = md.checkmessage(options.getfieldvalue('message', "field '{}' is not supported".format(fieldname)))
 
                 #element time series
                 elif (np.shape(field)[0] == md.mesh.numberofelements + 1):
-                    if (np.shape(field)[1] <= 1):
+                    if (np.ndim(field) > 1 and np.shape(field)[1] <= 1):
                         md = md.checkmessage(options.getfieldvalue('message', "field '{}' is not supported".format(fieldname)))