From e5d136f2f0e830b5d18a7681c17f7fe2c363d73f Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:48:01 -0400 Subject: [PATCH 1/9] First round of changes --- .../CustomizingTheWorkflow/ConfigWorkflow.rst | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst index b0b0301973..609caf23ff 100644 --- a/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -159,6 +159,9 @@ These settings define platform-specific run commands. Users should set run comma ``RUN_CMD_AQM``: (Default: "") The run command for some AQM tasks. +``RUN_CMD_NEXUS``: (Default: "") + The run command for the AQM NEXUS tasks. + ``RUN_CMD_AQMLBC``: (Default: "") The run command for the ``aqm_lbcs`` task. @@ -271,6 +274,12 @@ These parameters are associated with the fixed (i.e., static) files. On :srw-wik ``FIXshp``: (Default: "") System directory containing the graphics shapefiles. On Level 1 systems, these are set within the machine files. Users on other systems will need to provide the path to the directory that contains the *Natural Earth* shapefiles. +``FIXaqm``: (Default: "") + System directory where AQM data files are located. + +``FIXemis``: (Default: "") + System directory where AQM emission data files are located. + ``FIXcrtm``: (Default: "") Path to system directory containing CRTM fixed files. @@ -389,6 +398,9 @@ Set File Name Parameters ``NEMS_CONFIG_FN``: (Default: "nems.configure") Name of a file that contains information about the various :term:`NEMS` components and their run sequence. In general, users should not set this variable in their configuration file (see :ref:`note `). +``UFS_CONFIG_FN``: (Default: "ufs.configure") + Name of a template file that contains information about the various UFS components and their run sequence (ufs-weather-model: ufs.configure). Its default value is the name of the file that the ufs weather model expects to read in. + ``AQM_RC_FN``: (Default: "aqm.rc") Name of resource file for NOAA Air Quality Model (AQM). @@ -422,6 +434,9 @@ Set File Path Parameters ``NEMS_CONFIG_TMPL_FP``: (Default: ``'{{ [user.PARMdir, NEMS_CONFIG_FN]|path_join }}'``) Path to the ``NEMS_CONFIG_FN`` file. +``UFS_CONFIG_TMPL_FP:``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) + Path to the ``UFS_CONFIG_FN`` file. + ``AQM_RC_TMPL_FP``: (Default: ``'{{ [user.PARMdir, AQM_RC_TMPL_FN]|path_join }}'``) Path to the ``AQM_RC_TMPL_FN`` file. @@ -440,6 +455,9 @@ This section contains files and paths to files that are staged in the experiment ``NEMS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, NEMS_CONFIG_FN]|path_join }}'``) Path to the ``NEMS_CONFIG_FN`` file in the experiment directory. +``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) + Path to the ``UFS_CONFIG_FN`` file in the experiment directory. + ``FV3_NML_FP``: (Default: ``'{{ [EXPTDIR, FV3_NML_FN]|path_join }}'``) Path to the ``FV3_NML_FN`` file in the experiment directory. @@ -532,13 +550,13 @@ CCPP Parameter ``CCPP_PHYS_SUITE_FP``: (Default: ``'{{ [workflow.EXPTDIR, CCPP_PHYS_SUITE_FN]|path_join }}'``) The full path to the suite definition file (SDF) in the experiment directory. -``CCPP_PHYS_DIR``: (Default: ``'{{ [user.UFS_WTHR_MDL_DIR, "FV3", "ccpp", "physics", "physics"] |path_join }}'``) +``CCPP_PHYS_DIR``: (Default: ``'{{ [user.UFS_WTHR_MDL_DIR, "FV3", "ccpp", "physics", "physics", "SFC_models", "Land", "Noahmp"] |path_join }}'``) The directory containing the CCPP physics source code. This is needed to link table(s) contained in that repository. Field Dictionary Parameters ------------------------------ -``FIELD_DICT_FN``: (Default: "fd_nems.yaml") +``FIELD_DICT_FN``: (Default: "fd_ufs.yaml") The name of the field dictionary file. This file is a community-based dictionary for shared coupling fields and is automatically generated by the :term:`NUOPC` Layer. ``FIELD_DICT_IN_UWM_FP``: (Default: ``'{{ [user.UFS_WTHR_MDL_DIR, "tests", "parm", FIELD_DICT_FN]|path_join }}'``) @@ -1108,10 +1126,10 @@ For each workflow task, certain parameter values must be passed to the job sched For more information, see the `Intel Development Reference Guide `__. -``OMP_NUM_THREADS_RUN_FCST``: (Default: 1) +``OMP_NUM_THREADS_RUN_FCST``: (Default: 2) The number of OpenMP threads to use for parallel regions. Corresponds to the ``ATM_omp_num_threads`` value in ``nems.configure``. -``OMP_STACKSIZE_RUN_FCST``: (Default: "512m") +``OMP_STACKSIZE_RUN_FCST``: (Default: "1024m") Controls the size of the stack for threads created by the OpenMP implementation. .. _ModelConfigParams: From 29f5db00f3ca993e52dc01b28bd3b1435fdabddc Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:34:40 -0400 Subject: [PATCH 2/9] Updating config.workflow to reflect config defaults --- .../source/CustomizingTheWorkflow/ConfigWorkflow.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst index 609caf23ff..7a17dd1719 100644 --- a/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -296,7 +296,7 @@ WORKFLOW Configuration Parameters If non-default parameters are selected for the variables in this section, they should be added to the ``workflow:`` section of the ``config.yaml`` file. -``WORKFLOW_ID``: (Default: ``!nowtimestamp ''``) +``WORKFLOW_ID``: (Default: "") Unique ID for the workflow run that will be set in ``setup.py``. ``RELATIVE_LINK_FLAG``: (Default: "--relative") @@ -470,8 +470,8 @@ This section contains files and paths to files that are staged in the experiment ``WFLOW_XML_FN``: (Default: "FV3LAM_wflow.xml") Name of the Rocoto workflow XML file that the experiment generation script creates. This file defines the workflow for the experiment. -``GLOBAL_VAR_DEFNS_FN``: (Default: "var_defns.sh") - Name of the file (a shell script) containing definitions of the primary and secondary experiment variables (parameters). This file is sourced by many scripts (e.g., the J-job scripts corresponding to each workflow task) in order to make all the experiment variables available in those scripts. The primary variables are defined in the default configuration file (``config_defaults.yaml``) and in the user configuration file (``config.yaml``). The secondary experiment variables are generated by the experiment generation script. +``GLOBAL_VAR_DEFNS_FN``: (Default: "var_defns.yaml") + Name of the experiment configuration file. It contains the primary experiment variables defined in this default configuration script and in the user-specified configuration as well as secondary experiment variables generated by the experiment generation script. This file is the primary source of information used in the scripts at run time. The primary variables are defined in the default configuration file (``config_defaults.yaml``) and in the user configuration file (``config.yaml``). The secondary experiment variables are generated by the experiment generation script. ``ROCOTO_YAML_FN``: (Default: "rocoto_defns.yaml") Name of the YAML file containing the YAML workflow definition from which the Rocoto XML file is created. From bb90651112604d620f18f2a7c4feb0da40f4831c Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:22:09 -0400 Subject: [PATCH 3/9] Update doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst Co-authored-by: Gillian Petro <96886803+gspetro-NOAA@users.noreply.github.com> --- doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index 1db91121a1..c6dc5a2fd2 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -466,9 +466,6 @@ This section contains files and paths to files that are staged in the experiment ``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) Path to the ``UFS_CONFIG_FN`` file in the experiment directory. -``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) - Path to the ``UFS_CONFIG_FN`` file in the experiment directory. - ``FV3_NML_FP``: (Default: ``'{{ [EXPTDIR, FV3_NML_FN]|path_join }}'``) Path to the ``FV3_NML_FN`` file in the experiment directory. From 4783b532fbe7423574139c5d41aae619265a0128 Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:22:34 -0400 Subject: [PATCH 4/9] Update doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst Co-authored-by: Gillian Petro <96886803+gspetro-NOAA@users.noreply.github.com> --- doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index c6dc5a2fd2..761dccee0c 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -445,9 +445,6 @@ Set File Path Parameters ``UFS_CONFIG_TMPL_FP``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) Path to the ``UFS_CONFIG_FN`` file. -``UFS_CONFIG_TMPL_FP:``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) - Path to the ``UFS_CONFIG_FN`` file. - ``AQM_RC_TMPL_FP``: (Default: ``'{{ [user.PARMdir, AQM_RC_TMPL_FN]|path_join }}'``) Path to the ``AQM_RC_TMPL_FN`` file. From 611524c35a94212219c5be915804d54a49458d9f Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:22:42 -0400 Subject: [PATCH 5/9] Update doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst Co-authored-by: Gillian Petro <96886803+gspetro-NOAA@users.noreply.github.com> --- doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index 761dccee0c..d5a5aedbcb 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -409,9 +409,6 @@ Set File Name Parameters ``UFS_CONFIG_FN``: (Default: "ufs.configure") Name of a file that contains information about the various :term:`UFS` components and their run sequence. In general, users should not set this variable in their configuration file (see :ref:`note `). -``UFS_CONFIG_FN``: (Default: "ufs.configure") - Name of a template file that contains information about the various UFS components and their run sequence (ufs-weather-model: ufs.configure). Its default value is the name of the file that the ufs weather model expects to read in. - ``AQM_RC_FN``: (Default: "aqm.rc") Name of resource file for NOAA Air Quality Model (AQM). From aa1b9b84784de89ce81fcf4bedfbe9550c9536fd Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:30:57 -0400 Subject: [PATCH 6/9] resolving merge conflicts --- .../CustomizingTheWorkflow/ConfigWorkflow.rst | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index d5a5aedbcb..fabe81e5ba 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -275,17 +275,10 @@ These parameters are associated with the fixed (i.e., static) files. On :srw-wik System directory containing the graphics shapefiles. On Level 1 systems, these are set within the machine files. Users on other systems will need to provide the path to the directory that contains the *Natural Earth* shapefiles. ``FIXaqm``: (Default: "") -<<<<<<< HEAD:doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst - System directory where AQM data files are located. - -``FIXemis``: (Default: "") - System directory where AQM emission data files are located. -======= Path to system directory containing AQM fixed files. ``FIXemis``: (Default: "") Path to system directory containing AQM emission data files. ->>>>>>> origin/develop:doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst ``FIXcrtm``: (Default: "") Path to system directory containing CRTM fixed files. @@ -303,11 +296,7 @@ WORKFLOW Configuration Parameters If non-default parameters are selected for the variables in this section, they should be added to the ``workflow:`` section of the ``config.yaml`` file. -<<<<<<< HEAD:doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst -``WORKFLOW_ID``: (Default: "") -======= ``WORKFLOW_ID``: (Default: ``''``) ->>>>>>> origin/develop:doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst Unique ID for the workflow run that will be set in ``setup.py``. ``RELATIVE_LINK_FLAG``: (Default: "--relative") @@ -409,6 +398,9 @@ Set File Name Parameters ``UFS_CONFIG_FN``: (Default: "ufs.configure") Name of a file that contains information about the various :term:`UFS` components and their run sequence. In general, users should not set this variable in their configuration file (see :ref:`note `). +``UFS_CONFIG_FN``: (Default: "ufs.configure") + Name of a template file that contains information about the various UFS components and their run sequence (ufs-weather-model: ufs.configure). Its default value is the name of the file that the ufs weather model expects to read in. + ``AQM_RC_FN``: (Default: "aqm.rc") Name of resource file for NOAA Air Quality Model (AQM). @@ -442,6 +434,9 @@ Set File Path Parameters ``UFS_CONFIG_TMPL_FP``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) Path to the ``UFS_CONFIG_FN`` file. +``UFS_CONFIG_TMPL_FP:``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) + Path to the ``UFS_CONFIG_FN`` file. + ``AQM_RC_TMPL_FP``: (Default: ``'{{ [user.PARMdir, AQM_RC_TMPL_FN]|path_join }}'``) Path to the ``AQM_RC_TMPL_FN`` file. @@ -460,6 +455,9 @@ This section contains files and paths to files that are staged in the experiment ``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) Path to the ``UFS_CONFIG_FN`` file in the experiment directory. +``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) + Path to the ``UFS_CONFIG_FN`` file in the experiment directory. + ``FV3_NML_FP``: (Default: ``'{{ [EXPTDIR, FV3_NML_FN]|path_join }}'``) Path to the ``FV3_NML_FN`` file in the experiment directory. @@ -473,11 +471,7 @@ This section contains files and paths to files that are staged in the experiment Name of the Rocoto workflow XML file that the experiment generation script creates. This file defines the workflow for the experiment. ``GLOBAL_VAR_DEFNS_FN``: (Default: "var_defns.yaml") -<<<<<<< HEAD:doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst - Name of the experiment configuration file. It contains the primary experiment variables defined in this default configuration script and in the user-specified configuration as well as secondary experiment variables generated by the experiment generation script. This file is the primary source of information used in the scripts at run time. The primary variables are defined in the default configuration file (``config_defaults.yaml``) and in the user configuration file (``config.yaml``). The secondary experiment variables are generated by the experiment generation script. -======= Name of the auto-generated experiment configuration file. It contains the primary experiment variables defined in this default configuration script and in the user-specified configuration as well as secondary experiment variables generated by the experiment generation script from machine files and other settings. This file is the primary source of information used in the scripts at run time. ->>>>>>> origin/develop:doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst ``ROCOTO_YAML_FN``: (Default: "rocoto_defns.yaml") Name of the YAML file containing the YAML workflow definition from which the Rocoto XML file is created. @@ -556,11 +550,7 @@ CCPP Parameter ``CCPP_PHYS_SUITE_FP``: (Default: ``'{{ [workflow.EXPTDIR, CCPP_PHYS_SUITE_FN]|path_join }}'``) The full path to the suite definition file (SDF) in the experiment directory. -<<<<<<< HEAD:doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst -``CCPP_PHYS_DIR``: (Default: ``'{{ [user.UFS_WTHR_MDL_DIR, "FV3", "ccpp", "physics", "physics", "SFC_models", "Land", "Noahmp"] |path_join }}'``) -======= ``CCPP_PHYS_DIR``: (Default: ``'{{ [user.UFS_WTHR_MDL_DIR, "FV3", "ccpp", "physics", "physics", "SFC_Models", "Land", "Noahmp"] |path_join }}'``) ->>>>>>> origin/develop:doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst The directory containing the CCPP physics source code. This is needed to link table(s) contained in that repository. Field Dictionary Parameters @@ -1118,13 +1108,8 @@ For each workflow task, certain parameter values must be passed to the job sched For more information, see the `Intel Development Reference Guide `__. -<<<<<<< HEAD:doc/UsersGuide/source/CustomizingTheWorkflow/ConfigWorkflow.rst -``OMP_NUM_THREADS_RUN_FCST``: (Default: 2) - The number of OpenMP threads to use for parallel regions. Corresponds to the ``ATM_omp_num_threads`` value in ``nems.configure``. -======= ``OMP_NUM_THREADS_RUN_FCST``: (Default: 1) The number of OpenMP threads to use for parallel regions. Corresponds to the ``atmos_nthreads`` value in ``model_configure``. ->>>>>>> origin/develop:doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst ``OMP_STACKSIZE_RUN_FCST``: (Default: "1024m") Controls the size of the stack for threads created by the OpenMP implementation. From 3c68183d852685535fd1c7ac15b13f8a0fbe6ab4 Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:12:54 -0400 Subject: [PATCH 7/9] Removed duplicates --- .../CustomizingTheWorkflow/ConfigWorkflow.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index fabe81e5ba..7263ec651c 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -159,9 +159,6 @@ These settings define platform-specific run commands. Users should set run comma ``RUN_CMD_NEXUS``: (Default: "") The run command for the AQM NEXUS tasks. -``RUN_CMD_NEXUS``: (Default: "") - The run command for the AQM NEXUS tasks. - ``RUN_CMD_AQMLBC``: (Default: "") The run command for the ``aqm_lbcs`` task. @@ -395,9 +392,6 @@ Set File Name Parameters ``MODEL_CONFIG_FN``: (Default: "model_configure") Name of a file that contains settings and configurations for the :term:`NUOPC`/:term:`ESMF` main component. In general, users should not set this variable in their configuration file (see :ref:`note `). -``UFS_CONFIG_FN``: (Default: "ufs.configure") - Name of a file that contains information about the various :term:`UFS` components and their run sequence. In general, users should not set this variable in their configuration file (see :ref:`note `). - ``UFS_CONFIG_FN``: (Default: "ufs.configure") Name of a template file that contains information about the various UFS components and their run sequence (ufs-weather-model: ufs.configure). Its default value is the name of the file that the ufs weather model expects to read in. @@ -434,9 +428,6 @@ Set File Path Parameters ``UFS_CONFIG_TMPL_FP``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) Path to the ``UFS_CONFIG_FN`` file. -``UFS_CONFIG_TMPL_FP:``: (Default: ``'{{ [user.PARMdir, UFS_CONFIG_FN]|path_join }}'``) - Path to the ``UFS_CONFIG_FN`` file. - ``AQM_RC_TMPL_FP``: (Default: ``'{{ [user.PARMdir, AQM_RC_TMPL_FN]|path_join }}'``) Path to the ``AQM_RC_TMPL_FN`` file. @@ -455,9 +446,6 @@ This section contains files and paths to files that are staged in the experiment ``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) Path to the ``UFS_CONFIG_FN`` file in the experiment directory. -``UFS_CONFIG_FP``: (Default: ``'{{ [EXPTDIR, UFS_CONFIG_FN]|path_join }}'``) - Path to the ``UFS_CONFIG_FN`` file in the experiment directory. - ``FV3_NML_FP``: (Default: ``'{{ [EXPTDIR, FV3_NML_FN]|path_join }}'``) Path to the ``FV3_NML_FN`` file in the experiment directory. From 0d85b71840710ac98c02c38ff916daa833b4e8d2 Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:24:43 -0400 Subject: [PATCH 8/9] Update doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst Co-authored-by: Michael Lueken <63728921+MichaelLueken@users.noreply.github.com> --- doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index 7263ec651c..d9dc120fcb 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -1096,7 +1096,7 @@ For each workflow task, certain parameter values must be passed to the job sched For more information, see the `Intel Development Reference Guide `__. -``OMP_NUM_THREADS_RUN_FCST``: (Default: 1) +``OMP_NUM_THREADS_RUN_FCST``: (Default: 2) The number of OpenMP threads to use for parallel regions. Corresponds to the ``atmos_nthreads`` value in ``model_configure``. ``OMP_STACKSIZE_RUN_FCST``: (Default: "1024m") From cdcbe68dfbf3c239e49acf0d59351400324781ef Mon Sep 17 00:00:00 2001 From: jdkublnick <47824899+jdkublnick@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:50:11 -0400 Subject: [PATCH 9/9] Update doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst Co-authored-by: Gillian Petro <96886803+gspetro-NOAA@users.noreply.github.com> --- doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst index d9dc120fcb..4d88173028 100644 --- a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst +++ b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst @@ -393,7 +393,7 @@ Set File Name Parameters Name of a file that contains settings and configurations for the :term:`NUOPC`/:term:`ESMF` main component. In general, users should not set this variable in their configuration file (see :ref:`note `). ``UFS_CONFIG_FN``: (Default: "ufs.configure") - Name of a template file that contains information about the various UFS components and their run sequence (ufs-weather-model: ufs.configure). Its default value is the name of the file that the ufs weather model expects to read in. + Name of a template file that contains information about the various :term:`UFS` components and their run sequence. In general, users should not set this variable in their configuration file (see :ref:`note `). ``AQM_RC_FN``: (Default: "aqm.rc") Name of resource file for NOAA Air Quality Model (AQM).