Index: /issm/trunk-jpl/test/NightlyRun/test1101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 21411) @@ -35,7 +35,7 @@ #Create dirichlet on the bed only - 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)) pos=np.where(md.mesh.vertexonbase) Index: /issm/trunk-jpl/test/NightlyRun/test1102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 21411) @@ -47,6 +47,6 @@ #Compute the stressbalance - md.stressbalance.abstol=float('NaN') - md.stressbalance.reltol=float('NaN') + md.stressbalance.abstol=np.nan + md.stressbalance.reltol=np.nan md.stressbalance.restol=1. md.cluster=generic('name',gethostname(),'np',8) Index: /issm/trunk-jpl/test/NightlyRun/test1103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 21411) @@ -34,7 +34,7 @@ #Create dirichlet on the bed only - 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)) pos=np.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 21411) @@ -28,7 +28,7 @@ #Create dirichlet on the bed only - 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)) pos=np.where(md.mesh.vertexonbase) @@ -46,5 +46,5 @@ print np.shape(md.stressbalance.vertex_pairing) #Compute the stressbalance - md.stressbalance.abstol=float('NaN') + md.stressbalance.abstol=np.nan md.cluster=generic('name',gethostname(),'np',8) md=solve(md,'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test1105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 21411) @@ -34,7 +34,7 @@ #Create MPCs to have periodic boundary conditions - 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)) posx=np.where(np.logical_and.reduce((md.mesh.x==0.,md.mesh.y!=0.,md.mesh.y!=L)))[0] Index: /issm/trunk-jpl/test/NightlyRun/test1107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 21411) @@ -34,7 +34,7 @@ #We need one grd on dirichlet: the 4 corners are set to zero - 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)) #Create MPCs to have periodic boundary conditions Index: /issm/trunk-jpl/test/NightlyRun/test1108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 21411) @@ -31,7 +31,7 @@ #We need one grd on dirichlet: the 4 corners are set to zero - 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)) pos=np.nonzero(logical_and.reduce_n(md.mesh.vertexonbase,np.logical_or.reduce(md.mesh.x==0.,md.mesh.x==np.max(md.mesh.x)),np.logical_or.reduce(md.mesh.y==0.,md.mesh.y==np.max(md.mesh.y)))) @@ -53,11 +53,11 @@ md.verbose=verbose('convergence',True) md=solve(md,'Stressbalance') - md.stressbalance.reltol=float('NaN') - md.stressbalance.abstol=float('NaN') + md.stressbalance.reltol=np.nan + md.stressbalance.abstol=np.nan md.stressbalance.vertex_pairing=np.empty((0,2)) #We need one grid on dirichlet: the 4 corners are set to zero - 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)) pos=np.nonzero(logical_or.reduce_n(md.mesh.y==0.,md.mesh.x==0.,md.mesh.x==np.max(md.mesh.x),md.mesh.y==np.max(md.mesh.y))) #Don't take the same nodes two times md.stressbalance.spcvx[pos]=md.results.StressbalanceSolution.Vx[pos] Index: /issm/trunk-jpl/test/NightlyRun/test1201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 21411) @@ -39,5 +39,5 @@ pos=np.where(md.mesh.y>199999.9)[0] times=np.arange(0,501) - md.masstransport.spcthickness=float('NaN')*np.ones((md.mesh.numberofvertices+1,np.size(times))) + md.masstransport.spcthickness=np.nan*np.ones((md.mesh.numberofvertices+1,np.size(times))) md.masstransport.spcthickness[-1,:]=times md.masstransport.spcthickness[pos,:]=500.+100.*np.sin(2.*np.pi*times/200.) Index: /issm/trunk-jpl/test/NightlyRun/test1601.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 21411) @@ -15,5 +15,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md=setflowequation(md,'SSA','all') -md.stressbalance.spcvx[np.nonzero(md.mesh.y>0.)]=float('NaN') +md.stressbalance.spcvx[np.nonzero(md.mesh.y>0.)]=np.nan md.initialization.vx[:]=0. md.initialization.vy[:]=0. @@ -40,5 +40,5 @@ #Now, put CS back to normal except on the side where the spc are applied pos=np.nonzero(np.logical_or.reduce(x==0.,x==1000000.))[0] -md.stressbalance.referential[:]=float('NaN') +md.stressbalance.referential[:]=np.nan md.stressbalance.referential[pos,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(len(pos))) md.stressbalance.referential[pos,3: ]=np.tile([0,0,1],(len(pos))) Index: /issm/trunk-jpl/test/NightlyRun/test1602.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 21411) @@ -16,5 +16,5 @@ md.extrude(5,1.) md=setflowequation(md,'HO','all') -md.stressbalance.spcvx[np.nonzero(md.mesh.y>0.)]=float('NaN') +md.stressbalance.spcvx[np.nonzero(md.mesh.y>0.)]=np.nan md.initialization.vx[:]=0. md.initialization.vy[:]=0. Index: /issm/trunk-jpl/test/NightlyRun/test211.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test211.py (revision 21411) @@ -1,4 +1,3 @@ #Test Name: SquareShelfTranFS - from model import * from socket import gethostname @@ -16,5 +15,5 @@ md.extrude(3,1.) md=setflowequation(md,'FS','all') -md.stressbalance.reltol=NaN +md.stressbalance.reltol=np.NaN md.cluster=generic('name',gethostname(),'np',3) md=solve(md,'Transient') @@ -23,42 +22,38 @@ # Fields and tolerances to track changes -field_names=[\ - 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[\ - 2e-08,2e-08,5e-05,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\ - 5e-06,5e-06,8e-05,5e-06,1e-07,5e-07,5e-07,5e-07,3e-06,5e-05,\ - 8e-06,8e-06,8e-05,8e-06,5e-07,8e-07,8e-07,8e-07,5e-06,8e-05] -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].BasalforcingsGroundediceMeltingRate,\ - 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].BasalforcingsGroundediceMeltingRate,\ - 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].BasalforcingsGroundediceMeltingRate,\ - ] +field_names=['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] +field_tolerances=[2e-08,2e-08,5e-05,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08, + 5e-06,5e-06,8e-05,5e-06,1e-07,5e-07,5e-07,5e-07,3e-06,5e-05, + 8e-06,8e-06,8e-05,8e-06,5e-07,8e-07,8e-07,8e-07,5e-06,8e-05] +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].BasalforcingsGroundediceMeltingRate, + 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].BasalforcingsGroundediceMeltingRate, + 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].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test212.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test212.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test212.py (revision 21411) @@ -1,4 +1,3 @@ #Test Name: SquareShelfCMBSSA2d - from model import * from socket import gethostname @@ -16,17 +15,16 @@ md=setflowequation(md,'SSA','all') - # control parameters md.inversion.iscontrol=1 md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices)) -md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices)) +md.inversion.min_parameters=1.0e6*np.ones((md.mesh.numberofvertices)) +md.inversion.max_parameters=2.0e9*np.ones((md.mesh.numberofvertices)) md.inversion.nsteps=2 md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices)) -md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps)) -md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*ones((md.inversion.nsteps)) +md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices)) +md.inversion.gradient_scaling=1.0e7*np.ones((md.inversion.nsteps)) +md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) +md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy @@ -41,11 +39,9 @@ field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ -md.results.StressbalanceSolution.Gradient1,\ -md.results.StressbalanceSolution.J,\ -md.results.StressbalanceSolution.MaterialsRheologyBbar,\ -md.results.StressbalanceSolution.Pressure,\ -md.results.StressbalanceSolution.Vel,\ -md.results.StressbalanceSolution.Vx,\ -md.results.StressbalanceSolution.Vy,\ -] +field_values=[md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test213.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test213.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test213.py (revision 21411) @@ -22,12 +22,12 @@ md.inversion.iscontrol=1 md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices)) -md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices)) +md.inversion.min_parameters=10**6*np.ones((md.mesh.numberofvertices)) +md.inversion.max_parameters=2.*10**9*np.ones((md.mesh.numberofvertices)) md.inversion.nsteps=2 md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices)) -md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps)) -md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*ones((md.inversion.nsteps)) +md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices)) +md.inversion.gradient_scaling=10**7*np.ones((md.inversion.nsteps)) +md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) +md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy @@ -43,11 +43,9 @@ field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] #field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.MaterialsRheologyBbar,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_values=[md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test214.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test214.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test214.py (revision 21411) @@ -22,12 +22,12 @@ md.inversion.iscontrol=1 md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices)) -md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices)) +md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices)) +md.inversion.max_parameters=2.*1e9*np.ones((md.mesh.numberofvertices)) md.inversion.nsteps=2 md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices)) -md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps)) -md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*ones((md.inversion.nsteps)) +md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices)) +md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps)) +md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) +md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy @@ -42,11 +42,9 @@ field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] field_tolerances=[1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.MaterialsRheologyBbar,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy -] +field_values=[md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test215.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test215.py (revision 21411) @@ -22,12 +22,12 @@ md.inversion.iscontrol=1 md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices)) -md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices)) +md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices)) +md.inversion.max_parameters=2e9*np.ones((md.mesh.numberofvertices)) md.inversion.nsteps=2 md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices)) -md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps)) -md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*ones((md.inversion.nsteps)) +md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices)) +md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps)) +md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) +md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy @@ -42,11 +42,9 @@ field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] field_tolerances=[4.6e-08,1e-08,2e-09,1e-08,2e-09,5e-09,2e-09] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.MaterialsRheologyBbar,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy -] +field_values=[md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test217.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test217.py (revision 21411) @@ -1,4 +1,3 @@ #Test Name: SquareShelfConstrained - from model import * from socket import gethostname @@ -23,5 +22,5 @@ # tighten -md.stressbalance.restol=10**-4 +md.stressbalance.restol=1e-4 # needed later @@ -34,37 +33,37 @@ h=1000. -md.geometry.thickness=h*ones((md.mesh.numberofvertices)) +md.geometry.thickness=h*np.ones((md.mesh.numberofvertices)) md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness md.geometry.surface=md.geometry.base+md.geometry.thickness # Initial velocity and pressure -md.initialization.vx=zeros((md.mesh.numberofvertices)) -md.initialization.vy=zeros((md.mesh.numberofvertices)) -md.initialization.vz=zeros((md.mesh.numberofvertices)) -md.initialization.pressure=zeros((md.mesh.numberofvertices)) +md.initialization.vx=np.zeros((md.mesh.numberofvertices)) +md.initialization.vy=np.zeros((md.mesh.numberofvertices)) +md.initialization.vz=np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure=np.zeros((md.mesh.numberofvertices)) # Materials -md.initialization.temperature=(273.-20.)*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.*ones((md.mesh.numberofelements)) +md.materials.rheology_n=3.*np.ones((md.mesh.numberofelements)) # Boundary conditions: -md.stressbalance.spcvx=float(nan)*ones((md.mesh.numberofvertices)) -md.stressbalance.spcvy=float(nan)*ones((md.mesh.numberofvertices)) -md.stressbalance.spcvz=float(nan)*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)) # constrain flanks to 0 normal velocity -pos=np.nonzero(np.logical_or.reduce(md.mesh.x==xmin,md.mesh.x==xmax)) +pos=np.where(np.logical_or(md.mesh.x==xmin,md.mesh.x==xmax)) md.stressbalance.spcvx[pos]=0 -md.stressbalance.spcvz[pos]=float(nan) +md.stressbalance.spcvz[pos]=np.nan # constrain grounding line to 0 velocity -pos=np.nonzero(md.mesh.y==ymin) +pos=np.where(md.mesh.y==ymin) md.stressbalance.spcvx[pos]=0 md.stressbalance.spcvy[pos]=0 # icefront -nodeonicefront=zeros(md.mesh.numberofvertices) -pos=np.nonzero(md.mesh.y==ymax) +nodeonicefront=np.zeros(md.mesh.numberofvertices) +pos=np.where(md.mesh.y==ymax) nodeonicefront[pos]=1 md.mask.ice_levelset=-1+nodeonicefront @@ -79,5 +78,3 @@ field_names =['Vy'] field_tolerances=[1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vy,\ - ] +field_values=[md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test270.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test270.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test270.py (revision 21411) @@ -2,5 +2,5 @@ import numpy as np from model import * - from socket import gethostnamemodel +from socket import gethostname from triangle import triangle from setmask import setmask @@ -26,8 +26,6 @@ field_names =['Vx','Vy','Vel','Pressure'] field_tolerances=[1e-13,1e-13,1e-13,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/test272.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test272.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test272.py (revision 21411) @@ -2,5 +2,5 @@ import numpy as np from model import * - from socket import gethostnamemodel +from socket import gethostname from triangle import triangle from setmask import setmask @@ -41,11 +41,9 @@ field_names =['Gradient','Misfits','DamageDbar','Pressure','Vel','Vx','Vy'] field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.DamageDbar,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_values=[md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.DamageDbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test273.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test273.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test273.py (revision 21411) @@ -2,5 +2,5 @@ import numpy as np from model import * - from socket import gethostnamemodel +from socket import gethostname from triangle import triangle from setmask import setmask @@ -31,9 +31,7 @@ field_names =['Vx','Vy','Vel','Pressure','NewDamage'] field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.NewDamage,\ - ] +field_values=[md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.NewDamage] Index: /issm/trunk-jpl/test/NightlyRun/test274.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test274.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test274.py (revision 21411) @@ -2,5 +2,5 @@ import numpy as np from model import * - from socket import gethostnamemodel +from socket import gethostname from triangle import triangle from setmask import setmask @@ -30,8 +30,6 @@ field_names =['Vx','Vy','Vel','Pressure'] field_tolerances=[7e-8,3e-8,3e-8,1e-11] -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/test275.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test275.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test275.py (revision 21411) @@ -3,5 +3,5 @@ from triangle import triangle from model import * - from socket import gethostnamemodel +from socket import gethostname from setmask import setmask from parameterize import parameterize @@ -37,6 +37,4 @@ field_names=['D','F'] field_tolerances=[1.e-13,1.e-13] -field_values=[\ - md.results.DamageEvolutionSolution.DamageDbar,\ - md.results.DamageEvolutionSolution.DamageF,\ - ] +field_values=[md.results.DamageEvolutionSolution.DamageDbar, + md.results.DamageEvolutionSolution.DamageF] Index: /issm/trunk-jpl/test/NightlyRun/test3300.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 21411) @@ -28,5 +28,5 @@ md.hydrology.sediment_thickness=20.0 md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) md.hydrology.sediment_transmitivity=1.5e-4*np.ones((md.mesh.numberofvertices)) @@ -34,5 +34,5 @@ md.initialization.epl_head=np.zeros((md.mesh.numberofvertices)) md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcepl_head=np.nan*np.ones((md.mesh.numberofvertices)) md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices)) Index: /issm/trunk-jpl/test/NightlyRun/test332.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test332.py (revision 21411) @@ -29,5 +29,5 @@ md.hydrology.sedimentlimit=8000.0 md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) pos=np.nonzero(md.mesh.y==0.)[0] md.hydrology.spcsediment_head[pos]=0.0 Index: /issm/trunk-jpl/test/NightlyRun/test333.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test333.py (revision 21411) @@ -28,5 +28,5 @@ md.hydrology.sedimentlimit=800.0 md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) @@ -36,5 +36,5 @@ md.initialization.epl_head=np.zeros((md.mesh.numberofvertices)) md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcepl_head=np.nan*np.ones((md.mesh.numberofvertices)) md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices)) md.hydrology.epl_conductivity=30 Index: /issm/trunk-jpl/test/NightlyRun/test334.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test334.py (revision 21411) @@ -27,5 +27,5 @@ md.hydrology.sedimentlimit=8000.0 md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) md.hydrology.spcsediment_head[np.where(md.mesh.y==0)]=0.0 Index: /issm/trunk-jpl/test/NightlyRun/test335.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test335.py (revision 21411) @@ -28,5 +28,5 @@ md.hydrology.sedimentlimit=800.0 md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) @@ -35,5 +35,5 @@ md.initialization.epl_head=np.zeros((md.mesh.numberofvertices)) md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head=float('NaN')*np.ones((md.mesh.numberofvertices)) +md.hydrology.spcepl_head=np.nan*np.ones((md.mesh.numberofvertices)) md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices)) md.hydrology.epl_conductivity=30 Index: /issm/trunk-jpl/test/NightlyRun/test514.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test514.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test514.py (revision 21411) @@ -39,5 +39,5 @@ #refine existing mesh 3 -hVertices=float('nan')*np.ones((md.mesh.numberofvertices)) +hVertices=np.nan*np.ones((md.mesh.numberofvertices)) hVertices[np.nonzero(md.mesh.vertexonboundary)]=500. md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'geometricalmetric',1,'anisomax',1.,'hVertices',hVertices) @@ -58,11 +58,3 @@ field_names =['x1','y1','x2','y2','x3','y3','x4','y4','x5','y5','x6','y6','x7','y7'] field_tolerances = [2e-10,7e-10,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=[\ - x1, y1,\ - y2, y2,\ - y3, y3,\ - y4, y4,\ - y5, y5,\ - y6, y6,\ - y7, y7,\ - ] +field_values=[x1, y1, y2, y2, y3, y3, y4, y4, y5, y5, y6, y6, y7, y7] Index: /issm/trunk-jpl/test/NightlyRun/test806.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test806.py (revision 21411) @@ -38,5 +38,5 @@ md.calving.coeff=4.89e13*np.ones((md.mesh.numberofvertices)) md.calving.meltingrate=np.zeros((md.mesh.numberofvertices)) -md.levelset.spclevelset=np.float('NaN')*np.ones((md.mesh.numberofvertices)) +md.levelset.spclevelset=np.np.nan*np.ones((md.mesh.numberofvertices)) md.transient.requested_outputs=['default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate'] Index: /issm/trunk-jpl/test/NightlyRun/test807.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.py (revision 21410) +++ /issm/trunk-jpl/test/NightlyRun/test807.py (revision 21411) @@ -37,5 +37,5 @@ md.calving.calvingrate=np.zeros((md.mesh.numberofvertices)) md.calving.meltingrate=10000*np.ones((md.mesh.numberofvertices)) -md.levelset.spclevelset=np.float('NaN')*np.ones((md.mesh.numberofvertices)) +md.levelset.spclevelset=np.np.nan*np.ones((md.mesh.numberofvertices)) md=solve(md,'Transient')