Changeset 20137 for issm/trunk-jpl/src/m/classes/transient.m

Timestamp:

02/11/16 19:41:10 (9 years ago)

Author:

Eric.Larour

Message:

CHG: improvements in the way checkconsistency is carried out when dealing only with
SealevelriseSolution.

File:

• issm/trunk-jpl/src/m/classes/transient.m (modified) (7 diffs)

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

@@ -16 +16 @@
                 iscalving         = 0;
                 ishydrology       = 0;
+                isslr             = 0;
+                iscoupler             = 0;
                 requested_outputs = {};
         end
@@ -40 +42 @@
                         self.iscalving       =0;
                         self.ishydrology     = 0;
+                        self.isslr           = 0;
+                        self.iscoupler           = 0;
 
                         %default output
@@ -57 +61 @@
                         self.iscalving       = 0;
                         self.ishydrology     = 0;
+                        self.isslr           = 0;
+                        self.iscoupler           = 0;
 
                         %default output
@@ -84 +90 @@
                         md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
+                        md = checkfield(md,'fieldname','transient.isslr','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0 1]);
 
                 end % }}}
@@ -99 +107 @@
                         fielddisplay(self,'iscalving','indicates whether calving is used in the transient');
                         fielddisplay(self,'ishydrology','indicates whether an hydrology model is used');
+                        fielddisplay(self,'isslr','indicates whether a thermal solution is used in the transient');
+                        fielddisplay(self,'iscoupler','indicates whether different models are being run with need for coupling');
                         fielddisplay(self,'requested_outputs','list of additional outputs requested');
 
@@ -113 +123 @@
                         WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean');
                         WriteData(fid,'object',self,'fieldname','iscalving','format','Boolean');
+                        WriteData(fid,'object',self,'fieldname','isslr','format','Boolean');
+                        WriteData(fid,'object',self,'fieldname','iscoupler','format','Boolean');
 
                         %process requested outputs
@@ -135 +147 @@
                         writejsdouble(fid,[modelname '.trans.iscalving'],self.iscalving);
                         writejsdouble(fid,[modelname '.trans.ishydrology'],self.ishydrology);
+                        writejsdouble(fid,[modelname '.trans.isslr'],self.isslr);
+                        writejsdouble(fid,[modelname '.trans.iscoupler'],self.iscoupler);
                         writejscellstring(fid,[modelname '.trans.requested_outputs'],self.requested_outputs);