Changeset 26854

Timestamp:

02/07/22 04:41:41 (3 years ago)

Author:

bdef

Message:

CHG:new Saga modules

File:

• issm/trunk-jpl/src/m/classes/clusters/saga.py (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/clusters/saga.py

@@ -119 +119 @@
 
         fid.write('#SBATCH --nodes=%i \n' % self.numnodes)
-        fid.write('#SBATCH --ntasks-per-node=%i \n' % self.cpuspernode)
+        fid.write('#SBATCH --ntasks=%i \n' % self.cpuspernode)
         fid.write('#SBATCH --time={}\n'.format(timestring))  #walltime is minutes
-        fid.write('#SBATCH --mem-per-cpu={}MB\n'.format(int(1000 * self.mem)))  # mem is in MB
+        fid.write('#SBATCH --mem-per-cpu={}M\n'.format(int(1000 * self.mem)))  # mem is in MB
 
         fid.write('#SBATCH --account=%s\n' % self.accountname)
@@ -130 +130 @@
         fid.write('module purge\n')
         fid.write('module load CMake/3.15.3-GCCcore-8.3.0\n')
-        fid.write('module load PETSc/3.12.4-intel-2019b\n')
-        fid.write('module load ParMETIS/4.0.3-iimpi-2019b\n')
+        fid.write('module load PETSc/3.12.4-foss-2019b\n')
+        fid.write('module load ParMETIS/4.0.3-gompi-2019b\n')
         if isvalgrind:
             fid.write('module --ignore-cache load Valgrind/3.16.1-gompi-2019b \n')
@@ -138 +138 @@
         if isvalgrind:
             # profiling
-            #fid.write('mpirun {} --tool=callgrind {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog \n'.format(self.valgrind, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
+            #fid.write('srun {} --tool=callgrind {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog \n'.format(self.valgrind, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
             # leak check
-            fid.write('mpirun {} --leak-check=full {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog '.format(self.valgrind, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
+            fid.write('srun {} --leak-check=full {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog '.format(self.valgrind, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
         else:
-            fid.write('time mpirun {}/{} {} {}/{} {}\n'.format(self.codepath, executable, solution, self.executionpath, dirname, modelname))
+            fid.write('time srun {}/{} {} {}/{} {}\n'.format(self.codepath, executable, solution, self.executionpath, dirname, modelname))
         fid.close()