Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 19183) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 19184) @@ -55,4 +55,5 @@ iomodel->Constant(&this->rlaps,SurfaceforcingsRlapsEnum); iomodel->Constant(&this->rlapslgm,SurfaceforcingsRlapslgmEnum); + // iomodel->Constant(&this->dpermil,SurfaceforcingsDpermilEnum); break; case SMBgradientsEnum: @@ -134,4 +135,5 @@ _printf_(" rlaps: " << rlaps << "\n"); _printf_(" rlapslgm: " << rlapslgm << "\n"); + // _printf_(" dpermil: " << dpermil << "\n"); return; } @@ -179,4 +181,5 @@ matpar->rlaps=this->rlaps; matpar->rlapslgm=this->rlapslgm; + // matpar->dpermil=this->dpermil; matpar->sediment_compressibility=this->sediment_compressibility; @@ -274,4 +277,7 @@ this->rlapslgm=constant; break; +// case SurfaceforcingsDpermilEnum: +// this->dpermil=constant; +// break; default: break; @@ -400,4 +406,5 @@ case SurfaceforcingsRlapsEnum: return this->rlaps; case SurfaceforcingsRlapslgmEnum: return this->rlapslgm; + // case SurfaceforcingsDpermilEnum: return this->dpermil; case MaterialsLithosphereShearModulusEnum: return this->lithosphere_shear_modulus; case MaterialsLithosphereDensityEnum: return this->lithosphere_density; Index: /issm/trunk-jpl/src/m/classes/clusters/acenet.m =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/acenet.m (revision 19183) +++ /issm/trunk-jpl/src/m/classes/clusters/acenet.m (revision 19184) @@ -74,5 +74,5 @@ % fprintf(fid,'#$ -l h_rt=336:00:0\n'); - fprintf(fid,'#$ -l h_vmem=3.5G\n'); + fprintf(fid,'#$ -l h_vmem=3G\n'); % if cluster.np>10 % fprintf(fid,'#$ -l h_vmem=3G\n'); @@ -94,8 +94,8 @@ % ---- cpus on different nodes ---- - % fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand + fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand % fprintf(fid,'#$ -pe ompi* %i\n',cluster.np); % -------- All cpus in the same node -------- - fprintf(fid,'#$ -pe openmp %i\n',cluster.np); + %fprintf(fid,'#$ -pe openmp %i\n',cluster.np); % ---- misc ---- Index: sm/trunk-jpl/test/NightlyRun/test240.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test240.m (revision 19183) +++ (revision ) @@ -1,85 +1,0 @@ -%Test Name: SquareShelfTranIspddIsdeltaO18pdSSA2d -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelf.par'); - -%md.verbose=verbose('all'); - -% Use of ispdd and isdelta18o methods -md.surfaceforcings = SMBpdd(); -md.surfaceforcings.isd18opd=1; -%md.surfaceforcings.precipitation(1:md.mesh.numberofvertices,1:12)=0; -%md.surfaceforcings.monthlytemperatures(1:md.mesh.numberofvertices,1:12)=273; - -% Add temperature, precipitation and delta18o needed to measure the surface mass balance -% creating delta18o -load '../Data/delta18o.data' -md.surfaceforcings.delta18o=delta18o; - -% creating Present day temperatures -% Same temperature over the all region: -tmonth(1:12)=238.15+20.; -for imonth=0:11 - md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1); - % Time for the last line: - md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12); -end - -% creating initialization and spc temperatures initialization and -% spc -md.thermal.spctemperature=mean(md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,1:12),2)-10; %-10*ones(md.mesh.numberofvertices,1); - -md.initialization.temperature=md.thermal.spctemperature; %md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,1); - -% creating precipitation -for imonth=0:11 - md.surfaceforcings.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5; - % Time for the last line: - md.surfaceforcings.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12); -end - -% time steps and resolution -md.timestepping.time_step=20; -md.settings.output_frequency=1; -md.timestepping.final_time=60; - -% -md.transient.requested_outputs={'default','SurfaceforcingsMonthlytemperatures'}; -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',1); % 3 for the cluster -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).Base),... - (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).Base),... - (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).Base),... - (md.results.TransientSolution(3).Surface),... - (md.results.TransientSolution(3).Thickness),... - (md.results.TransientSolution(3).SurfaceforcingsMonthlytemperatures),... - (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... - };