Index: /issm/trunk-jpl/test/NightlyRun/test101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test101.py (revision 26897) @@ -2,9 +2,9 @@ from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve from massfluxatgate import massfluxatgate from generic import generic Index: /issm/trunk-jpl/test/NightlyRun/test128.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test128.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test128.py (revision 26897) @@ -1,4 +1,5 @@ #Test Name: SquareShelfConstrainedTranMLHO2d from model import * +from SetMLHOBC import SetMLHOBC from socket import gethostname from triangle import * @@ -16,10 +17,10 @@ md.transient.requested_outputs = ['IceVolume','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase'] -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'VxShear1', 'VyShear1', 'VxBase1', 'VyBase1', 'VxSurface1', 'VySurface1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', - 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'VxShear2', 'VyShear2', 'VxBase2', 'VyBase2', 'VxSurface2', 'VySurface2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'VxShear1', 'VyShear1', 'VxBase1', 'VyBase1', 'VxSurface1', 'VySurface1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'VxShear2', 'VyShear2', 'VxBase2', 'VyBase2', 'VxSurface2', 'VySurface2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'VxShear3', 'VyShear3', 'VxBase3', 'VyBase3', 'VxSurface3', 'VySurface3', 'Bed3', 'Surface3', 'Thickness3', 'Volume3'] field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, Index: /issm/trunk-jpl/test/NightlyRun/test129.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test129.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test129.py (revision 26897) @@ -2,4 +2,5 @@ from model import * from socket import gethostname +from SetMLHOBC import SetMLHOBC from triangle import * from setmask import * @@ -23,5 +24,5 @@ md.timestepping.final_time = 19 md.settings.output_frequency = 2 -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Transient') Index: /issm/trunk-jpl/test/NightlyRun/test248.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test248.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test248.py (revision 26897) @@ -2,11 +2,10 @@ from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * - -from ContourToMesh import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC md = triangle(model(), '../Exp/Square.exp', 150000) @@ -16,5 +15,5 @@ md.cluster = generic('name', gethostname(), 'np', 3) md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase'] -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Stressbalance') @@ -27,7 +26,7 @@ md.results.StressbalanceSolution.Pressure, md.results.StressbalanceSolution.VxSurface, - md.results.StressbalanceSolution.VySurface, + md.results.StressbalanceSolution.VySurface, md.results.StressbalanceSolution.VxShear, - md.results.StressbalanceSolution.VyShear, + md.results.StressbalanceSolution.VyShear, md.results.StressbalanceSolution.VxBase, md.results.StressbalanceSolution.VyBase] Index: /issm/trunk-jpl/test/NightlyRun/test249.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test249.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test249.py (revision 26897) @@ -3,10 +3,11 @@ from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve from generic import generic +from SetMLHOBC import SetMLHOBC md = triangle(model(), '../Exp/Square.exp', 150000) @@ -17,5 +18,5 @@ md.cluster = generic('name', gethostname(), 'np', 3) md.transient.requested_outputs = ['default', 'FloatingArea', 'GroundedArea', 'TotalFloatingBmb', 'TotalGroundedBmb'] -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Transient') Index: /issm/trunk-jpl/test/NightlyRun/test252.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test252.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test252.py (revision 26897) @@ -72,8 +72,8 @@ nlayers = md.results.TransientSolution[0].SmbT.shape[1] for i in range(1, len(md.results.TransientSolution)): - nlayers=np.minimum(md.results.TransientSolution[i].SmbT.shape[1], nlayers) + nlayers = np.minimum(md.results.TransientSolution[i].SmbT.shape[1], nlayers) #Fields and tolerances to track changes -field_names = ['Layers','SmbDz1', 'SmbT1', 'SmbD1', 'SmbRe1', 'SmbGdn1', 'SmbGsp1', 'SmbA1', 'SmbEC1', 'SmbMassBalance1', 'SmbMAdd1', 'SmbDzAdd1', 'SmbFAC1', +field_names = ['Layers', 'SmbDz1', 'SmbT1', 'SmbD1', 'SmbRe1', 'SmbGdn1', 'SmbGsp1', 'SmbA1', 'SmbEC1', 'SmbMassBalance1', 'SmbMAdd1', 'SmbDzAdd1', 'SmbFAC1', 'SmbDz2', 'SmbT2', 'SmbD2', 'SmbRe2', 'SmbGdn2', 'SmbGsp2', 'SmbA2', 'SmbEC2', 'SmbMassBalance2', 'SmbMAdd2', 'SmbDzAdd2', 'SmbFAC2', 'SmbDz3', 'SmbT3', 'SmbD3', 'SmbRe3', 'SmbGdn3', 'SmbGsp3', 'SmbA3', 'SmbEC3', 'SmbMassBalance3', 'SmbMAdd3', 'SmbDzAdd3', 'SmbFAC3', Index: /issm/trunk-jpl/test/NightlyRun/test256.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test256.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test256.py (revision 26897) @@ -2,9 +2,10 @@ from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC @@ -17,5 +18,5 @@ md.cluster = generic('name', gethostname(), 'np', 1) md.masstransport.hydrostatic_adjustment = 'Incremental' -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Transient') Index: /issm/trunk-jpl/test/NightlyRun/test333.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test333.py (revision 26897) @@ -3,9 +3,10 @@ from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC @@ -32,5 +33,5 @@ md.cluster = generic('name', gethostname(), 'np', 3) -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test334.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test334.py (revision 26897) @@ -3,10 +3,11 @@ from socket import gethostname import numpy as np -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve from generic import generic +from SetMLHOBC import SetMLHOBC md = triangle(model(), '../Exp/Square.exp', 200000) @@ -32,5 +33,5 @@ md.cluster = generic('name', gethostname(), 'np', 3) -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test446.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test446.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test446.py (revision 26897) @@ -2,10 +2,10 @@ from model import * from socket import gethostname - -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC md = triangle(model(), '../Exp/Square.exp', 150000.) Index: /issm/trunk-jpl/test/NightlyRun/test448.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test448.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test448.py (revision 26897) @@ -3,9 +3,10 @@ from model import * from socket import gethostname -from roundmesh import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from roundmesh import roundmesh +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC @@ -38,5 +39,5 @@ #test different grounding line dynamics. md.groundingline.migration = 'AggressiveMigration' -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Transient') element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskOceanLevelset Index: /issm/trunk-jpl/test/NightlyRun/test518.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test518.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test518.py (revision 26897) @@ -1,10 +1,12 @@ + #Test Name: PigStressMLHO2d from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC @@ -15,5 +17,5 @@ md.cluster = generic('name', gethostname(), 'np', 3) md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase'] -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test810.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test810.py (revision 26896) +++ /issm/trunk-jpl/test/NightlyRun/test810.py (revision 26897) @@ -2,9 +2,10 @@ from model import * from socket import gethostname -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from solve import * +from triangle import triangle +from setmask import setmask +from parameterize import parameterize +from setflowequation import setflowequation +from solve import solve +from SetMLHOBC import SetMLHOBC md = triangle(model(), '../Exp/Square.exp', 50000) @@ -22,5 +23,5 @@ md.transient.isthermal = False md.transient.isgroundingline = True -md = SetMLHOBC(md); +md = SetMLHOBC(md) md = solve(md, 'Transient')