updates from JPE

machines/cmake_macros/gust.cmake

@@ -0,0 +1,10 @@
+if (COMP_NAME STREQUAL gptl)
+  string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
+endif()
+set(NETCDF_PATH "$ENV{NETCDF}")
+set(PIO_FILESYSTEM_HINTS "lustre")
+set(PNETCDF_PATH "$ENV{PNETCDF}")
+# If we want to use cray-libsci instead of mkl uncomment this line as well as the module in config_machines.xml
+#string(REPLACE "-mkl=cluster" "" SLIBS "${SLIBS}")
+string(REPLACE "-mkl=cluster" "-qmkl=cluster" SLIBS "${SLIBS}")
+string(APPEND CPPDEFS " -DHAVE_GETTID ")

machines/cmake_macros/intel_gust.cmake

@@ -0,0 +1,6 @@
+set(CONFIG_ARGS "--host=cray")
+string(APPEND CFLAGS " -march=core-avx2")
+string(APPEND FFLAGS " -march=core-avx2")
+if (COMP_NAME STREQUAL gptl)
+  string(APPEND CPPDEFS " -DHAVE_SLASHPROC")
+endif()

machines/cmake_macros/nvhpc_gust.cmake

@@ -0,0 +1,3 @@
+if (NOT DEBUG)
+  string(APPEND FFLAGS " -target=zen3")
+endif()

machines/config_batch.xml

@@ -502,6 +502,18 @@
     </queues>
   </batch_system>
 
+  <batch_system MACH="gust" type="pbs" >
+    <batch_submit>qsub</batch_submit>
+    <directives>
+      <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
+    </directives>
+    <queues>
+      <queue walltimemax="4:00:00" nodemin="1" nodemax="8" >main</queue>
+      <queue walltimemax="1:00:00" nodemin="9" nodemax="16" >bigcpu</queue>
+    </queues>
+  </batch_system>
+
   <!-- hobart is PBS -->
   <batch_system type="pbs" MACH="hobart" >
     <directives>

machines/config_compilers.xml

@@ -847,6 +847,18 @@ using a fortran linker.
   </SLIBS>
 </compiler>
 
+<compiler MACH="gust">
+  <NETCDF_PATH>$ENV{NETCDF}</NETCDF_PATH>
+  <PNETCDF_PATH>$ENV{PNETCDF}</PNETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <CPPDEFS>
+    <append>-DHAVE_GETTID</append>
+    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
+  </CPPDEFS>
+
+</compiler>
+
+
 <compiler MACH="casper">
   <NETCDF_PATH> $ENV{NETCDF}</NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>