Changeset 19284

Timestamp:

04/10/15 13:02:47 (10 years ago)

Author:

schlegel

Message:

CHG: Add check for transient param, only 2 rows, for pdd

Location:

issm/trunk-jpl/src/m

Files:

• classes/SMBd18opdd.m (modified) (1 diff)
• classes/SMBd18opdd.py (modified) (1 diff)
• classes/SMBpdd.m (modified) (1 diff)
• classes/SMBpdd.py (modified) (1 diff)
• consistency/checkfield.m (modified) (1 diff)
• consistency/checkfield.py (modified) (1 diff)

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

@@ -64 +64 @@
                                 md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',1);
                                 if(self.isd18opd==1) 
-                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1,'size',[2,NaN],'timeseries',1);
                                         md = checkfield(md,'fieldname','surfaceforcings.dpermil','>=',0,'numel',1);
                                 end

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

@@ -87 +87 @@
 
                         if self.isd18opd:
-                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1,'size',[2,numpy.nan],'timeseries',1)
                                 md = checkfield(md,'fieldname','surfaceforcings.dpermil','>=',0,'numel',[1])
 

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

@@ -78 +78 @@
                                         md = checkfield(md,'fieldname','surfaceforcings.precipitation','timeseries',1,'NaN',1);
                                 elseif(self.isdelta18o==1) 
-                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1);                                       
-                                        md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1,'size',[2,NaN],'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1,'size',[2,NaN],'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);                                       
+                                        md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,NaN],'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,NaN],'timeseries',1);
                                 elseif(self.ismungsm==1) 
-                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1);                                       
-                                        md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1,'size',[2,NaN]);
-                                        md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1);
-                                        md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1,'timeseries',1);                                       
+                                        md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1,'size',[2,NaN],'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,NaN],'timeseries',1);
+                                        md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,NaN],'timeseries',1);
                                 end
                         end

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

@@ -115 +115 @@
 
                         if (self.isdelta18o==0 and self.ismungsm==0):
-                                md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.precipitation','NaN',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.precipitation','NaN',1,'timeseries',1)
                         elif self.isdelta18o:
-                                md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1)                                       
-                                md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,numpy.nan])
-                                md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,numpy.nan])
+                                md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1,'size',[2,numpy.nan],'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1,'size',[2,numpy.nan],'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)                                       
+                                md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,numpy.nan],'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,numpy.nan],'timeseries',1)
                         elif self.ismungsm:
-                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
-                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1)                                       
-                                md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1,'size',[2,numpy.nan])
-                                md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,numpy.nan])
-                                md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,numpy.nan])
+                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.precipitations_lgm','size',[md.mesh.numberofvertices+1,12],'NaN',1,'timeseries',1)                                       
+                                md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1,'size',[2,numpy.nan],'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,numpy.nan],'timeseries',1)
+                                md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,numpy.nan],'timeseries',1)
 
                 return md

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

@@ -204 +204 @@
                                 ['field ''' fieldname ''' should have only one column as there are md.mesh.numberofvertices lines']));
                 end
-        elseif size(field,1)==md.mesh.numberofvertices+1
+        elseif size(field,1)==md.mesh.numberofvertices+1 || size(field,1)==2
                 if any(field(end,:)~=sort(field(end,:))),
                         md = checkmessage(md,getfieldvalue(options,'message',...

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

@@ -156 +156 @@
                                 md = md.checkmessage(options.getfieldvalue('message',\
                                         "field '%s' should have only one column as there are md.mesh.numberofvertices lines" % fieldname))
-                elif numpy.size(field,0)==md.mesh.numberofvertices+1:
+                elif numpy.size(field,0)==md.mesh.numberofvertices+1 or numpy.size(field,0)==2:
                         if not all(field[-1,:]==numpy.sort(field[-1,:])):
                                 md = md.checkmessage(options.getfieldvalue('message',\