Changeset 20952

Timestamp:

07/19/16 14:37:49 (9 years ago)

Author:

agscott1

Message:

CHG: Reverting scripts/ol and NightlyRun Tests

Location:

issm/trunk-jpl

Files:

• scripts/ol (modified) (1 diff)
• test/NightlyRun/test101.m (modified) (1 diff)
• test/NightlyRun/test102.m (modified) (1 diff)
• test/NightlyRun/test243.m (modified) (1 diff)

issm/trunk-jpl/scripts/ol

@@ -3 +3 @@
 #Get the runme file, read it, and display steps
 rm -rf orglist_temporary_file
-LIST=$(cat runme.m | grep perform | sed "s/'/ /g" | awk '{print $3}')
+LIST=$(cat runme.m | grep perform | grep if | sed "s/'/ /g" | awk '{print $3}')
 
 COUNT=0;

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

@@ -4 +4 @@
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np',1); % originally, 'np',2
+md.cluster=generic('name',oshostname(),'np',2);
 
 %output

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

@@ -5 +5 @@
 md=extrude(md,3,2.);
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np', 3); %originally 3
+md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,StressbalanceSolutionEnum());
 

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

@@ -45 +45 @@
 %Fields and tolerances to track changes
 field_names      ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance'};
-field_tolerances ={1e-13,1e-13,5e-13,5e-13,1e-13 ,5e-13 ,1e-13,1e-13,1e-13};
+field_tolerances ={1e-7,5e-5,1e-4,5e-5,1e-5,5e-5,1e-5,1e-7,1e-7};
 
 field_values={...