Changeset 18974

Timestamp:

01/05/15 10:29:41 (10 years ago)

Author:

bdef

Message:

CHG: reverting nightly 3300

File:

• issm/trunk-jpl/test/NightlyRun/test3300.m (modified) (1 diff)

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

@@ -22 +22 @@
 md.hydrology.mask_eplactive_node=0*ones(md.mesh.numberofvertices,1);
 
-pos=find(md.mesh.y==0 & md.mesh.x<6.0e5 & md.mesh.x>4.0e5);
-md.hydrology.spcepl_head(pos)=0.0;
-
-
-md.hydrology.epl_conductivity=1000;
+md.hydrology.epl_conductivity=1.5e-2;
 md.hydrology.epl_initial_thickness=1.0;
-md.hydrology.epl_colapse_thickness=1.0e-5;
+md.hydrology.epl_colapse_thickness=1.0e-6;
 md.hydrology.epl_max_thickness=5.0;
 
 md.hydrology.transfer_flag=1.0;
-md.hydrology.leakage_factor=1.0e-1;
+md.hydrology.leakage_factor=3.9e-12;
 
-times=0:0.2:30.0;
+times=0:0.2:8.0;
 md.basalforcings.groundedice_melting_rate=ones(md.mesh.numberofvertices+1,length(times));
 
-% for i=1:length(times)
-%       if(times(i)<=1.0)
-%               md.basalforcings.groundedice_melting_rate(:,i)=1.0;
-%       elseif(times(i)<=6.0)
-%               md.basalforcings.groundedice_melting_rate(:,i)=-0.2;
-%       else
-%               md.basalforcings.groundedice_melting_rate(:,i)=0.0;
-%  end
-% end   
-md.basalforcings.groundedice_melting_rate(:,:)=1.0;
+for i=1:length(times)
+        if(times(i)<=1.0)
+                md.basalforcings.groundedice_melting_rate(:,i)=1.0;
+        elseif(times(i)<=6.0)
+                md.basalforcings.groundedice_melting_rate(:,i)=-0.2;
+        else
+                md.basalforcings.groundedice_melting_rate(:,i)=0.0;
+ end
+end     
+
 md.basalforcings.groundedice_melting_rate(end,:)=times;
 
 
 md.timestepping.time_step=0.2;
-md.timestepping.final_time=30.0;
+md.timestepping.final_time=8.0;
 
 md=solve(md,TransientSolutionEnum());