Merge pull request #248 from NOAA-GFDL/update/fre_yamls

Updated NWA12 yamls to work with fre/2025.04

Author: uwagura

yamls/NWA12/CEFI_NWA12_cobalt.yaml

@@ -1,9 +1,9 @@
 # USAGE
 #
 # The following yaml is designed to compile and postprocess the ocean_monthly component of the CEFI_NWA12_COBALT_V1 experiment
-# Full Documentation is available here: https://noaa-gfdl.github.io/fre-cli/index.html
+# Full Documentation is available here: https://noaa-gfdl.readthedocs.io/projects/fre-cli/en/latest/
 # 
-# 0.) Set up your environment by running "module use -a /ncrc/home2/fms/local/modulefiles" followed by "module load fre/2025.01"
+# 0.) Set up your environment by running "module use -a /ncrc/home2/fms/local/modulefiles" followed by "module load fre/2025.04"
 #
 # For modularity and compatibility with with cylc workflow engine, fre/2025.01 splits up the compile and post processcing process 
 # into several sub steps.
@@ -12,28 +12,28 @@
 # 
 # 1.) Create script that will be used to checkout model components and OPTIONALLY run it with the --execute flag. You can manually run the
 # checkout script after this step as well
-# fre make create-checkout -y CEFI_NWA12_cobalt.yaml -p ncrc5.intel23 -t prod --execute
+# fre make checkout-script -y CEFI_NWA12_cobalt.yaml -p ncrc5.intel23 -t prod --execute
 # 
 # 2.) Create Makefile
-# fre make create-makefile -y CEFI_NWA12_cobalt.yaml -p ncrc5.intel23 -t prod
+# fre make makefile -y CEFI_NWA12_cobalt.yaml -p ncrc5.intel23 -t prod
 #
 # 3.) Create script that will compile the model, and OPTIONALLY run it with the --execute flag. You can manually run the 
 # compile script after this step as well
-# fre make create-compile -y CEFI_NWA12_cobalt.yaml -p ncrc5.intel23 -t prod --execute
+# fre make compile-script -y CEFI_NWA12_cobalt.yaml -p ncrc5.intel23 -t prod --execute
 #
 # COMPILE GUIDE - CONTAINERS
 #
 # 1.) Create checkout script with the "no parallel checkouts option" - this is required for container builds
-# fre make create-checkout -y CEFI_NWA12_cobalt.yaml -p hpcme.2023 -t prod -npc
+# fre make checkout-script -y CEFI_NWA12_cobalt.yaml -p hpcme.2023 -t prod -npc
 # 
 # 2.) Create Makefile AND a Docker file. You can then build the container by manually running the createContainer.sh
 # script, or by OPTIONALLY including the --execute file when creating the container
-# fre make create-makefile -y CEFI_NWA12_cobalt.yaml -p hpcme.2023 -t prod
-# fre make create-dockerfile -y CEFI_NWA12_cobalt.yaml -p hpcme.2023 -t prod --execute
+# fre make makefile -y CEFI_NWA12_cobalt.yaml -p hpcme.2023 -t prod
+# fre make dockerfile -y CEFI_NWA12_cobalt.yaml -p hpcme.2023 -t prod --execute
 #
 # POSTPROCESSING GUIDE
 #
-# 0.) Load module on GFDL Analysis: module load fre/2025.01
+# 0.) Load module on GFDL Analysis: module load fre/2025.04
 # 
 # 1.) Checkout the git repo containing postprocessing scripts and related files with the folowing command:
 # fre pp checkout -e CEFI_NWA12_COBALT_V1 -p gfdl.ncrc5-intel23 -t prod
@@ -62,10 +62,10 @@
 
 
 fre_properties: 
-    - &FRE_STEM       "fre/cefi/NWA/ShortCanopyTest"
+    - &FRE_STEM       "fre/cefi/NWA/2025_10/"
 
     - &PP_START_YEAR  "1993"
-    - &PP_END_YEAR    "2019"
+    - &PP_END_YEAR    "2024"
     - &PP_CHUNK_A     "P5Y"
     - &PP_CHUNK_B     "P20Y"
     - &PP_CHUNK_SHORT "P1Y"
@@ -78,8 +78,9 @@ fre_properties:
     - &momIncludes    "-Imom6/src/MOM6/pkg/CVMix-src/include"
     - &sisincludes    "-Imom6/src/MOM6/src/framework"
     - &MOM6_GIT_FIX   "main"
-    - &FMS_GIT_TAG    "2025.02.01"
-    - &CPL_GIT_TAG    "2024.03"
+    - &FMS_GIT_TAG    "2025.03"
+    - &CPL_GIT_TAG    "2025.03"
+    - &ICEPARAM_GIT_TAG    "2024.02"
     - &INTEL          "intel-classic"
 
 

yamls/NWA12/compile.yaml

@@ -36,6 +36,7 @@ compile:
        - component: sis2
          requires: [FMS, mom6]
          repo: "https://github.com/NOAA-GFDL/ice_param.git"
