Changeset 10960

Timestamp:

11/29/11 08:13:42 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• examples/Bumps (deleted)
• examples/IceStream (deleted)
• lib (copied) (copied from issm/trunk/lib )
• scripts/SyncBranches.sh (deleted)
• test/NightlyRun/test420.m (modified) (1 diff)
• test/NightlyRun/test452.m (modified) (1 diff)

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

@@ -10 +10 @@
 %Fields and tolerances to track changes
 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
-};
+field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-06};
 field_values={...
         PatchToVec(md.results.SteadystateSolution.Vx),...

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

@@ -27 +27 @@
 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-11,1e-11,1e-11,1e-13};
 field_values={...
         PatchToVec(md.results.TransientSolution(1).Bed),...