Changeset 23770

Timestamp:

03/07/19 08:52:17 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added check that damage evolution is only allowed if md.materials is matdamageice

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -104 +104 @@
                                 md = checkmessage(md,['Coupling with ocean model can only be performed for transient simulations!']);
                         end
+                        if (md.transient.isdamageevolution & ~isa(md.materials,'matdamageice')), 
+                                md = checkmessage(md,['requesting damage evolution but md.materials is not of class matdamageice']);
+                        end
                 end % }}}
                 function disp(self) % {{{

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

@@ -146 +146 @@
 
                 if (solution!='TransientSolution') and (md.transient.iscoupling):
-                                md.checkmessage("Coupling with ocean can only be done in transient simulations!")
+                    md.checkmessage("Coupling with ocean can only be done in transient simulations!")
+                if (md.transient.isdamageevolution and not hasattr(md.materials,'matdamageice')):
+                    md.checkmessage("requesting damage evolution but md.materials is not of class matdamageice")
 
                 return md