Changeset 19294

Timestamp:

04/21/15 14:03:42 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow models to have no spc, but display warning

Location:

issm/trunk-jpl/src/m/classes

Files:

• flowequation.m (modified) (1 diff)
• stressbalance.m (modified) (1 diff)
• stressbalance.py (modified) (1 diff)

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

@@ -134 +134 @@
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
-
 
                         %Early return

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

@@ -151 +151 @@
                         if ((~(any(~isnan(md.stressbalance.spcvx)) | any(~isnan(md.stressbalance.spcvy)))) & ~any(md.mask.groundedice_levelset>0)),
                                 md = checkmessage(md,['model is not well posed (singular). You need at least one node with fixed velocity!']);
+                                disp(sprintf('\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n'));
                         end
                         %CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES

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

@@ -151 +151 @@
 #               if ~any((~isnan(md.stressbalance.spcvx)+~isnan(md.stressbalance.spcvy))==2),
                 if not numpy.any(numpy.logical_and(numpy.logical_not(numpy.isnan(md.stressbalance.spcvx)),numpy.logical_not(numpy.isnan(md.stressbalance.spcvy)))):
-                        md.checkmessage("model is not well posed (singular). You need at least one node with fixed velocity!")
+                        print "\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n"
                 #CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES
 #               if any(sum(isnan(md.stressbalance.referential),2)~=0 & sum(isnan(md.stressbalance.referential),2)~=6),