Changeset 16137 for issm/trunk/test/Par/ISMIPF.par

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/Par/ISMIPF.par (modified) (3 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/test/Par/ISMIPF.par

@@ -18 +18 @@
 md.materials.rheology_law='None';
 
-disp('      boundary conditions for diagnostic model');
+disp('      boundary conditions for stressbalance model');
 %Create node on boundary first (because we cannot use mesh)
 md=SetIceSheetBC(md);
-md.diagnostic.spcvx=100.*ones(md.mesh.numberofvertices,1);
+md.stressbalance.spcvx=100.*ones(md.mesh.numberofvertices,1);
 md.initialization.vx=zeros(md.mesh.numberofvertices,1);
 md.initialization.vy=zeros(md.mesh.numberofvertices,1);
@@ -31 +31 @@
 md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
 md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos);
-md.prognostic.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
-md.prognostic.spcthickness(pos)=md.geometry.thickness(pos);
+md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
+md.masstransport.spcthickness(pos)=md.geometry.thickness(pos);
 md.thermal.spctemperature=255.*ones(md.mesh.numberofvertices,1);
 md.basalforcings.geothermalflux=0.4*ones(md.mesh.numberofvertices,1);
@@ -42 +42 @@
 md.timestepping.time_step=1.;
 md.timestepping.final_time=10.;
-md.prognostic.stabilization=1;
+md.masstransport.stabilization=1;
 md.thermal.stabilization=1;
 md.thermal.penalty_threshold=10^5;

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad