Changeset 24990

Timestamp:

06/09/20 03:06:44 (5 years ago)

Author:

bdef

Message:

CHG:removing setallnull which is a clone of deactivateall

Location:

issm/trunk-jpl

Files:

• src/m/classes/transient.py (modified) (1 diff)
• test/NightlyRun/test3300.py (modified) (1 diff)
• test/Par/SquareNoDyn.py (modified) (1 diff)

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

@@ -60 +60 @@
             return []
 
-    #}}}
-
-    def setallnullparameters(self):  # {{{
-        #Nothing done
-        self.issmb = False
-        self.ismasstransport = False
-        self.isstressbalance = False
-        self.isthermal = False
-        self.isgroundingline = False
-        self.isgia = False
-        self.isesa = False
-        self.isdamageevolution = False
-        self.ismovingfront = False
-        self.ishydrology = False
-        self.isoceancoupling = False
-        self.isslr = False
-        self.iscoupler = False
-        self.amr_frequency = 0
-
-    #default output
-        self.requested_outputs = []
-        return self
     #}}}
 

issm/trunk-jpl/test/NightlyRun/test3300.py

@@ -15 +15 @@
 md = setmask(md, '', '')
 md = parameterize(md, '../Par/SquareSheetConstrained.py')
-md.transient = transient.setallnullparameters(md.transient)
+md.transient = transient.deactivateall(md.transient)
 md.transient.ishydrology = True
 md.transient.issmb = True

issm/trunk-jpl/test/Par/SquareNoDyn.py

@@ -48 +48 @@
 md.groundingline.migration = 'None'
 
-md.transient = transient.setallnullparameters(md.transient)
+md.transient = transient.deactivateall(md.transient)
 
 #Change name so that no test have the same name