fix gadi test submission

Tidy compiler flags extend a few tests extend one more tidy fix gadi test submission Tidy compiler flags extend a few tests longer again
ACCESS-NRI · Oct 24, 2024 · 388612d · 388612d
1 parent 3d9566a
commit 388612d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/cicecore/cicedyn/general/ice_init.F90 b/cicecore/cicedyn/general/ice_init.F90
@@ -1228,8 +1228,6 @@ subroutine input_data
          write(nu_diag,*) ' '
       endif
 
-
-
       if (trim(runtype) == 'continue') then
          if (my_task == master_task) then
             write(nu_diag,*) subname//'NOTE: runtype=continue, setting restart=.true.'
@@ -1273,7 +1271,7 @@ subroutine input_data
          endif
          abort_list = trim(abort_list)//":1"
       endif
-
+   
       if (history_format /= 'cdf1'        .and. &
           history_format /= 'cdf2'        .and. &
           history_format /= 'cdf5'        .and. &
@@ -1838,7 +1836,7 @@ subroutine input_data
 
       if (orca_halogrid) then
          if (my_task == master_task) then
-            write(nu_diag,*) subname//' ERROR: orca_halogrid has been deprecated, remove from namelist'
+            write(nu_diag,*) subname//' ERROR: orca_halogrid has been deprecated'
          endif
          abort_list = trim(abort_list)//":63"
       endif

diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
@@ -56,12 +56,23 @@ EOFB
 else if (${ICE_MACHINE} =~ gadi*) then
 if (${queue} =~ *sr) then #sapphire rapids
   @ memuse = ( $ncores * 481 / 100 )
+  set corespernode = 52
 else if (${queue} =~ *bw) then #broadwell
   @ memuse = ( $ncores * 457 / 100 )
+  set corespernode = 28
 else if (${queue} =~ *sl) then 
   @ memuse = ( $ncores * 6 )
+  set corespernode = 32
 else #normal queues
   @ memuse = ( $ncores * 395 / 100 )
+  set corespernode = 48
+endif
+if (${ncores} > ${corespernode}) then
+  # need to use a whole number of nodes
+  @ ncores = ( ( $ncores + $corespernode - 1 ) / $corespernode ) * $corespernode
+endif
+if (${runlength} <= 0) then
+  set batchtime = "00:30:00"
 endif
 cat >> ${jobfile} << EOFB
 #PBS -q ${queue}

diff --git a/configuration/scripts/machines/Macros.gadi_intel b/configuration/scripts/machines/Macros.gadi_intel
@@ -13,11 +13,11 @@ NCI_INTEL_FLAGS := -r8 -i4 -traceback -w -fpe0 -ftz -convert big_endian -assume
 NCI_REPRO_FLAGS := -fp-model precise -fp-model source -align all
 
 ifeq ($(ICE_BLDDEBUG), true)
-    NCI_DEBUG_FLAGS := -g3 -O0 -debug all -check all -no-vec -assume nobuffered_io
+    NCI_DEBUG_FLAGS := -O0 -debug all -check all -no-vec -assume nobuffered_io
     FFLAGS          := $(NCI_INTEL_FLAGS) $(NCI_REPRO_FLAGS) $(NCI_DEBUG_FLAGS)
     CPPDEFS         := $(CPPDEFS) -DDEBUG=$(DEBUG)
 else
-  NCI_OPTIM_FLAGS := -g3 -O2 -axCORE-AVX2 -debug all -check none -qopt-report=5 -qopt-report-annotate -assume buffered_io
+  NCI_OPTIM_FLAGS := -O2 -axCORE-AVX2 -debug all -check none -qopt-report=5 -qopt-report-annotate -assume buffered_io
   FFLAGS          := $(NCI_INTEL_FLAGS) $(NCI_REPRO_FLAGS) $(NCI_OPTIM_FLAGS)
 endif
 

diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts
@@ -5,7 +5,7 @@ smoke          gx3     1x4        debug,diag1,run2day
 smoke          gx3     4x1        debug,diag1,run5day
 restart        gx3     8x2        debug
 restart        gx3     8x2        debug,gx3nc
-smoke          gx3     8x2        diag24,run1year,medium
+smoke          gx3     8x2        diag24,run1year,long
 smoke          gx3     7x2        diag1,bigdiag,run1day,diagpt1
 decomp         gx3     4x2x25x29x5  none
 smoke          gx3     4x2        diag1,run5day             smoke_gx3_8x2_diag1_run5day
@@ -14,21 +14,21 @@ smoke          gx3     1x8        diag1,run5day,evp1d
 restart        gx1    40x4        droundrobin,medium
 restart        tx1    40x4        dsectrobin,medium
 restart        tx1    40x4        dsectrobin,medium,jra55do
-restart        gx3     4x4        none
-restart        gx3     4x4        gx3nc
-restart        gx3    10x4        maskhalo
+restart        gx3     4x4        medium
+restart        gx3     4x4        gx3nc,short
+restart        gx3    10x4        maskhalo,medium
 restart        gx3     6x2        alt01
 restart        gx3     8x2        alt02
 restart        gx3     4x2        alt03
 restart        gx3    12x2        alt03,maskhalo,droundrobin
 restart        gx3     4x4        alt04
-restart        gx3     4x4        alt05
+restart        gx3     4x4        alt05,medium
 restart        gx3     8x2        alt06
 restart        gx3     8x3        alt07
 restart        gx3    16x2        snicar
 restart        gx3    12x2        snicartest
 restart        gx3     8x2        congel
-restart        gx3     8x3        saltflux
+restart        gx3     8x3        saltflux,short
 restart        gx3    18x2        debug,maskhalo
 restart        gx3     6x2        alt01,debug,short
 restart        gx3     8x2        alt02,debug,short
@@ -48,7 +48,7 @@ restart        gbox128 4x2        boxnodyn,short
 restart        gbox128 4x2        boxnodyn,short,debug
 restart        gbox128 2x2        boxadv,short
 smoke          gbox128 2x2        boxadv,short,debug
-restart        gbox128 4x4        boxrestore,short
+restart        gbox128 4x4        boxrestore,medium
 smoke          gbox128 4x4        boxrestore,short,debug
 restart        gbox80  1x1        box2001
 smoke          gbox80  1x1        boxslotcyl
@@ -79,13 +79,13 @@ restart        gx3     8x2        isotope
 smoke          gx3     4x1        snwitdrdg,snwgrain,icdefault,debug
 smoke          gx3     4x1        snw30percent,icdefault,debug
 restart        gx3     8x2        snwitdrdg,icdefault,snwgrain
-restart        gx3     4x4        gx3ncarbulk,iobinary
-restart        gx3     4x4        histall,precision8,cdf64
+restart        gx3     4x4        gx3ncarbulk,iobinary,medium
+restart        gx3     4x4        cdf64,histall,precision8,medium
 smoke          gx3    30x1        bgcz,histall
 smoke          gx3    14x2        fsd12,histall
 smoke          gx3     4x1        dynpicard
 restart        gx3     8x2        gx3ncarbulk,debug
-restart        gx3     4x4        gx3ncarbulk,diag1
+restart        gx3     4x4        diag1,gx3ncarbulk,short
 smoke          gx3     4x1        calcdragio
 restart        gx3     4x2        atmbndyconstant
 restart        gx3     4x2        atmbndymixed