Index: /issm/trunk-jpl/test/NightlyRun/test101.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test101.m	(revision 16402)
+++ /issm/trunk-jpl/test/NightlyRun/test101.m	(revision 16403)
@@ -4,5 +4,16 @@
 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());
 
Index: /issm/trunk-jpl/test/NightlyRun/test101.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test101.py	(revision 16402)
+++ /issm/trunk-jpl/test/NightlyRun/test101.py	(revision 16403)
@@ -7,4 +7,5 @@
 from solve import *
 from MatlabFuncs import *
+from massfluxatgate import massfluxatgate
 
 md=triangle(model(),'../Exp/Square.exp',50000)
@@ -13,5 +14,16 @@
 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())
 
Index: /issm/trunk-jpl/test/Par/SquareShelf2.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf2.par	(revision 16402)
+++ /issm/trunk-jpl/test/Par/SquareShelf2.par	(revision 16403)
@@ -57,12 +57,2 @@
 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'])...
-	};
Index: /issm/trunk-jpl/test/Par/SquareShelf2.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf2.py	(revision 16402)
+++ /issm/trunk-jpl/test/Par/SquareShelf2.py	(revision 16403)
@@ -7,5 +7,4 @@
 from paterson import paterson
 from SetIceShelfBC import SetIceShelfBC
-from massfluxatgate import massfluxatgate
 
 #Start defining model parameters here
@@ -89,12 +88,2 @@
 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')
-	]