Changeset 114

Timestamp:

04/28/09 16:58:32 (16 years ago)

Author:

Eric.Larour

Message:

Moved cielo.rc to issm.rc

Location:

issm/trunk

Files:

• etc/issm.rc (moved) (moved from issm/trunk/etc/cielo.rc ) (1 diff)
• src/m/classes/public/loadresultsfromcluster.m (modified) (1 diff)
• src/m/classes/public/peek.m (modified) (1 diff)
• src/m/classes/public/preparerun.m (modified) (1 diff)
• src/m/classes/public/solveparallel.m (modified) (1 diff)
• src/m/solutions/ice/debug.m (modified) (3 diffs)
• src/m/utils/Model/ProcessParallelParametersFromCieloRc.m (modified) (6 diffs)

issm/trunk/etc/issm.rc

@@ -60 +60 @@
 server_port=1025
 server_tunneling=no
-server_codepath=/u/astrid1/larour/issm-1.0/bin
+server_codepath=/u/astrid1/larour/issm/trunk/bin
 server_executionpath=/home/larour/Testing/Execution
 

issm/trunk/src/m/classes/public/loadresultsfromcluster.m

@@ -5 +5 @@
 %      md=loadresultsfromcluster(md,solutiontype);
 
-%Get cielo.rc location
-cielo_rc_location=which('cielo.rc');
+%Get issm.rc location
+issm_rc_location=which('issm.rc');
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,cielo_rc_location);
+[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,issm_rc_location);
 
 %if we are running locally, no need to call ssh to recover the logs and results. We figure out by comparing the 

issm/trunk/src/m/classes/public/peek.m

@@ -7 +7 @@
 %   See also: QueueJobPeek
 
-%Get cielo.rc location
-cielo_rc_location=which('cielo.rc');
+%Get issm.rc location
+issm_rc_location=which('issm.rc');
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,cielo_rc_location);
+[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,issm_rc_location);
 
 %peek at the queued job

issm/trunk/src/m/classes/public/preparerun.m

@@ -20 +20 @@
 end
 
-%Get cielo.rc location
-cielo_rc_location=which('cielo.rc');
+%Get issm.rc location
+issm_rc_location=which('issm.rc');
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,cielo_rc_location);
+[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,issm_rc_location);
 
 %Marshall model data into a binary file.

issm/trunk/src/m/classes/public/solveparallel.m

@@ -20 +20 @@
 end
 
-%Get cielo.rc location
-cielo_rc_location=which('cielo.rc');
+%Get issm.rc location
+issm_rc_location=which('issm.rc');
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,cielo_rc_location);
+[codepath,executionpath]=ProcessParallelParametersFromCieloRc(md.cluster,issm_rc_location);
 
 %Marshall model data into a binary file.

issm/trunk/src/m/solutions/ice/debug.m

@@ -4 +4 @@
 %   the results of both solutions
 
-%first get this into the cielo code, at the core solution level
+%first get this into the issm code, at the core solution level
 %PetscSynchronizedPrintf(MPI_COMM_WORLD,"Messing up here\n");
 %PetscSynchronizedFlush(MPI_COMM_WORLD);
@@ -14 +14 @@
 %nicely, if not correct. When everything works, reinstate the try catch.
 
-%an alter is used to modify the core solution in Ice, to stop right after Emg. But for cielo, 
+%an alter is used to modify the core solution in Ice, to stop right after Emg. But for issm, 
 %we don't have an alter, just use the first 5 lines of this file and put them in the batch 
 %solution.
@@ -61 +61 @@
 md=solve(md,'diagnostic_horiz','cielo');
 
-cielo_rc_location=which('cielo.rc'); [codepath,executionpath]=ProcessBatchParametersFromCieloRc(md.cluster,cielo_rc_location);
+issm_rc_location=which('issm.rc'); [codepath,executionpath]=ProcessBatchParametersFromCieloRc(md.cluster,issm_rc_location);
 
 pause(5);

issm/trunk/src/m/utils/Model/ProcessParallelParametersFromCieloRc.m

@@ -1 @@
-function [server_codepath server_executionpath]=ProcessParallelParametersFromCieloRc(server_name,cielo_rc_location)
-%PROCESSPARALLELPARAMETERSFROMCIELORC - process parallel parameters from cielo
+function [server_codepath server_executionpath]=ProcessParallelParametersFromCieloRc(server_name,issm_rc_location)
+%PROCESSPARALLELPARAMETERSFROMCIELORC - process parallel parameters from issm
 %
-%   This function reads through the cielo_rc_location for server settings (name, ip, port and 
+%   This function reads through the issm_rc_location for server settings (name, ip, port and 
 %   tunneling) used to run parallel solution sequences
 %
 %   Usage:
-%      [server_codepath server_executionpath]=ProcessParallelParametersFromCieloRc(server_name,cielo_rc_location)
+%      [server_codepath server_executionpath]=ProcessParallelParametersFromCieloRc(server_name,issm_rc_location)
 
 lines_per_server=5;
-%open cielo.rc file
-fid=fopen(cielo_rc_location);
+%open issm.rc file
+fid=fopen(issm_rc_location);
 if fid==-1,
-        error('Could not find cielo.rc file in delivery directory');
+        error('Could not find issm.rc file in delivery directory');
 end
 
@@ -20 +20 @@
 line=fgetl(fid);
 if ~strcmp(line,'begin'),
-        error('cielo.rc file in delivery directory should always start with the begin statement');
+        error('issm.rc file in delivery directory should always start with the begin statement');
 end
 
@@ -33 +33 @@
         %Check for end of file
         if ~ischar(line),
-                error('cielo.rc file in delivery directory should end with an end statement');
+                error('issm.rc file in delivery directory should end with an end statement');
         end
         %Ignore empty lines
@@ -64 +64 @@
                                 value=splittedstring{2};
                                 if ~strcmp(descriptor,'server_codepath'),
-                                        error('server settings in cielo.rc don''t follow the correct syntax');
+                                        error('server settings in issm.rc don''t follow the correct syntax');
                                 end
                                 server_codepath=value;
@@ -76 +76 @@
                                 value=splittedstring{2};
                                 if ~strcmp(descriptor,'server_executionpath'),
-                                        error('server settings in cielo.rc don''t follow the correct syntax');
+                                        error('server settings in issm.rc don''t follow the correct syntax');
                                 end
                                 server_executionpath=value;
@@ -94 +94 @@
 
 if found==0,
-        error(['ProcessParallelParametersFromCieloRc error message: could not find setting for cluster ' server_name 'in cielo.rc file']);
+        error(['ProcessParallelParametersFromCieloRc error message: could not find setting for cluster ' server_name 'in issm.rc file']);
 end