Changeset 2586

Timestamp:

11/02/09 13:51:49 (15 years ago)

Author:

Mathieu Morlighem

Message:

Now waitonlock is a double (not an integer)
Cosmos queueing script is also in BASH (easier to launch: no bug)

Location:

issm/trunk/src

Files:

• c/ModelProcessorx/IoModel.h (modified) (1 diff)
• c/parallel/diagnostic.cpp (modified) (1 diff)
• c/parallel/prognostic.cpp (modified) (1 diff)
• c/parallel/steadystate.cpp (modified) (1 diff)
• c/parallel/thermal.cpp (modified) (1 diff)
• c/parallel/transient.cpp (modified) (1 diff)
• m/classes/public/BuildQueueingScriptcosmos.m (modified) (2 diffs)
• m/classes/public/marshall.m (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/IoModel.h

@@ -145 +145 @@
         double* optscal;
         double  yts;
-        int     waitonlock;
+        double  waitonlock;
 
         /*thermal parameters: */

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -36 +36 @@
         
         ParameterInputs* inputs=NULL;
-        int waitonlock=0;
-        int numberofnodes;
+        double waitonlock=0;
+        int    numberofnodes;
         
         double* u_g_initial=NULL;

issm/trunk/src/c/parallel/prognostic.cpp

@@ -24 +24 @@
         char* lockname=NULL;
         int   numberofnodes;
-        int   waitonlock=0;
+        double waitonlock=0;
 
         Model* model=NULL;

issm/trunk/src/c/parallel/steadystate.cpp

@@ -39 +39 @@
         
         ParameterInputs* inputs=NULL;
-        int waitonlock=0;
+        double           waitonlock=0;
         
         double* u_g_initial=NULL;

issm/trunk/src/c/parallel/thermal.cpp

@@ -26 +26 @@
         int   qmu_analysis=0;
         int   numberofnodes;
-        int    waitonlock=0;
+        double waitonlock=0;
 
         /*Model: */

issm/trunk/src/c/parallel/transient.cpp

@@ -25 +25 @@
         int   numberofnodes;
         int   qmu_analysis=0;
-        int waitonlock=0;
+        double waitonlock=0;
 
         /*Model: */

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

@@ -54 +54 @@
 
 
-fprintf(fid,'#!/bin/csh\n');
+fprintf(fid,'#!/bin/bash\n');
 fprintf(fid,'#PBS -l select=%i:ncpus=1\n',md.np);
 fprintf(fid,'#PBS -l walltime=%i\n',md.time*60); %walltime is in seconds.
@@ -63 +63 @@
 fprintf(fid,'#PBS -e %s.errlog \n',md.name);
 
-fprintf(fid,'setenv PBS_O_WORKDIR %s\n',executionpath);
+fprintf(fid,'export PBS_O_WORKDIR=%s\n',executionpath);
 fprintf(fid,'cd $PBS_O_WORKDIR\n');
-fprintf(fid,'setenv OMP_NUM_THREADS 1\n');
-fprintf(fid,'limit stacksize unlimited\n');
-fprintf(fid,'limit coredumpsize 0\n');
+fprintf(fid,'export OMP_NUM_THREADS=1\n');
+fprintf(fid,'ulimit -s unlimited\n');
+fprintf(fid,'ulimit -c 0\n');
 fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock',md.np,codepath,AnalysisTypeFromEnum(md.analysis_type),executionpath,md.name,md.name,md.name);
 fclose(fid);

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

@@ -134 +134 @@
 WriteData(fid,md.viscosity_overshoot,'Scalar','viscosity_overshoot');
 WriteData(fid,md.stokesreconditioning,'Scalar','stokesreconditioning');
-WriteData(fid,md.waitonlock,'Integer','waitonlock');
+WriteData(fid,md.waitonlock,'Scalar','waitonlock');
 
 %Thermal parameters