Changeset 16403

Timestamp:

10/15/13 08:03:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not define outputdefinitions by default

Location:

issm/trunk-jpl/test

Files:

• NightlyRun/test101.m (modified) (1 diff)
• NightlyRun/test101.py (modified) (2 diffs)
• Par/SquareShelf2.par (modified) (1 diff)
• Par/SquareShelf2.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test101.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',2);
+
+%output
 md.stressbalance.requested_outputs={'StressTensor','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6'};
+md.outputdefinition.definitions={...
+        massfluxatgate('MassFlux1',['../Exp/MassFlux1.exp']),...
+        massfluxatgate('MassFlux2',['../Exp/MassFlux2.exp']),...
+        massfluxatgate('MassFlux3',['../Exp/MassFlux3.exp']),...
+        massfluxatgate('MassFlux4',['../Exp/MassFlux4.exp']),...
+        massfluxatgate('MassFlux5',['../Exp/MassFlux5.exp']),...
+        massfluxatgate('MassFlux6',['../Exp/MassFlux6.exp'])...
+        };
+
 md=solve(md,StressbalanceSolutionEnum());
 

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

@@ -7 +7 @@
 from solve import *
 from MatlabFuncs import *
+from massfluxatgate import massfluxatgate
 
 md=triangle(model(),'../Exp/Square.exp',50000)
@@ -13 +14 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
+
+#outputs
 md.stressbalance.requested_outputs=['StressTensor','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6']
+md.outputdefinition.definitions=[
+                massfluxatgate('MassFlux1',os.getcwd() + '/../Exp/MassFlux1.exp'),
+                massfluxatgate('MassFlux2',os.getcwd() + '/../Exp/MassFlux2.exp'),
+                massfluxatgate('MassFlux3',os.getcwd() + '/../Exp/MassFlux3.exp'),
+                massfluxatgate('MassFlux4',os.getcwd() + '/../Exp/MassFlux4.exp'),
+                massfluxatgate('MassFlux5',os.getcwd() + '/../Exp/MassFlux5.exp'),
+                massfluxatgate('MassFlux6',os.getcwd() + '/../Exp/MassFlux6.exp')
+                ]
+
 md=solve(md,StressbalanceSolutionEnum())
 

issm/trunk-jpl/test/Par/SquareShelf2.par

@@ -57 +57 @@
 A=dbstack;
 if (length(A)>2), md.miscellaneous.name=A(3).file(1:end-2); end
-
-%output definitions: 
-md.outputdefinition.definitions={...
-                massfluxatgate('MassFlux1',[pwd '/../Exp/MassFlux1.exp']),...
-                massfluxatgate('MassFlux2',[pwd '/../Exp/MassFlux2.exp']),...
-                massfluxatgate('MassFlux3',[pwd '/../Exp/MassFlux3.exp']),...
-                massfluxatgate('MassFlux4',[pwd '/../Exp/MassFlux4.exp']),...
-                massfluxatgate('MassFlux5',[pwd '/../Exp/MassFlux5.exp']),...
-                massfluxatgate('MassFlux6',[pwd '/../Exp/MassFlux6.exp'])...
-        };

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

@@ -7 +7 @@
 from paterson import paterson
 from SetIceShelfBC import SetIceShelfBC
-from massfluxatgate import massfluxatgate
 
 #Start defining model parameters here
@@ -89 +88 @@
 if len(inspect.stack()) > 2:
         md.miscellaneous.name=os.path.basename(inspect.stack()[2][1]).split('.')[0]
-        
-#output definitions: 
-md.outputdefinition.definitions=[
-                massfluxatgate('MassFlux1',os.getcwd() + '/../Exp/MassFlux1.exp'),
-                massfluxatgate('MassFlux2',os.getcwd() + '/../Exp/MassFlux2.exp'),
-                massfluxatgate('MassFlux3',os.getcwd() + '/../Exp/MassFlux3.exp'),
-                massfluxatgate('MassFlux4',os.getcwd() + '/../Exp/MassFlux4.exp'),
-                massfluxatgate('MassFlux5',os.getcwd() + '/../Exp/MassFlux5.exp'),
-                massfluxatgate('MassFlux6',os.getcwd() + '/../Exp/MassFlux6.exp')
-        ]