Changeset 1018

Timestamp:

06/19/09 08:10:20 (16 years ago)

Author:

Mathieu Morlighem

Message:

added solution as an input

Location:

issm/trunk/src/m/utils

Files:

• Nightly/nightlyrun.m (modified) (2 diffs)
• UpdateArchive/updatearchive.m (modified) (2 diffs)

issm/trunk/src/m/utils/Nightly/nightlyrun.m

@@ -13 +13 @@
 %      nightlyrun({'ice'});
 %      nightlyrun({'cielo_serial','cielo_parallel'});
+%      nightlyrun({'ice'},{'prognostic','diagnostic'});
+
+%check arguments
+if (nargin>2)
+        help nightlyrun
+        error('nightlyrun error message: bad usage');
+end
 
 %use ISSM_DIR generated by startup.m
@@ -27 +34 @@
 list=strsplit(list,'|');
 
+%Get packages
+if nargin,
+        packages=varargin{1};
+else
+        packages={'macayeal','ice','cielo_serial','cielo_parallel'};
+end
+
 %Go through list of decks, and run the deck runme.m files package by package.
-packages={'macayeal','ice','cielo_serial','cielo_parallel'};
-if nargin==1,
+for i=1:length(packages),
         for j=2:length(list)-1,
                 eval(['cd ' list{j}]);
-                runme(varargin{1});
+                if nargin==2,
+                        runme(packages(i),varargin(2));
+                else
+                        runme(packages(i));
+                end
                 cd ..
-        end
-else
-        for i=1:length(packages),
-                for j=2:length(list)-1,
-                        eval(['cd ' list{j}]);
-                        runme({packages{i}});
-                        cd ..
-                end
         end
 end

issm/trunk/src/m/utils/UpdateArchive/updatearchive.m

@@ -14 +14 @@
 %      updatearchive({'ice'});
 %      updatearchive({'cielo_serial','cielo_parallel'});
+%      updatearchive({'ice'},{'prognostic','diagnostic'});
+
+%check arguments
+if (nargin>2)
+        help updatearchive
+        error('updatearchive error message: bad usage');
+end
 
 %use ISSM_DIR generated by startup.m
@@ -27 +34 @@
 [status,list]=system('ls -l | grep -v CVS | awk ''{printf("%s|",$9);}'' '); %only works on *nix systems.
 list=strsplit(list,'|');
-%Go through list of decks, and run the deck updatearchive.m files.
-for i=2:length(list)-1,
-        eval(['cd ' list{i}]);
-        if nargin==1
-                updatearchive(varargin{1});
-        else
-                updatearchive;
+
+%Get packages
+if nargin,
+        packages=varargin{1};
+else
+        packages={'macayeal','ice','cielo_serial','cielo_parallel'};
+end
+
+%Go through list of decks, and run the deck updatearchive.m files package by package.
+for i=1:length(packages),
+        for j=2:length(list)-1,
+                eval(['cd ' list{j}]);
+                if nargin==2,
+                        updatearchive(packages(i),varargin(2));
+                else
+                        updatearchive(packages(i));
+                end
+                cd ..
         end
-        cd ..
 end