Changeset 20137

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.

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBforcing.m (modified) (1 diff)
• friction.m (modified) (1 diff)
• initialization.m (modified) (3 diffs)
• slr.m (modified) (4 diffs)
• transient.m (modified) (7 diffs)
• transient.py (modified) (6 diffs)

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

@@ -48 +48 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
+                        if (solution==TransientSolutionEnum & md.transient.issmb == 0), return; end
+                        
                         if ismember(MasstransportAnalysisEnum(),analyses),
                                 md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1);

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

@@ -31 +31 @@
                         %Early return
                         if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
+                        if (solution==TransientSolutionEnum() &  md.transient.isstressbalance ==0 & md.transient.isthermal == 0), return; end
+
                         md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);

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

@@ -46 +46 @@
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
-                        if ismember(StressbalanceAnalysisEnum(),analyses)
+                        if ismember(StressbalanceAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isstressbalance == 0),
                                 if ~(isnan(md.initialization.vx) | isnan(md.initialization.vy)),
                                         md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
@@ -52 +52 @@
                                 end
                         end
-                        if ismember(MasstransportAnalysisEnum(),analyses),
+                        if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport == 0),
                                 md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
@@ -64 +64 @@
                                 end
                         end
-                        if ismember(ThermalAnalysisEnum(),analyses),
+                        if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal == 0),
                                 md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);

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

@@ -17 +17 @@
                 degacc         = 0;
                 requested_outputs      = {};
+                transitions    = {};
         end
         methods
@@ -46 +47 @@
                 %output default:
                 self.requested_outputs={'default'};
+
+                %transitions should be a cell array of vectors: 
+                self.transitions={};
                 
                 end % }}}
@@ -82 +86 @@
                         fielddisplay(self,'eustatic','eustatic sea level rise');
                         fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions');
+                        fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
 
@@ -96 +101 @@
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','eustatic','format','Boolean');
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','degacc','format','Double');
+                        WriteData(fid,'object',self,'class','sealevelrise','fieldname','degacc','format','Double');
+                        WriteData(fid,'object',self,'class','sealevelrise','fieldname','transitions','format','MatArray');
                         
                         %process requested outputs

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);
 

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

@@ -23 +23 @@
                 self.iscalving         = False
                 self.ishydrology       = False
+                self.isslr             = False
                 self.requested_outputs = []
 
@@ -41 +42 @@
                 string="%s\n%s"%(string,fielddisplay(self,'iscalving','indicates whether calving is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'ishydrology','indicates whether an hydrology model is used'))
+                string="%s\n%s"%(string,fielddisplay(self,'isslr','indicates if a sea level rise solution is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested'))
                 return string
@@ -65 +67 @@
                 self.iscalving         = False
                 self.ishydrology       = False
+                self.isslr             = False
 
                 #default output
@@ -83 +86 @@
                 self.iscalving       = False
                 self.ishydrology     = False
+                self.isslr           = False
 
                 #default output
@@ -104 +108 @@
                 md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0,1]);
+                md = checkfield(md,'fieldname','transient.isslr','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1)
 
@@ -119 +124 @@
                 WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','iscalving','format','Boolean')
+                WriteData(fid,'object',self,'fieldname','isslr','format','Boolean')
 
                 #process requested outputs