Changeset 23292

Timestamp:

09/16/18 19:15:57 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make some test work with CODIPACK

Location:

issm/trunk-jpl

Files:

• jenkins/linux64_ross_codi (modified) (1 diff)
• test/NightlyRun/test3480.m (modified) (2 diffs)
• test/NightlyRun/test3481.m (modified) (2 diffs)

issm/trunk-jpl/jenkins/linux64_ross_codi

@@ -68 +68 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-MATLAB_NROPTIONS="'benchmark','all','id',[3105]"
-PYTHON_NROPTIONS="--benchmark='all' -i 3105"
+MATLAB_NROPTIONS="'benchmark','all','id',[3015,3119,3480]"
+PYTHON_NROPTIONS="--benchmark='all' -i 3015 3119 3480"

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

@@ -18 +18 @@
 md.inversion.iscontrol=1;
 md.autodiff.isautodiff=1;
+md.autodiff.driver='fos_reverse';
 
 md.friction.coefficient(1:md.mesh.numberofvertices,1)=50;
@@ -55 +56 @@
 md.inversion.maxiter = 2;
 md.cluster=generic('name',oshostname(),'np',3);
+if IssmConfig('_HAVE_CODIPACK_')
+        md.cluster.np=1;
+end
 md=solve(md,'transient');
 

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

@@ -18 +18 @@
 md.inversion.iscontrol=1;
 md.autodiff.isautodiff=1;
+md.autodiff.driver='fos_reverse';
 
 md.friction.coefficient(1:md.mesh.numberofvertices,1)=50;
@@ -61 +62 @@
 md.inversion.maxiter = 2;
 md.cluster=generic('name',oshostname(),'np',3);
+if IssmConfig('_HAVE_CODIPACK_')
+        md.cluster.np=1;
+end
 md=solve(md,'transient');