From a91059a104176d763506a6be66b765128b8f8978 Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA Date: Thu, 28 Mar 2024 20:13:48 +0000 Subject: [PATCH 1/2] update ufs land exe path --- do_submit_cycle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/do_submit_cycle.sh b/do_submit_cycle.sh index 5e9bd7d2..171aff50 100755 --- a/do_submit_cycle.sh +++ b/do_submit_cycle.sh @@ -87,7 +87,7 @@ fi if [[ -e ${CYCLEDIR}/exec/ufsLand.exe ]]; then export LSMexec=${CYCLEDIR}/exec/ufsLand.exe else - export LSMexec=${CYCLEDIR}/sorc/ufs-land-driver-emc-dev/run/ufsLand.exe + export LSMexec=${CYCLEDIR}/sorc/ufsLand.fd/run/ufsLand.exe fi export DADIR=${CYCLEDIR}/sorc/DA_update/ From 3608ca6cf13e852af775466a0790c0d93d49c2b4 Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA Date: Fri, 29 Mar 2024 14:34:21 +0000 Subject: [PATCH 2/2] update docs to include the expansion of container support --- .../BuildingRunningTesting/Container.rst | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/doc/source/BuildingRunningTesting/Container.rst b/doc/source/BuildingRunningTesting/Container.rst index 8c5c7fa9..b61556ab 100644 --- a/doc/source/BuildingRunningTesting/Container.rst +++ b/doc/source/BuildingRunningTesting/Container.rst @@ -99,19 +99,21 @@ On many NOAA :term:`RDHPCS` systems, a container named ``ubuntu20.04-intel-landd .. table:: Locations of Pre-Built Containers - +--------------+--------------------------------------------------------+ - | Machine | File location | - +==============+========================================================+ - | Derecho | /glade/work/epicufsrt/contrib/containers | - +--------------+--------------------------------------------------------+ - | Gaea | /lustre/f2/dev/role.epic/contrib/containers | - +--------------+--------------------------------------------------------+ - | Hera | /scratch1/NCEPDEV/nems/role.epic/containers | - +--------------+--------------------------------------------------------+ - | Jet | /mnt/lfs4/HFIP/hfv3gfs/role.epic/containers | - +--------------+--------------------------------------------------------+ - | Orion | /work/noaa/epic/role-epic/contrib/containers | - +--------------+--------------------------------------------------------+ + +-----------------+--------------------------------------------------------+ + | Machine | File location | + +=================+========================================================+ + | Derecho | /glade/work/epicufsrt/contrib/containers | + +-----------------+--------------------------------------------------------+ + | Gaea | /gpfs/f5/epic/world-shared/containers | + +-----------------+--------------------------------------------------------+ + | Hera | /scratch1/NCEPDEV/nems/role.epic/containers | + +-----------------+--------------------------------------------------------+ + | Jet | /mnt/lfs4/HFIP/hfv3gfs/role.epic/containers | + +-----------------+--------------------------------------------------------+ + | NOAA Cloud | /contrib/EPIC/containers | + +-----------------+--------------------------------------------------------+ + | Orion/Hercules | /work/noaa/epic/role-epic/contrib/containers | + +-----------------+--------------------------------------------------------+ Users can simply set an environment variable to point to the container: @@ -244,7 +246,7 @@ Navigate to the ``land-DA_workflow`` directory after it has been successfully co cd land-DA_workflow -When using a Singularity container, Intel compilers and Intel :term:`MPI` (preferably 2020 versions or newer) need to be available on the host system to properly launch MPI jobs. Generally, this is accomplished by loading a module with a recent Intel compiler and then loading the corresponding Intel MPI. For example, users can modify the following commands to load their system's compiler/MPI combination: +When using a Singularity container, Intel compilers and Intel :term:`MPI` (preferably 2020 versions or newer) need to be available on the host system to properly launch MPI jobs. The Level 1 systems that have Intel compilers and Intel MPI available are: Hera, Jet, NOAA Cloud, and Orion. Generally, this is accomplished by loading a module with a recent Intel compiler and then loading the corresponding Intel MPI. For example, users can modify the following commands to load their system's compiler/MPI combination: .. code-block:: console @@ -260,6 +262,27 @@ When using a Singularity container, Intel compilers and Intel :term:`MPI` (prefe Then they should be able to load the appropriate modules. +The remaining Level 1 systems that do not have Intel MPI available will need to load a different Intel compiler and MPI combination. Refer to :numref:`Table %s ` for which Intel compiler and MPI to load for these systems. + +.. _NonIMPICompilers: + +.. table:: Intel compilers and MPIs for non-Intel MPI Level 1 systems + + +-----------------+-------------------------------------------------------------------------+ + | Machine | Intel compiler and MPI combinations | + +=================+=========================================================================+ + | Derecho | module load intel-oneapi/2023.2.1 cray-mpich/8.1.25 | + +-----------------+-------------------------------------------------------------------------+ + | Gaea | module load intel-classic/2023.1.0 cray-mpich/8.1.25 | + +-----------------+-------------------------------------------------------------------------+ + | Hercules | module load intel-oneapi-compilers/2022.2.1 intel-oneapi-mpi/2021.7.1 | + +-----------------+-------------------------------------------------------------------------+ + +For Derecho and Gaea, an additional script is needed to help set up the land-DA workflow scripts so that the container can run there. + +.. code-block:: console + ./setup_container.sh -p= + .. _ConfigureExptC: Configure the Experiment @@ -320,4 +343,4 @@ The ``do_submit_cycle.sh`` script will read the ``settings_DA_cycle_*`` file and Depending on the experiment, either the ``vector`` or the ``tile`` directory will have data, but not both. -Users can check experiment progress/success according to the instructions in :numref:`Section %s `, which apply to both containerized and non-containerized versions of the Land DA System. \ No newline at end of file +Users can check experiment progress/success according to the instructions in :numref:`Section %s `, which apply to both containerized and non-containerized versions of the Land DA System.