Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 22864) @@ -40,8 +40,8 @@ # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature=np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices,:],axis=1).reshape(-1,1) #-10*ones(md.mesh.numberofvertices,1) -md.thermal.spctemperature=np.tile(md.thermal.spctemperature,(1,md.timestepping.final_time/md.timestepping.time_step)) +md.thermal.spctemperature=np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices,:],axis=1) #-10*ones(md.mesh.numberofvertices,1) +md.thermal.spctemperature=np.tile(md.thermal.spctemperature,(int(md.timestepping.final_time/md.timestepping.time_step),1)).T itemp=np.arange(0,md.timestepping.final_time,md.timestepping.time_step) -md.thermal.spctemperature=np.vstack((md.thermal.spctemperature,itemp.reshape(1,-1))) +md.thermal.spctemperature=np.vstack((md.thermal.spctemperature,itemp)) md.initialization.temperature=md.smb.temperatures_lgm[0:md.mesh.numberofvertices,0] #*ones(md.mesh.numberofvertices,1) @@ -52,15 +52,15 @@ md.smb.precipitations_lgm=np.zeros((md.mesh.numberofvertices+1,12)) for imonth in xrange(0,12): - md.smb.precipitations_presentday[0:md.mesh.numberofvertices,imonth]=-0.4*10**(-6)*md.mesh.y+0.5 - md.smb.precipitations_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) - md.smb.precipitations_lgm[0:md.mesh.numberofvertices,imonth]=-0.4*10**(-6)*md.mesh.y+0.5 - md.smb.precipitations_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + md.smb.precipitations_presentday[0:md.mesh.numberofvertices,imonth]=-0.4*10**(-6)*md.mesh.y+0.5 + md.smb.precipitations_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + md.smb.precipitations_lgm[0:md.mesh.numberofvertices,imonth]=-0.4*10**(-6)*md.mesh.y+0.5 + md.smb.precipitations_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) # Interpolation factors -md.smb.Tdiff=0.5*np.ones((2,md.timestepping.final_time)) -md.smb.sealev=0.5*np.ones((2,md.timestepping.final_time)) +md.smb.Tdiff=0.5*np.ones((2,int(md.timestepping.final_time))) +md.smb.sealev=0.5*np.ones((2,int(md.timestepping.final_time))) # Year of each data point -md.smb.Tdiff[1,1:md.timestepping.final_time]=np.arange(1.,md.timestepping.final_time) -md.smb.sealev[1,1:md.timestepping.final_time]=np.arange(1.,md.timestepping.final_time) +md.smb.Tdiff[1,1:int(md.timestepping.final_time)]=np.arange(1.,int(md.timestepping.final_time)) +md.smb.sealev[1,1:int(md.timestepping.final_time)]=np.arange(1.,int(md.timestepping.final_time)) # time steps and resolution @@ -69,5 +69,5 @@ -# +# md.transient.requested_outputs=['default','SmbMonthlytemperatures'] md=setflowequation(md,'SSA','all') @@ -76,37 +76,35 @@ #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1',\ - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2',\ - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'] -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,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] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - 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].SmbMonthlytemperatures,\ - md.results.TransientSolution[0].SmbMassBalance,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - 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].SmbMonthlytemperatures,\ - md.results.TransientSolution[1].SmbMassBalance,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - 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].SmbMonthlytemperatures,\ - md.results.TransientSolution[2].SmbMassBalance,\ - ] +field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1', + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2', + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'] +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,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] +field_values=[md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + 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].SmbMonthlytemperatures, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + 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].SmbMonthlytemperatures, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + 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].SmbMonthlytemperatures, + md.results.TransientSolution[2].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test237.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 22864) @@ -38,10 +38,10 @@ # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature=np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices,:],axis=1).reshape(-1,1) #-10*ones(md.mesh.numberofvertices,1) -md.thermal.spctemperature=np.tile(md.thermal.spctemperature,(1,md.timestepping.final_time/md.timestepping.time_step)) +md.thermal.spctemperature=np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices,:],axis=1) #-10*ones(md.mesh.numberofvertices,1) +md.thermal.spctemperature=np.tile(md.thermal.spctemperature,(int(md.timestepping.final_time/md.timestepping.time_step),1)).T itemp=np.arange(0,md.timestepping.final_time,md.timestepping.time_step) -md.thermal.spctemperature=np.vstack((md.thermal.spctemperature,itemp.reshape(1,-1))) +md.thermal.spctemperature=np.vstack((md.thermal.spctemperature,itemp)) -md.initialization.temperature=md.smb.temperatures_lgm[0:md.mesh.numberofvertices,0].reshape(-1,1) #*ones(md.mesh.numberofvertices,1) +md.initialization.temperature=md.smb.temperatures_lgm[0:md.mesh.numberofvertices,0] #*ones(md.mesh.numberofvertices,1) md.smb.initialize(md) Index: /issm/trunk-jpl/test/NightlyRun/test292.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test292.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test292.py (revision 22864) @@ -24,27 +24,29 @@ # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Base1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Base2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Base3','Surface3','Thickness3'] -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,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - 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[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - 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[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - 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,\ - ] +field_names =['Vx1','Vy1','Vel1','Pressure1','Base1','Surface1','Thickness1', + 'Vx2','Vy2','Vel2','Pressure2','Base2','Surface2','Thickness2', + 'Vx3','Vy3','Vel3','Pressure3','Base3','Surface3','Thickness3'] +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, + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + 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[1].Vx, + md.results.TransientSolution[1].Vy, + 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[2].Vx, + md.results.TransientSolution[2].Vy, + 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] Index: /issm/trunk-jpl/test/NightlyRun/test501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test501.py (revision 22864) @@ -19,8 +19,6 @@ field_names =['Vx','Vy','Vel','Pressure'] field_tolerances=[1e-12,2e-12,2e-12,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_values=[md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test514.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test514.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test514.py (revision 22864) @@ -46,10 +46,10 @@ #refine existing mesh 4 -md2=bamg(copy.deepcopy(md),'field',md.inversion.vy_obs,'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',0,'err',np.array([[1.]])) +md2=bamg(copy.deepcopy(md),'field',md.inversion.vy_obs,'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',0,'err',np.array([1.])) x6=md2.mesh.x y6=md2.mesh.y #refine existing mesh 5 -md2=bamg(copy.deepcopy(md),'field',np.hstack((md.inversion.vy_obs,md.geometry.thickness)),'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',1,'err',np.array([[10.,100.]])) +md2=bamg(copy.deepcopy(md),'field',np.vstack((md.inversion.vy_obs,md.geometry.thickness)).T,'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',1,'err',np.array([[10.,100.]])) x7=md2.mesh.x y7=md2.mesh.y Index: /issm/trunk-jpl/test/NightlyRun/test515.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test515.py (revision 22864) @@ -24,11 +24,9 @@ # Fields and tolerances to track changes -field_names =['Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Temperature2','BasalforcingsGroundediceMeltingRate2'] +field_names =['Temperature1','BasalforcingsGroundediceMeltingRate1', + 'Temperature2','BasalforcingsGroundediceMeltingRate2'] field_tolerances=[1e-13,1e-8,1e-13,5e-8] -field_values=[\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - ] +field_values=[md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test601.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test601.py (revision 22864) @@ -19,5 +19,3 @@ field_names =['Thickness'] field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_values=[md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test611.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test611.py (revision 22864) @@ -35,8 +35,6 @@ field_names =['Gradient','Misfits','BalancethicknessThickeningRate','Thickness'] field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[\ - md.results.BalancethicknessSolution.Gradient1,\ - md.results.BalancethicknessSolution.J,\ - md.results.BalancethicknessSolution.BalancethicknessThickeningRate,\ - md.results.BalancethicknessSolution.Thickness -] +field_values=[md.results.BalancethicknessSolution.Gradient1, + md.results.BalancethicknessSolution.J, + md.results.BalancethicknessSolution.BalancethicknessThickeningRate, + md.results.BalancethicknessSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test701.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test701.py (revision 22864) @@ -36,9 +36,9 @@ #Boundary conditions -md.stressbalance.referential = float('NaN')*np.ones((md.mesh.numberofvertices,6)) +md.stressbalance.referential = np.nan*np.ones((md.mesh.numberofvertices,6)) md.stressbalance.loadingforce = 0. * np.ones((md.mesh.numberofvertices,3)) -md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices,)) md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 0. md.stressbalance.spcvy[np.where(md.mesh.vertexflags(4))] = 0. @@ -46,5 +46,5 @@ #Misc md = setflowequation(md,'FS','all') -md.stressbalance.abstol = float('NaN') +md.stressbalance.abstol = np.nan #md.stressbalance.reltol = 10**-16 md.stressbalance.FSreconditioning = 1. @@ -67,8 +67,6 @@ 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, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure - ] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 22864) @@ -32,5 +32,4 @@ #mesh domain md = bamgflowband(model(),x,b+h,b,'hmax',150.) -print md.mesh.numberofvertices #geometry @@ -40,38 +39,28 @@ #mask -md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices,)) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices)) md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0 -md.mask.groundedice_levelset = np.zeros((md.mesh.numberofvertices,)) - 0.5 +md.mask.groundedice_levelset = -0.5*np.ones((md.mesh.numberofvertices)) +md.mask.groundedice_levelset[np.where(md.mesh.x<0)]=0.5 #materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements,)) +md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements)) #friction -md.friction.coefficient = np.zeros((md.mesh.numberofvertices,)) +md.friction.coefficient = np.zeros((md.mesh.numberofvertices)) md.friction.coefficient[np.where(md.mesh.vertexflags(1))] = 20 -md.friction.p = np.ones((md.mesh.numberofelements,)) -md.friction.q = np.ones((md.mesh.numberofelements,)) +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #boundary conditions -md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) +md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) +md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.referential = np.nan * np.ones((md.mesh.numberofvertices,6)) md.stressbalance.loadingforce = 0 * np.ones((md.mesh.numberofvertices,3)) md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 800. md.stressbalance.spcvy[np.where(md.mesh.vertexflags(4))] = 0. - -#print md.stressbalance.referential -#print md.stressbalance.loadingforce -#print md.stressbalance.spcvx -#print md.stressbalance.spcvy -#print md.stressbalance.spcvz -#print np.shape(md.stressbalance.referential) -#print np.shape(md.stressbalance.loadingforce) -#print np.shape(md.stressbalance.spcvx) -#print np.shape(md.stressbalance.spcvy) -#print np.shape(md.stressbalance.spcvz) #Misc @@ -103,5 +92,6 @@ md.cluster = generic('np',3) md.stressbalance.shelf_dampening = 1 -md1 = solve(md,'Transient') +md1=copy.deepcopy(md) +md1 = solve(md1,'Transient') md.stressbalance.shelf_dampening = 0 @@ -109,60 +99,56 @@ #Fields and tolerances to track changes -field_names = [ - 'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3', - 'Vx1_damp','Vy1_damp','Vel1_damp','Pressure1_damp','Bed1_damp','Surface1_damp','Thickness1_damp', - 'Vx2_damp','Vy2_damp','Vel2_damp','Pressure2_damp','Bed2_damp','Surface2_damp','Thickness2_damp', - 'Vx3_damp','Vy3_damp','Vel3_damp','Pressure3_damp','Bed3_damp','Surface3_damp','Thickness3_damp'] -field_tolerances = [ - 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, - 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, - 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, - 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, - 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, - 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - 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[1].Vx, - md.results.TransientSolution[1].Vy, - 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[2].Vx, - md.results.TransientSolution[2].Vy, - 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, - md1.results.TransientSolution[0].Vx, - md1.results.TransientSolution[0].Vy, - md1.results.TransientSolution[0].Vel, - md1.results.TransientSolution[0].Pressure, - md1.results.TransientSolution[0].Base, - md1.results.TransientSolution[0].Surface, - md1.results.TransientSolution[0].Thickness, - md1.results.TransientSolution[1].Vx, - md1.results.TransientSolution[1].Vy, - md1.results.TransientSolution[1].Vel, - md1.results.TransientSolution[1].Pressure, - md1.results.TransientSolution[1].Base, - md1.results.TransientSolution[1].Surface, - md1.results.TransientSolution[1].Thickness, - md1.results.TransientSolution[2].Vx, - md1.results.TransientSolution[2].Vy, - md1.results.TransientSolution[2].Vel, - md1.results.TransientSolution[2].Pressure, - md1.results.TransientSolution[2].Base, - md1.results.TransientSolution[2].Surface, - md1.results.TransientSolution[2].Thickness, - ] +field_names = ['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3', + 'Vx1_damp','Vy1_damp','Vel1_damp','Pressure1_damp','Bed1_damp','Surface1_damp','Thickness1_damp', + 'Vx2_damp','Vy2_damp','Vel2_damp','Pressure2_damp','Bed2_damp','Surface2_damp','Thickness2_damp', + 'Vx3_damp','Vy3_damp','Vel3_damp','Pressure3_damp','Bed3_damp','Surface3_damp','Thickness3_damp'] +field_tolerances = [2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, + 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, + 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, + 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, + 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, + 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + 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[1].Vx, + md.results.TransientSolution[1].Vy, + 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[2].Vx, + md.results.TransientSolution[2].Vy, + 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, + md1.results.TransientSolution[0].Vx, + md1.results.TransientSolution[0].Vy, + md1.results.TransientSolution[0].Vel, + md1.results.TransientSolution[0].Pressure, + md1.results.TransientSolution[0].Base, + md1.results.TransientSolution[0].Surface, + md1.results.TransientSolution[0].Thickness, + md1.results.TransientSolution[1].Vx, + md1.results.TransientSolution[1].Vy, + md1.results.TransientSolution[1].Vel, + md1.results.TransientSolution[1].Pressure, + md1.results.TransientSolution[1].Base, + md1.results.TransientSolution[1].Surface, + md1.results.TransientSolution[1].Thickness, + md1.results.TransientSolution[2].Vx, + md1.results.TransientSolution[2].Vy, + md1.results.TransientSolution[2].Vel, + md1.results.TransientSolution[2].Pressure, + md1.results.TransientSolution[2].Base, + md1.results.TransientSolution[2].Surface, + md1.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test808.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test808.py (revision 22863) +++ /issm/trunk-jpl/test/NightlyRun/test808.py (revision 22864) @@ -44,33 +44,29 @@ #Fields and tolerances to track changes -field_names = [ - 'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1' - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2' - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'] -field_tolerances = [ - 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9, - 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9, - 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset - ] +field_names = [ 'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1' + 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2' + 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'] +field_tolerances = [1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9, + 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9, + 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset]