Index: /issm/trunk-jpl/test/NightlyRun/test236.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.m (revision 13616) +++ /issm/trunk-jpl/test/NightlyRun/test236.m (revision 13617) @@ -12,11 +12,10 @@ load '../Data/delta18o.data' md.surfaceforcings.delta18o=delta18o; -% creating delta18oSurface +% creating delta18oSurface md.surfaceforcings.delta18o_surface(1,1:(length(delta18o))) = 0; md.surfaceforcings.delta18o_surface(2,:) = delta18o(2,:); % creating Present day and lgm temperatures -% Same temperature over the all region : -imonth=0:11; +% Same temperature over the all region: tmonth(1:12)=238.15+20.; for imonth=0:11 @@ -31,5 +30,5 @@ md.thermal.spctemperature=mean(md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,1:12),2); %-10*ones(md.mesh.numberofvertices,1); md.thermal.spctemperature=repmat(md.thermal.spctemperature,1,md.timestepping.final_time/md.timestepping.time_step); -itemp = 0:md.timestepping.time_step:md.timestepping.final_time-md.timestepping.time_step; +itemp=0:md.timestepping.time_step:md.timestepping.final_time-md.timestepping.time_step; md.thermal.spctemperature(md.mesh.numberofvertices+1,:)=itemp; Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 13617) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 13617) @@ -0,0 +1,96 @@ +import numpy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',150000.) +md=setmask(md,'all','') + +# Use of ispdd and isdelta18o methods +md.surfaceforcings.ispdd=1 +md.surfaceforcings.isdelta18o=1 + +md=parameterize(md,'../Par/SquareShelf.py') + +# Add temperature, precipitation and delta18o needed to measure the surface mass balance +# creating delta18o +delta18o=numpy.loadtxt('../Data/delta18o.data') +md.surfaceforcings.delta18o=delta18o +# creating delta18oSurface +md.surfaceforcings.delta18o_surface = numpy.zeros((2,numpy.size(delta18o,axis=1))) +md.surfaceforcings.delta18o_surface[1,:] = delta18o[1,:] + +# creating Present day and lgm temperatures +# Same temperature over the all region: +tmonth=numpy.ones(12)*(238.15+20.) +md.surfaceforcings.temperatures_presentday=numpy.zeros((md.mesh.numberofvertices+1,12)) +md.surfaceforcings.temperatures_lgm=numpy.zeros((md.mesh.numberofvertices+1,12)) +for imonth in xrange(0,12): + md.surfaceforcings.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] + md.surfaceforcings.temperatures_lgm[0:md.mesh.numberofvertices,imonth]=tmonth[imonth]-20. + # Time for the last line: + md.surfaceforcings.temperatures_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + md.surfaceforcings.temperatures_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + +# creating initialization and spc temperatures initialization and spc +md.thermal.spctemperature=numpy.mean(md.surfaceforcings.temperatures_lgm[0:md.mesh.numberofvertices,:],axis=1).reshape(-1,1) #-10*ones(md.mesh.numberofvertices,1) +md.thermal.spctemperature=numpy.tile(md.thermal.spctemperature,(1,md.timestepping.final_time/md.timestepping.time_step)) +itemp=numpy.arange(0,md.timestepping.final_time,md.timestepping.time_step) +md.thermal.spctemperature=numpy.vstack((md.thermal.spctemperature,itemp.reshape(1,-1))) + +md.initialization.temperature=md.surfaceforcings.temperatures_lgm[0:md.mesh.numberofvertices,0] #*ones(md.mesh.numberofvertices,1) + +# creating precipitation +md.surfaceforcings.precipitations_presentday=numpy.zeros((md.mesh.numberofvertices+1,12)) +for imonth in xrange(0,12): + md.surfaceforcings.precipitations_presentday[0:md.mesh.numberofvertices,imonth]=-0.4*10**(-6)*md.mesh.y+0.5 + md.surfaceforcings.precipitations_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + +# time steps and resolution +md.timestepping.time_step=20. +md.timestepping.final_time=60. + +# +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#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'] +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'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['SurfaceforcingsMonthlytemperatures'],\ + md.results['TransientSolution'][1]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['SurfaceforcingsMonthlytemperatures'],\ + md.results['TransientSolution'][2]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['SurfaceforcingsMonthlytemperatures'],\ + md.results['TransientSolution'][3]['SurfaceforcingsMassBalance'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test237.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.m (revision 13616) +++ /issm/trunk-jpl/test/NightlyRun/test237.m (revision 13617) @@ -12,11 +12,10 @@ load '../Data/delta18o.data' md.surfaceforcings.delta18o=delta18o; -% creating delta18oSurface +% creating delta18oSurface md.surfaceforcings.delta18o_surface(1,1:(length(delta18o))) = 0; md.surfaceforcings.delta18o_surface(2,:) = delta18o(2,:); % creating Present day and lgm temperatures -% Same temperature over the all region : -imonth=0:11; +% Same temperature over the all region: tmonth(1:12)=238.15+20.; for imonth=0:11 @@ -31,5 +30,5 @@ md.thermal.spctemperature=mean(md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,1:12),2); %-10*ones(md.mesh.numberofvertices,1); md.thermal.spctemperature=repmat(md.thermal.spctemperature,1,md.timestepping.final_time/md.timestepping.time_step); -itemp = 0:md.timestepping.time_step:md.timestepping.final_time-md.timestepping.time_step; +itemp=0:md.timestepping.time_step:md.timestepping.final_time-md.timestepping.time_step; md.thermal.spctemperature(md.mesh.numberofvertices+1,:)=itemp; Index: /issm/trunk-jpl/test/NightlyRun/test237.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.py (revision 13617) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 13617) @@ -0,0 +1,110 @@ +import numpy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',600000) #180000 +md=setmask(md,'all','') + +# Use of ispdd and isdelta18o methods +md.surfaceforcings.ispdd=1 +md.surfaceforcings.isdelta18o=1 + +md=parameterize(md,'../Par/SquareShelf.py') + +# Add temperature, precipitation and delta18o needed to measure the surface mass balance +# creating delta18o +delta18o=numpy.loadtxt('../Data/delta18o.data') +md.surfaceforcings.delta18o=delta18o +# creating delta18oSurface +md.surfaceforcings.delta18o_surface = numpy.zeros((2,numpy.size(delta18o,axis=1))) +md.surfaceforcings.delta18o_surface[1,:] = delta18o[1,:] + +# creating Present day and lgm temperatures +# Same temperature over the all region: +tmonth=numpy.ones(12)*(238.15+20.) +md.surfaceforcings.temperatures_presentday=numpy.zeros((md.mesh.numberofvertices+1,12)) +md.surfaceforcings.temperatures_lgm=numpy.zeros((md.mesh.numberofvertices+1,12)) +for imonth in xrange(0,12): + md.surfaceforcings.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] + md.surfaceforcings.temperatures_lgm[0:md.mesh.numberofvertices,imonth]=tmonth[imonth]-20. + # Time for the last line: + md.surfaceforcings.temperatures_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + md.surfaceforcings.temperatures_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + +# creating initialization and spc temperatures initialization and spc +md.thermal.spctemperature=numpy.mean(md.surfaceforcings.temperatures_lgm[0:md.mesh.numberofvertices,:],axis=1).reshape(-1,1) #-10*ones(md.mesh.numberofvertices,1) +md.thermal.spctemperature=numpy.tile(md.thermal.spctemperature,(1,md.timestepping.final_time/md.timestepping.time_step)) +itemp=numpy.arange(0,md.timestepping.final_time,md.timestepping.time_step) +md.thermal.spctemperature=numpy.vstack((md.thermal.spctemperature,itemp.reshape(1,-1))) + +md.initialization.temperature=md.surfaceforcings.temperatures_lgm[0:md.mesh.numberofvertices,0] #*ones(md.mesh.numberofvertices,1) + +# creating precipitation +md.surfaceforcings.precipitations_presentday=numpy.zeros((md.mesh.numberofvertices+1,12)) +for imonth in xrange(0,12): + md.surfaceforcings.precipitations_presentday[0:md.mesh.numberofvertices,imonth]=-0.4*10**(-6)*md.mesh.y+0.5 + md.surfaceforcings.precipitations_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + +# time steps and resolution +md.timestepping.time_step=20. +md.settings.output_frequency=1 +md.timestepping.final_time=60. + +# +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'] +field_tolerances=[\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\ + 1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8] +field_values=[\ + 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]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][1]['SurfaceforcingsMonthlytemperatures'],\ + md.results['TransientSolution'][1]['SurfaceforcingsMassBalance'],\ + 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]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['SurfaceforcingsMonthlytemperatures'],\ + md.results['TransientSolution'][2]['SurfaceforcingsMassBalance'],\ + 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]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['SurfaceforcingsMonthlytemperatures'],\ + md.results['TransientSolution'][3]['SurfaceforcingsMassBalance'],\ + ]