Index: /issm/trunk-jpl/test/NightlyRun/test101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.py (revision 16403) +++ /issm/trunk-jpl/test/NightlyRun/test101.py (revision 16404) @@ -18,10 +18,10 @@ 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') + 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') ] Index: /issm/trunk-jpl/test/NightlyRun/test701.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.m (revision 16403) +++ /issm/trunk-jpl/test/NightlyRun/test701.m (revision 16404) @@ -51,5 +51,5 @@ %Fields and tolerances to track changes field_names ={'Vx','Vy','Vel','Pressure'}; -field_tolerances={1e-13,1e-13,1e-13,1e-13}; +field_tolerances={1e-13,1e-13,1e-13,1e+4}; field_values={... (md.results.StressbalanceSolution.Vx),... Index: /issm/trunk-jpl/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareEISMINT.par (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareEISMINT.par (revision 16404) @@ -46,12 +46,2 @@ md.timestepping.final_time=500.; md.timestepping.time_step=1; - -%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/SquareEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 16404) @@ -1,5 +1,4 @@ import numpy from SetMarineIceSheetBC import SetMarineIceSheetBC -from massfluxatgate import massfluxatgate #Ok, start defining model parameters here @@ -50,12 +49,2 @@ md.timestepping.final_time=500. md.timestepping.time_step=1 - -#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') - ] Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.par (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.par (revision 16404) @@ -66,12 +66,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/SquareSheetConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 16404) @@ -7,5 +7,4 @@ from paterson import paterson from SetIceSheetBC import SetIceSheetBC -from massfluxatgate import massfluxatgate #Start defining model parameters here @@ -77,12 +76,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') - ] Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.par (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.par (revision 16404) @@ -64,12 +64,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/SquareSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 16404) @@ -7,5 +7,4 @@ from paterson import paterson from SetMarineIceSheetBC import SetMarineIceSheetBC -from massfluxatgate import massfluxatgate #Start defining model parameters here @@ -76,12 +75,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') - ] Index: /issm/trunk-jpl/test/Par/SquareShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf.par (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareShelf.par (revision 16404) @@ -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/SquareShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf.py (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareShelf.py (revision 16404) @@ -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') - ] Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.par (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.par (revision 16404) @@ -61,12 +61,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/SquareShelfConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 16404) @@ -7,5 +7,4 @@ from paterson import paterson from SetIceShelfBC import SetIceShelfBC -from massfluxatgate import massfluxatgate #Start defining model parameters here @@ -73,12 +72,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') - ] Index: /issm/trunk-jpl/test/Par/SquareThermal.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.par (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareThermal.par (revision 16404) @@ -43,12 +43,2 @@ md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1); md.basalforcings.geothermalflux(find(md.mask.groundedice_levelset>0.))=1.*10^-3; %1 mW/m^2 - -%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/SquareThermal.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.py (revision 16403) +++ /issm/trunk-jpl/test/Par/SquareThermal.py (revision 16404) @@ -2,5 +2,4 @@ from paterson import paterson from SetMarineIceSheetBC import SetMarineIceSheetBC -from massfluxatgate import massfluxatgate #Ok, start defining model parameters here @@ -48,12 +47,2 @@ md.basalforcings.geothermalflux=numpy.zeros((md.mesh.numberofvertices,1)) md.basalforcings.geothermalflux[numpy.nonzero(md.mask.groundedice_levelset>0.)[0]]=1.*10**-3 #1 mW/m^2 - -#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') - ]