Changeset 10330

Timestamp:

10/27/11 08:36:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

reorganized test

Location:

issm/trunk/src/ad/validation

Files:

• Update/SquareShelfConstrained.par (added)
• Update/update.m (modified) (2 diffs)
• Validation/Archive.mat (added)
• Validation/validation.bin (modified) ( previous)
• Validation/validation.m (modified) (2 diffs)
• Validation/validation.queue (modified) (1 diff)

issm/trunk/src/ad/validation/Update/update.m

@@ -1 +1 @@
 tolerance=1e-13;
 
-md=setmesh(model,'Exp/Square.exp',150000);
+md=setmesh(model,'Square.exp',150000);
 md=setmask(md,'all','');
-md=parameterize(md,'Par/SquareShelfConstrained.par');
+md=parameterize(md,'SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
+md.settings.results_on_vertices=1;
 md.cluster=generic('name',oshostname(),'np',3);
+md.cluster.executionpath=[issmtier() '/src/ad/validation/Validation/'];
 
-md.autodiff.analysis=true;
+md.autodiff.isautodiff=true;
 md.autodiff.forward=true;
 md.verbose=verbose('solution',true);
@@ -13 +15 @@
 md=solve(md,PrognosticSolutionEnum);
 
-s=load('Archive/archive.mat'); h0=s.Archive110_field1;
-h=PatchToVec(md.results.PrognosticSolution.Thickness);
-
-error_diff=full(max(abs(h-h0))/(max(abs(h0))+eps));
-
-if (error_diff>tolerance);
-        disp(sprintf(['\n\n\nERROR   difference: %-7.2g > %7.2g \n\n\n'],error_diff,tolerance));
-else
-        disp(sprintf(['\n\n\nSUCCESS difference: %-7.2g < %7.2g \n\n\n'],error_diff,tolerance));
-end
-
+thickness=md.results.PrognosticSolution.Thickness;
+save ../Validation/Archive.mat thickness;

issm/trunk/src/ad/validation/Validation/validation.m

@@ -4 +4 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.miscellaneous.name='validation';
-
 
 %launch solution directly: 
@@ -12 +11 @@
 
 s=load('Archive/archive.mat'); h0=s.Archive110_field1;
-h=PatchToVec(md.results.PrognosticSolution.Thickness);
+h=md.results.PrognosticSolution.Thickness;
 
 error_diff=full(max(abs(h-h0))/(max(abs(h0))+eps));

issm/trunk/src/ad/validation/Validation/validation.queue

@@ -1 +1 @@
 #!/bin/sh
-mpiexec -np 3 $ISSM_TIER/bin/issm.exe PrognosticSolution ./  validation  > validation.outlog
+mpiexec -np 3 $ISSM_TIER/bin/issm.exe PrognosticSolution ./ validation > validation.outlog