Changeset 24519

Timestamp:

01/14/20 14:33:03 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: trying to fix problem in Erics commit

Location:

issm/trunk-jpl/src/m/classes

Files:

• slr.m (modified) (1 diff)
• slr.py (modified) (1 diff)

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

@@ -98 +98 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        if ~ismember('SealevelriseAnalysis',analyses), return; end
+                        if ~ismember('SealevelriseAnalysis',analyses) | (strcmp(solution,'TransientSolution') & md.transient.isslr==0), 
+                                return; 
+                        end
                         md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);

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

@@ -127 +127 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         #Early return
-        if (solution != 'SealevelriseAnalysis'):
+        if (solution != 'SealevelriseAnalysis') (solution == 'TransientSolution' and not md.transient.isslr:
             return md