Fixes for developer suite

Author: EdHone

applications/io_demo/build/project.mk

@@ -8,4 +8,5 @@
 # via the Makefile.
 
 $(info io_demo miniapp project specials)
+# Enable the use of the sleep() intrinsic for gfortran
 export FFLAGS_GNU_OPTIONS = -fall-intrinsics

rose-stem/app/io_demo/opt/rose-app-benchmark-nwp.conf

@@ -3,14 +3,14 @@ MPICH_MPIIO_AGGREGATOR_PLACEMENT_DISPLAY=1
 MPICH_MPIIO_HINTS_DISPLAY=1
 MPICH_MPIIO_STATS=1
 
+[namelist:io]
+subroutine_timers=.true.
+write_diag=.true.
+
 [namelist:io_demo]
+benchmark_sleep_time=4
 io_benchmark=.true.
 n_benchmark_fields=200
-benchmark_sleep_time=4
-
-[namelist:io]
-write_diag=.true.
-subroutine_timers=.true.
 
 [namelist:time]
 timestep_end='24'

rose-stem/app/io_demo/opt/rose-app-benchmark.conf

@@ -3,17 +3,17 @@ MPICH_MPIIO_AGGREGATOR_PLACEMENT_DISPLAY=1
 MPICH_MPIIO_HINTS_DISPLAY=1
 MPICH_MPIIO_STATS=1
 
+[namelist:io]
+subroutine_timers=.true.
+write_diag=.true.
+
 [namelist:io_demo]
+benchmark_sleep_time=1
 io_benchmark=.true.
 n_benchmark_fields=10
-benchmark_sleep_time=1
-
-[namelist:io]
-write_diag=.true.
-subroutine_timers=.true.
 
 [namelist:time]
 timestep_end='24'
 
 [namelist:timestepping]
-dt=3600.0
+dt=3600.0

rose-stem/site/meto/common/bin/launch-exe

@@ -26,12 +26,17 @@ fi
 
 # Construct launcher options
 #===========================================
+SET_CORES_PER_NODE=$((TOTAL_RANKS<CORES_PER_NODE ? TOTAL_RANKS : CORES_PER_NODE))
 LAUNCHER_OPTS=""
 if [ "${RUN_METHOD}" = "mpiexec" ] ; then
   if [ "${SITE_MPI_LAUNCHER_OPTS}" != "" ] ; then
     LAUNCHER_OPTS=${SITE_MPI_LAUNCHER_OPTS}
   else
-    LAUNCHER_OPTS="-n ${TOTAL_RANKS} --ppn ${CORES_PER_NODE}"
+    if [ "${TARGET_PLATFORM}" = "meto-ex1a" ] ; then
+      LAUNCHER_OPTS="-n ${TOTAL_RANKS} --ppn ${SET_CORES_PER_NODE}"
+    else
+      LAUNCHER_OPTS="-n ${TOTAL_RANKS}"
+    fi
   fi
 elif [ "${RUN_METHOD}" = "srun" ] ; then
   LAUNCHER_OPTS="--ntasks ${TOTAL_RANKS}"
@@ -44,10 +49,14 @@ fi
 if [ "${RUN_METHOD}" = "mpiexec" ] ; then
   if [[ ! -z "${XIOS_SERVER_MODE}" && "${XIOS_SERVER_MODE}" = "True" ]] ; then
     if [ "${xios_nodes}" = "0" ] ; then
-      XIOS_OPTS=" : --np ${XIOS_SERVER_RANKS} "
+      XIOS_OPTS=" : -n ${XIOS_SERVER_RANKS} "
     else
-      XIOS_CORES_PER_NODE="$(( mpi_parts_xios / xios_nodes ))"
-      XIOS_OPTS=" : --np ${XIOS_SERVER_RANKS} --ppn ${XIOS_CORES_PER_NODE} "
+      if [ "${TARGET_PLATFORM}" = "meto-ex1a" ] ; then
+        XIOS_CORES_PER_NODE="$(( mpi_parts_xios / xios_nodes ))"
+        XIOS_OPTS=" : -n ${XIOS_SERVER_RANKS} --ppn ${XIOS_CORES_PER_NODE}"
+      else
+        XIOS_OPTS=" : -n ${XIOS_SERVER_RANKS}"
+      fi
     fi
   fi
 fi