Changeset 25382

Timestamp:

08/12/20 08:01:12 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: cannot request both SIZE and TIMESERIES

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBd18opdd.m (modified) (1 diff)
• SMBd18opdd.py (modified) (6 diffs)
• SMBpddSicopolis.m (modified) (1 diff)

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

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

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

@@ -43 +43 @@
         self.requested_outputs = []
     #}}}
-
     def __repr__(self):  # {{{
         string = "   surface forcings parameters:"
@@ -82 +81 @@
         return string
     #}}}
-
     def extrude(self, md):  # {{{
         if self.isd18opd:
@@ -98 +96 @@
         return self
     #}}}
-
     def defaultoutputs(self, md):  # {{{
         return []
     #}}}
-
     def initialize(self, md):  # {{{
         if np.all(np.isnan(self.s0p)):
@@ -113 +109 @@
         return self
     # }}}
-
     def setdefaultparameters(self):  # {{{
         #pdd method not used in default mode
@@ -128 +123 @@
         return self
     #}}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if 'MasstransportAnalysis' in analyses:
@@ -168 +162 @@
         return md
     # }}}
-
     def marshall(self, prefix, md, fid):  # {{{
         yts = md.constants.yts

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

@@ -83 +83 @@
                                 md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',1);
-                                md = checkfield(md,'fieldname','smb.monthlytemperatures','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
-                                md = checkfield(md,'fieldname','smb.precipitation','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
+                                md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
+                                md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
 
                         end