Changeset 997

Timestamp:

06/13/09 21:06:35 (16 years ago)

Author:

Mathieu Morlighem

Message:

extended runme and updatearchive new structure to CM

Location:

issm/trunk/test/Verification

Files:

• PigControlMethodBM2d_21/runme.m (modified) (2 diffs)
• PigControlMethodBM2d_21/updatearchive.m (modified) (1 diff)
• PigControlMethodDragM2d_20/runme.m (modified) (2 diffs)
• PigControlMethodDragM2d_20/updatearchive.m (modified) (2 diffs)

issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m

@@ -8 +8 @@
 %      runme;
 %      runme({'ice'});
-%      runme({'ice','cielo_serial'});
+%      runme({'ice','cielo_serial'},{'absolute'});
 %      md=runme({'cielo_parallel'});
 %
@@ -24 +24 @@
 % free to tweak the tolerance variable.
 
+%check arguments
+if (nargin>2 | nargout>1)
+        help runme
+        error('runme error message: bad usage');
+end
+
 %packages and misfits to be tested
-if nargin==1,
+if nargin==2,
+        misfits=varargin{2};
+else
+        misfits={'absolute','relative','logarithmic'};
+end
+if nargin,
         packages=varargin{1};
 else
         packages={'macayeal','cielo_parallel','cielo_serial'};
 end
-misfits={'absolute','relative','logarithmic'};
 
 %Initialize log message for nightly runs.

issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m

@@ -20 +20 @@
 % Just commit the result if you want to.
 
+%check arguments
+if (nargin>2 | nargout>1)
+        help updatearchive
+        error('updatearchive error message: bad usage');
+end
+
 %packages and misfits to be tested
-if nargin==1,
+if nargin==2,
+        misfits=varargin{2};
+else
+        misfits={'absolute','relative','logarithmic'};
+end
+if nargin,
         packages=varargin{1};
 else
         packages={'macayeal','cielo_parallel','cielo_serial'};
 end
-misfits={'absolute','relative','logarithmic'};
 
 %Initialize log message for nightly runs.

issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m

@@ -8 +8 @@
 %      runme;
 %      runme({'ice'});
-%      runme({'ice','cielo_serial'},{'diagnostic'});
+%      runme({'ice','cielo_serial'},{'absolute'});
 %      md=runme({'cielo_parallel'});
 %
@@ -24 +24 @@
 % free to tweak the tolerance variable.
 
+%check arguments
+if (nargin>2 | nargout>1)
+        help runme
+        error('runme error message: bad usage');
+end
+
 %packages and misfits to be tested
-if nargin==1,
+if nargin==2,
+        misfits=varargin{2};
+else
+        misfits={'absolute','relative','logarithmic'};
+end
+if nargin,
         packages=varargin{1};
 else
         packages={'cielo_serial','cielo_parallel'};
 end
-misfits={'absolute','relative','logarithmic'};
 
 %Initialize log message for nightly runs.

issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m

@@ -8 +8 @@
 %      updatearchive;
 %      updatearchive({'ice'});
-%      updatearchive({'ice','cielo_serial'},{'diagnostic'});
+%      updatearchive({'ice','cielo_serial'},{'absolute'});
 %      md=updatearchive({'cielo_parallel'});
 %
@@ -20 +20 @@
 % Just commit the result if you want to.
 
+%check arguments
+if (nargin>2 | nargout>1)
+        help updatearchive
+        error('updatearchive error message: bad usage');
+end
+
 %packages and misfits to be tested
-if nargin==1,
+if nargin==2,
+        misfits=varargin{2};
+else
+        misfits={'absolute','relative','logarithmic'};
+end
+if nargin,
         packages=varargin{1};
 else
         packages={'cielo_parallel','cielo_serial'};
 end
-misfits={'absolute','relative','logarithmic'};
 
 %Initialize log message for nightly runs.