Add ICE_MEMUSE cice.settings flag for batch memory use

Add set_env.memsmall, memmed, memlarge options To use, will require changes to the env machine files. Most machines will probably not use it. See CICE-Consortium#674.
apcraig · Aug 8, 2022 · 3b0d98d · 3b0d98d
1 parent 58e3b8f
commit 3b0d98d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
@@ -35,6 +35,13 @@ if ($?ICE_MACHINE_MAXRUNLENGTH) then
   endif
 endif
 
+set memuse = ${ICE_MEMUSE}
+if ($?ICE_MACHINE_MAXMEMUSE) then
+  if (${memuse} > ${ICE_MACHINE_MAXMEMUSE}) then
+    set memuse = ${ICE_MACHINE_MAXMEMUSE}
+  endif
+endif
+
 set queue = "${ICE_QUEUE}"
 set batchtime = "00:15:00"
 if (${runlength} == 0) set batchtime = "00:29:00"
@@ -46,6 +53,15 @@ if (${runlength} == 5) set batchtime = "5:00:00"
 if (${runlength} == 6) set batchtime = "6:00:00"
 if (${runlength} == 7) set batchtime = "7:00:00"
 if (${runlength} >= 8) set batchtime = "8:00:00"
+set batchmem = "5"
+if (${memuse} == 1) set batchmem = "5"
+if (${memuse} == 2) set batchmem = "10"
+if (${memuse} == 3) set batchmem = "15"
+if (${memuse} == 4) set batchmem = "20"
+if (${memuse} == 5) set batchmem = "50"
+if (${memuse} == 6) set batchmem = "100"
+if (${memuse} == 7) set batchmem = "150"
+if (${memuse} >= 8) set batchmem = "200"
 
 set shortcase = `echo ${ICE_CASENAME} | cut -c1-15`
 
@@ -284,7 +300,7 @@ cat >> ${jobfile} << EOFB
 #SBATCH --nodes ${nnodes}
 #SBATCH --ntasks ${ntasks}
 #SBATCH --cpus-per-task ${nthrds}
-#SBATCH --mem-per-cpu=5G
+#SBATCH --mem-per-cpu=${batchmem}G
 #SBATCH --comment="image=eccc/eccc_all_default_ubuntu-18.04-amd64_latest"
 EOFB
 

diff --git a/configuration/scripts/cice.settings b/configuration/scripts/cice.settings
@@ -32,6 +32,7 @@ setenv ICE_BFBCOMP    undefined
 setenv ICE_BFBTYPE    restart
 setenv ICE_SPVAL      undefined
 setenv ICE_RUNLENGTH  -1
+setenv ICE_MEMUSE     -1
 setenv ICE_ACCOUNT    undefined
 setenv ICE_QUEUE      undefined
 

diff --git a/configuration/scripts/options/set_env.memlarge b/configuration/scripts/options/set_env.memlarge
@@ -0,0 +1,2 @@
+setenv ICE_MEMUSE  8
+
diff --git a/configuration/scripts/options/set_env.memmed b/configuration/scripts/options/set_env.memmed
@@ -0,0 +1,2 @@
+setenv ICE_MEMUSE  4
+
diff --git a/configuration/scripts/options/set_env.memsmall b/configuration/scripts/options/set_env.memsmall
@@ -0,0 +1,2 @@
+setenv ICE_MEMUSE  1
+