Index: /issm/trunk-jpl/test/NightlyRun/test247.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test247.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test247.py (revision 26906) @@ -1,3 +1,3 @@ -#Test Name: SquareShelfTranIspddIsdeltaO18pdNoInterpSSA2d +#Test Name: SquareShelfTranIspddIsdeltaO18pdNoInterpSSA2d import numpy as np from model import * @@ -57,10 +57,10 @@ tim1 = np.linspace(1,12,12)/12 -md.smb.temperatures_reconstructed[md.mesh.numberofvertices,0:12] = tim1 +md.smb.temperatures_reconstructed[md.mesh.numberofvertices,0:12] = tim1 md.smb.temperatures_reconstructed[md.mesh.numberofvertices,12:24] = tim1+3 md.smb.temperatures_reconstructed[md.mesh.numberofvertices,24:36] = tim1+5 md.smb.precipitations_reconstructed[md.mesh.numberofvertices,0:12] = tim1 -md.smb.precipitations_reconstructed[md.mesh.numberofvertices,12:24] = tim1+3 +md.smb.precipitations_reconstructed[md.mesh.numberofvertices,12:24] = tim1+3 md.smb.precipitations_reconstructed[md.mesh.numberofvertices,24:36] = tim1+5 @@ -68,5 +68,5 @@ # spc md.thermal.spctemperature=np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices,0:12],axis=1)-10. -md.initialization.temperature=md.thermal.spctemperature +md.initialization.temperature=md.thermal.spctemperature md.smb.s0p = np.maximum(md.geometry.surface.reshape(-1, 1),np.zeros((md.mesh.numberofvertices,1))) @@ -89,5 +89,5 @@ md.thermal.isdrainicecolumn = 0 -md=solve(md,'thermal') +md = solve(md, 'thermal') md.initialization.temperature = md.results.ThermalSolution.Temperature @@ -121,54 +121,54 @@ #Fields and tolerances to track changes -field_names = ['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','SmbMassBalance1', - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','SmbMassBalance2', - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','SmbMassBalance3', - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','Enthalpy4','SmbMassBalance4'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-13, - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-13, - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-13, - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-13] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'Enthalpy1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'Enthalpy2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'Enthalpy3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vz4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'Temperature4', 'Enthalpy4', 'SmbMassBalance4'] +field_tolerances=[1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13] field_values = [md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].Enthalpy, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].Enthalpy, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Temperature, - md.results.TransientSolution[2].Enthalpy, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vz, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].Temperature, - md.results.TransientSolution[3].Enthalpy, - md.results.TransientSolution[3].SmbMassBalance] + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vz, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].Temperature, + md.results.TransientSolution[3].Enthalpy, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test317.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test317.py (revision 26906) @@ -20,5 +20,5 @@ #Fields and tolerances to track changes -field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1' +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb2', 'TotalGroundedBmb2'] Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 26906) @@ -2,9 +2,9 @@ from model import * from socket import gethostname - -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 md = triangle(model(), '../Exp/Square.exp', 150000.) Index: /issm/trunk-jpl/test/NightlyRun/test436.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test436.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test436.py (revision 26906) @@ -3,9 +3,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 md = triangle(model(), '../Exp/Square.exp', 150000.) @@ -26,5 +26,5 @@ for i in ['LliboutryDuval', 'CuffeyTemperate']: print(' ') - print(' == == == Testing rheology law: ' + i + ' = ') + print(' ====== Testing rheology law: ' + i + ' = ') md.materials.rheology_law = i Index: /issm/trunk-jpl/test/NightlyRun/test443.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test443.py (revision 26906) @@ -3,10 +3,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 frictioncoulomb import frictioncoulomb from ContourToMesh import ContourToMesh Index: /issm/trunk-jpl/test/NightlyRun/test612.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test612.py (revision 26906) @@ -2,5 +2,6 @@ import numpy as np from model import * -from setmask import * +from setmask import setmask +from setflowequation import setflowequation from triangle import triangle from parameterize import parameterize Index: /issm/trunk-jpl/test/NightlyRun/test701.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.py (revision 26905) +++ /issm/trunk-jpl/test/NightlyRun/test701.py (revision 26906) @@ -66,5 +66,5 @@ md.flowequation.fe_FS = i md = solve(md, 'Stressbalance') - field_names = field_names + [['Vx' + i], ['Vy' + i], ['Vel' + i], ['Pressure' + i]] + field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vel' + i, 'Pressure' + i] field_tolerances = field_tolerances + [9e-5, 9e-5, 9e-5, 1e-10] field_values = field_values + [md.results.StressbalanceSolution.Vx,