+         branch: *ICEPARAM_GIT_TAG
          paths: [mom6/src/SIS2/config_src/dynamic_symmetric,
                  mom6/src/SIS2/config_src/external/Icepack_interfaces,
                  mom6/src/SIS2/src,

yamls/NWA12/platforms.yaml

@@ -2,13 +2,14 @@ platforms:
    - name: ncrc5.intel23
      compiler: intel
      modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"]
-     modules: [!join [*INTEL, /2023.2.0], fre/bronx-22, cray-hdf5, cray-netcdf]
+     modules: [!join [*INTEL, /2023.2.0], fre/2025.04, cray-hdf5, cray-netcdf, cray-libsci/24.07.0]
      mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-22/site/ncrc5/", *INTEL, ".mk"]
      modelRoot: !join ["/gpfs/f5/cefi/scratch/${USER}", "/", *FRE_STEM ]
 
    - name: ncrc6.intel23
      compiler: intel
      modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"]
+     # NOTE: fre/2025.04 does not yet work on c6
      modules: [!join [*INTEL, /2023.2.0], fre/bronx-22, cray-hdf5, cray-netcdf]
      mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-22/site/ncrc6/", *INTEL, ".mk"]
      modelRoot: !join ["/gpfs/f6/ira-cefi/scratch/${USER}", "/", *FRE_STEM ]

yamls/NWA12/yaml_include/Cobalt_postprocess.yaml

@@ -8,107 +8,107 @@ postprocess:
 
         - type: "ocean_neus"
           sources:
-              - history_files: "ocean_neus"
+              - history_file: "ocean_neus"
           postprocess_on: True
 
         - type: "ocean_monthly"
           sources:
-              - history_files: "ocean_month"
+              - history_file: "ocean_month"
           postprocess_on: True
 
         - type: "ocean_monthly_z"
           sources:
-              - history_files: "ocean_month_z"
+              - history_file: "ocean_month_z"
           postprocess_on: True
 
         - type: "ocean_annual"
           sources:
-              - history_files: "ocean_annual"
+              - history_file: "ocean_annual"
           postprocess_on: True
 
         - type: "ocean_annual_z"
           sources:
-              - history_files: "ocean_annual_z"
+              - history_file: "ocean_annual_z"
           postprocess_on: True
 
         - type: "ice_daily"
           sources:
-              - history_files: "ice_daily"
+              - history_file: "ice_daily"
           postprocess_on: True
 
         - type: "ice_monthly"
           sources:
-              - history_files: "ice_month"
+              - history_file: "ice_month"
           postprocess_on: True
 
         #---- END MOM6 COMPONENTS ----
 
         - type: "ocean_cobalt_fdet_100"
           sources:
-              - history_files: "ocean_cobalt_fdet_100"
+              - history_file: "ocean_cobalt_fdet_100"
           postprocess_on: True
 
         - type: "ocean_cobalt_btm"
           sources:
-              - history_files: "ocean_cobalt_btm"
+              - history_file: "ocean_cobalt_btm"
           postprocess_on: True
 
         - type: "ocean_cobalt_daily_2D"
           sources:
-              - history_files: "ocean_cobalt_daily_2D"
+              - history_file: "ocean_cobalt_daily_2D"
           postprocess_on: True
 
         - type: "ocean_cobalt_daily_2d"
           sources:
-              - history_files: "ocean_cobalt_daily_2d"
+              - history_file: "ocean_cobalt_daily_2d"
           postprocess_on: True
 
         - type: "ocean_cobalt_omip_daily"
           sources:
-              - history_files: "ocean_cobalt_omip_daily"
+              - history_file: "ocean_cobalt_omip_daily"
           postprocess_on: True
 
         - type: "ocean_cobalt_omip_sfc"
           sources:
-              - history_files: "ocean_cobalt_omip_sfc"
+              - history_file: "ocean_cobalt_omip_sfc"
           postprocess_on: True
 
         - type: "ocean_cobalt_tracers_int"
           sources:
-              - history_files: "ocean_cobalt_tracers_int"
+              - history_file: "ocean_cobalt_tracers_int"
           postprocess_on: True
 
         - type: "ocean_cobalt_sfc"
           sources:
-              - history_files: "ocean_cobalt_sfc"
+              - history_file: "ocean_cobalt_sfc"
           postprocess_on: True
 
         - type: "ocean_cobalt_fluxes_int"
           sources:
-              - history_files: "ocean_cobalt_fluxes_int"
+              - history_file: "ocean_cobalt_fluxes_int"
           postprocess_on: True
 
         - type: "ocean_cobalt_daily"
           sources:
-              - history_files: "ocean_cobalt_daily"
+              - history_file: "ocean_cobalt_daily"
           postprocess_on: True
 
         - type: "ocean_cobalt_neus"
           sources:
-              - history_files: "ocean_cobalt_neus"
+              - history_file: "ocean_cobalt_neus"
           postprocess_on: True
 
         - type: "ocean_cobalt_tracers_month"
           sources:
-              - history_files: "ocean_cobalt_tracers_month"
+              - history_file: "ocean_cobalt_tracers_month"
           postprocess_on: True
 
         - type: "ocean_cobalt_tracers_month_z"
           sources:
-              - history_files: "ocean_cobalt_tracers_month_z"
+              - history_file: "ocean_cobalt_tracers_month_z"
           postprocess_on: True
 
         - type: "ocean_cobalt_omip_2d"
           sources:
-              - history_files: "ocean_cobalt_omip_2d"
+              - history_file: "ocean_cobalt_omip_2d"
           postprocess_on: True

yamls/NWA12/yaml_include/settings.yaml

@@ -3,7 +3,7 @@ directories:
     pp_dir:       !join [/archive/$USER/, *FRE_STEM, /, *name, /, *platform, -, *target, /, pp]
     ptmp_dir:     "/ptmp/$USER/"
 
-postProcess:
+postprocess:
     settings:
         history_segment: "P1Y"
         site: "ppan"