Changeset 18582

Timestamp:

10/06/14 12:22:34 (10 years ago)

Author:

bdef

Message:

CHG:adding EPL colapse

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test3300.m (modified) (3 diffs)
• test333.m (modified) (1 diff)
• test335.m (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/test3300.m

@@ -14 +14 @@
 md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
 md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
+md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
 md.hydrology.sediment_transmitivity=1.5e-4*ones(md.mesh.numberofvertices,1);
 
@@ -24 +24 @@
 md.hydrology.epl_conductivity=1.5e-2;
 md.hydrology.epl_initial_thickness=1.0;
+md.hydrology.epl_colapse_thickness=1.0e-6;
 md.hydrology.epl_max_thickness=5.0;
 
@@ -30 +31 @@
 
 times=0:0.2:8.0;
-md.basalforcings.melting_rate=ones(md.mesh.numberofvertices+1,length(times));
+md.basalforcings.groundedice_melting_rate=ones(md.mesh.numberofvertices+1,length(times));
 
 for i=1:length(times)
         if(times(i)<1.2)
-                md.basalforcings.melting_rate(:,i)=1.0;
+                md.basalforcings.groundedice_melting_rate(:,i)=1.0;
         elseif(times(i)<6.0)
-                md.basalforcings.melting_rate(:,i)=-0.2;
+                md.basalforcings.groundedice_melting_rate(:,i)=-0.2;
         else
-                md.basalforcings.melting_rate(:,i)=0.0;
+                md.basalforcings.groundedice_melting_rate(:,i)=0.0;
  end
 end     
 
-md.basalforcings.melting_rate(end,:)=times;
+md.basalforcings.groundedice_melting_rate(end,:)=times;
 
 

issm/trunk-jpl/test/NightlyRun/test333.m

@@ -23 +23 @@
 md.hydrology.epl_conductivity=30;
 md.hydrology.epl_initial_thickness=1;
+md.hydrology.epl_colapse_thickness=1.0e-3;
 md.hydrology.epl_max_thickness=1;
 md.timestepping.time_step=0.2;

issm/trunk-jpl/test/NightlyRun/test335.m

@@ -23 +23 @@
 md.hydrology.epl_conductivity=30;
 md.hydrology.epl_initial_thickness=1;
+md.hydrology.epl_colapse_thickness=1.0e-3;
 md.hydrology.epl_max_thickness=1;
 md.timestepping.time_step=0.2;