Changeset 24562

Timestamp:

02/08/20 09:27:49 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: use 'universal' option to check field consistency for Josh's model

Location:

issm/trunk-jpl/src/m/classes

Files:

• frictionjosh.m (modified) (1 diff)
• initialization.m (modified) (1 diff)
• thermal.m (modified) (1 diff)

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

@@ -41 +41 @@
 
                         %Check that temperature is provided
-                        md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size','universal');
                 end % }}}
                 function disp(self) % {{{

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

@@ -75 +75 @@
                                 end
                                 md = checkfield(md,'fieldname','initialization.pressure','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
-                                md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                                md = checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size','universal');
                         end
                         if (ismember('EnthalpyAnalysis',analyses) & md.thermal.isenthalpy)
-                                md = checkfield(md,'fieldname','initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices 1]);
-                                md = checkfield(md,'fieldname','initialization.watercolumn'  ,'>=',0,'size',[md.mesh.numberofvertices 1]);
+                                md = checkfield(md,'fieldname','initialization.waterfraction','>=',0,'size','universal');
+                                md = checkfield(md,'fieldname','initialization.watercolumn'  ,'>=',0,'size','universal');
                                 pos=find(md.initialization.waterfraction>0.);
                                 if(~isempty(pos)),

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

@@ -93 +93 @@
                                 md = checkfield(md,'fieldname','thermal.watercolumn_upperlimit','>=',0);
 
-                                %Make sure the spc are less than melting point
+                                %Make sure the spc are less than melting point (Josh commented out the next 2 lines)
                                 TEMP=md.thermal.spctemperature(1:md.mesh.numberofvertices,:);
                                 replicate=repmat(md.geometry.surface-md.mesh.z,1,size(md.thermal.spctemperature,2));