Changeset 17059

Timestamp:

01/06/14 06:28:07 (11 years ago)

Author:

Eric.Larour

Message:

CHG: relaxed tolerances for windows tests on 334 and 332.
For Windows runs, no MUMPS yet, so can't do the FS runs, exclude these from the nightlys.
gmresjacobioptions: need to convert all the solvers to the new IssmConfig format.

Location:

issm/trunk-jpl

Files:

• jenkins/windows (modified) (1 diff)
• src/m/solvers/gmresjacobioptions.m (modified) (1 diff)
• test/NightlyRun/test332.m (modified) (1 diff)
• test/NightlyRun/test334.m (modified) (1 diff)

issm/trunk-jpl/jenkins/windows

@@ -97 +97 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-MATLAB_NROPTIONS=""
+
+#In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs.
+MATLAB_NROPTIONS="'exclude',[104, 204, 211, 215, 220, 221, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 701, 702]"
 PYTHON_NROPTIONS=""
+
+

issm/trunk-jpl/src/m/solvers/gmresjacobioptions.m

@@ -7 +7 @@
 
 
-PETSC_VERSION=petscversion();
+PETSC_VERSION=IssmConfig('_PETSC_MAJOR_');
 if PETSC_VERSION==3,
    solverOptions.mat_type=getfieldvalue(options, 'mat_type','mpiaij');

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

@@ -23 +23 @@
 %analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
 field_names     ={'SedimentWaterHead','SedimentHeadResidual'};
-field_tolerances={1e-13, 2.5e-10};
+field_tolerances={1e-13, 3e-10};
 field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual};

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

@@ -25 +25 @@
 %analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
 field_names     ={'SedimentWaterHead','SedimentHeadResidual'};
-field_tolerances={1e-13, 2.5e-10};
+field_tolerances={1e-13, 3e-10};
 field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual};