Changeset 16195

Timestamp:

09/19/13 21:50:25 (12 years ago)

Author:

Eric.Larour

Message:

CHG: unhooking ampi tests

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.m (modified) (1 diff)
• runme.py (modified) (1 diff)
• test3019.m (modified) (2 diffs)
• testad.m (modified) (1 diff)

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

@@ -121 +121 @@
         test_ids=intersect(test_ids,[2001:2100]);
 elseif strcmpi(benchmark,'adolc'),
-        test_ids=intersect(test_ids,[3001:3200]);
+        test_ids=intersect(test_ids,[3001:3020]);
 end
 % }}}

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -120 +120 @@
                 test_ids=test_ids.intersection(set(range(2001,2100)))
         elif strcmpi(benchmark,'adolc'):
-                test_ids=test_ids.intersection(set(range(3001,3200)))
+                test_ids=test_ids.intersection(set(range(3001,3020)))
         #print 'test_ids after benchmark =',test_ids
         test_ids=list(test_ids)

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

@@ -4 +4 @@
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np',1);
-md.toolkits.DefaultAnalysis=issmgslsolver();
+md.cluster=generic('name',oshostname(),'np',3);
+%md.debug.valgrind=true;
+%md.verbose=verbose('11111111')
+md.toolkits.DefaultAnalysis=issmmumpssolver();
+%md.toolkits.DefaultAnalysis.solver_type='gsl';
 
 md.autodiff.isautodiff=true;
@@ -20 +23 @@
 jac_reverse=md.results.TransientSolution(1).AutodiffJacobian;
 
-%now run vectorial forward mode
-md.autodiff.independents={independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fov_forward_indices',(1:md.mesh.numberofvertices)')};
-md.autodiff.dependents={dependent('name','MaxVel','type','scalar')};
-md.autodiff.driver='fov_forward';
-
-md=solve(md,TransientSolutionEnum());
-
-%recover jacobian: 
-jac_forward=md.results.TransientSolution(1).AutodiffJacobian;
-
 %Fields and tolerances to track changes
-field_names     ={'Jac Forward','Jac Reverse','Jac Forward - Reverse'};
-field_tolerances={1e-8,1e-8,1e-6};
-field_values={jac_forward,jac_reverse,jac_forward-jac_reverse};
+field_names     ={'Jac Reverse'};
+field_tolerances={1e-8};
+field_values={jac_reverse};

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

@@ -1 +1 @@
 %test reverse scalar vs forward vectorial drivers in ADOLC, using the test3009 setup, equivalent to test109 setup.
-md=triangle(model(),'../Exp/Square.exp',500000.);
+md=triangle(model(),'../Exp/Square.exp',100000.);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np',2);
+md.cluster=generic('name',oshostname(),'np',3);
 %md.debug.valgrind=true;
 %md.verbose=verbose('11111111')
-md.toolkits.DefaultAnalysis=issmsolver();
+md.toolkits.DefaultAnalysis=issmmumpssolver();
 %md.toolkits.DefaultAnalysis.solver_type='gsl';