From ea542534432101d82de788a729ffffb01670639d Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 3 Apr 2023 17:40:28 +0000 Subject: [PATCH 01/10] Update to use w3emc instead of w3nco. Fixes #801 --- CMakeLists.txt | 2 +- modulefiles/build.hera.gnu.lua | 4 ++-- modulefiles/build.hera.intel.lua | 4 ++-- sorc/chgres_cube.fd/CMakeLists.txt | 2 +- sorc/emcsfc_ice_blend.fd/CMakeLists.txt | 2 +- sorc/emcsfc_snow2mdl.fd/CMakeLists.txt | 2 +- sorc/global_cycle.fd/CMakeLists.txt | 2 +- sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 190573745..1ec5726cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ if(OPENMP) endif() find_package(sfcio 1.4.0 REQUIRED) -find_package(w3nco 2.4.0 REQUIRED) +find_package(w3emc 2.9.0 REQUIRED) find_package(bacio 2.4.0 REQUIRED) find_package(nemsio 2.5.0 REQUIRED) find_package(sigio 2.3.0 REQUIRED) diff --git a/modulefiles/build.hera.gnu.lua b/modulefiles/build.hera.gnu.lua index daeeb9cbc..33b8e6875 100644 --- a/modulefiles/build.hera.gnu.lua +++ b/modulefiles/build.hera.gnu.lua @@ -40,8 +40,8 @@ load(pathJoin("nemsio", nemsio_ver)) sp_ver=os.getenv("sp_ver") or "2.3.3" load(pathJoin("sp", sp_ver)) -w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" -load(pathJoin("w3nco", w3nco_ver)) +w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" +load(pathJoin("w3emc", w3emc_ver)) sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" load(pathJoin("sfcio", sfcio_ver)) diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua index a3c823ad6..a3734b6ce 100644 --- a/modulefiles/build.hera.intel.lua +++ b/modulefiles/build.hera.intel.lua @@ -34,8 +34,8 @@ load(pathJoin("nemsio", nemsio_ver)) sp_ver=os.getenv("sp_ver") or "2.3.3" load(pathJoin("sp", sp_ver)) -w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" -load(pathJoin("w3nco", w3nco_ver)) +w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" +load(pathJoin("w3emc", w3emc_ver)) sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" load(pathJoin("sfcio", sfcio_ver)) diff --git a/sorc/chgres_cube.fd/CMakeLists.txt b/sorc/chgres_cube.fd/CMakeLists.txt index c10a8bbd7..e7e3c49cd 100644 --- a/sorc/chgres_cube.fd/CMakeLists.txt +++ b/sorc/chgres_cube.fd/CMakeLists.txt @@ -55,7 +55,7 @@ target_link_libraries( bacio::bacio_4 ip::ip_d sp::sp_d - w3nco::w3nco_d + w3emc::w3emc_d esmf msis2 MPI::MPI_Fortran diff --git a/sorc/emcsfc_ice_blend.fd/CMakeLists.txt b/sorc/emcsfc_ice_blend.fd/CMakeLists.txt index 79568e84a..d24a9fc64 100644 --- a/sorc/emcsfc_ice_blend.fd/CMakeLists.txt +++ b/sorc/emcsfc_ice_blend.fd/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries( ${exe_name} bacio::bacio_4 g2::g2_4 - w3nco::w3nco_4) + w3emc::w3emc_4) install(TARGETS ${exe_name}) diff --git a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt index 057422d83..081fa6912 100644 --- a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt +++ b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(snow2mdl_lib ip::ip_d sp::sp_d bacio::bacio_4 - w3nco::w3nco_d) + w3emc::w3emc_d) if(OpenMP_Fortran_FOUND) target_link_libraries(${exe_name} PUBLIC OpenMP::OpenMP_Fortran) diff --git a/sorc/global_cycle.fd/CMakeLists.txt b/sorc/global_cycle.fd/CMakeLists.txt index ede7ada35..0f73d4ab6 100644 --- a/sorc/global_cycle.fd/CMakeLists.txt +++ b/sorc/global_cycle.fd/CMakeLists.txt @@ -36,7 +36,7 @@ target_include_directories(global_cycle_lib INTERFACE ${mod_dir}) target_link_libraries( global_cycle_lib PUBLIC - w3nco::w3nco_d + w3emc::w3emc_d bacio::bacio_4 ip::ip_d sp::sp_d diff --git a/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt index 7cede544b..79fefcefb 100644 --- a/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt +++ b/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries( orog_lib PUBLIC bacio::bacio_4 - w3nco::w3nco_d + w3emc::w3emc_d ip::ip_d sp::sp_d NetCDF::NetCDF_Fortran) From 3ca0bf6e0ab0decff93f100926f64d8a22c7da29 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 3 Apr 2023 17:46:39 +0000 Subject: [PATCH 02/10] Update jet build module to load w3emc. Fixes #801. --- modulefiles/build.jet.intel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/build.jet.intel.lua b/modulefiles/build.jet.intel.lua index d6a0a877b..e6ce6a54a 100644 --- a/modulefiles/build.jet.intel.lua +++ b/modulefiles/build.jet.intel.lua @@ -31,8 +31,8 @@ load(pathJoin("nccmp", nccmp_ver)) esmf_ver=os.getenv("esmf_ver") or "8.4.0b08" load(pathJoin("esmf", esmf_ver)) -w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" -load(pathJoin("w3nco", w3nco_ver)) +w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" +load(pathJoin("w3emc", w3emc_ver)) sp_ver=os.getenv("sp_ver") or "2.3.3" load(pathJoin("sp", sp_ver)) From fa5f0e0b36c57d1ee3e5825ef2a696acc74fc32d Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 3 Apr 2023 12:48:10 -0500 Subject: [PATCH 03/10] Update Orion build module for w3emc. Fixes #801. --- modulefiles/build.orion.intel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua index 553069024..10ca1a654 100644 --- a/modulefiles/build.orion.intel.lua +++ b/modulefiles/build.orion.intel.lua @@ -31,8 +31,8 @@ load(pathJoin("nemsio", nemsio_ver)) sp_ver=os.getenv("sp_ver") or "2.3.3" load(pathJoin("sp", sp_ver)) -w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" -load(pathJoin("w3nco", w3nco_ver)) +w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" +load(pathJoin("w3emc", w3emc_ver)) sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" load(pathJoin("sfcio", sfcio_ver)) From faf48535b57c19820d5ba6ef961712a903a81b37 Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Mon, 3 Apr 2023 18:06:22 +0000 Subject: [PATCH 04/10] Update wcoss2 build module to use w3emc. Fixes #801. --- modulefiles/build.wcoss2.intel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/build.wcoss2.intel.lua b/modulefiles/build.wcoss2.intel.lua index af6066c0d..c683ec7ae 100644 --- a/modulefiles/build.wcoss2.intel.lua +++ b/modulefiles/build.wcoss2.intel.lua @@ -38,8 +38,8 @@ load(pathJoin("bacio", bacio_ver)) sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" load(pathJoin("sfcio", sfcio_ver)) -w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" -load(pathJoin("w3nco", w3nco_ver)) +w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" +load(pathJoin("w3emc", w3emc_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.2" load(pathJoin("nemsio", nemsio_ver)) From c1a9ed931776b730595617afdaca7c72576fcbd3 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 3 Apr 2023 20:03:29 +0000 Subject: [PATCH 05/10] Remove references to w3nco from developer.yml. Fixes #801. --- .github/workflows/developer.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index eea2601a6..9fe2cab0e 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -246,31 +246,6 @@ jobs: make -j2 make install - - name: cache-w3nco - id: cache-w3nco - uses: actions/cache@v2 - with: - path: ~/w3nco - key: developer-w3nco-${{ runner.os }}-2.4.1 - - - name: checkout-w3nco - if: steps.cache-w3nco.outputs.cache-hit != 'true' - uses: actions/checkout@v2 - with: - repository: NOAA-EMC/NCEPLIBS-w3nco - path: w3nco - ref: v2.4.1 - - - name: build-w3nco - if: steps.cache-w3nco.outputs.cache-hit != 'true' - run: | - cd w3nco - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/w3nco - make -j2 - make install - - name: cache-nemsio id: cache-nemsio uses: actions/cache@v2 @@ -341,7 +316,7 @@ jobs: doxygen --version export ESMFMKFILE=~/esmf/lib/esmf.mk cd build - cmake -DTEST_FILE_DIR=/home/runner/data -DENABLE_DOCS=On -DCMAKE_PREFIX_PATH="~/jasper;~/g2c;~/bacio;~/g2;~/w3emc;~/w3nco;~/sfcio;~/sigio;~/nemsio;~/sp;~/ip" -DCMAKE_Fortran_FLAGS="-g -fprofile-arcs -ftest-coverage -O0" -DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -O0" -DCMAKE_BUILD_TYPE=Debug .. + cmake -DTEST_FILE_DIR=/home/runner/data -DENABLE_DOCS=On -DCMAKE_PREFIX_PATH="~/jasper;~/g2c;~/bacio;~/g2;~/w3emc;~/sfcio;~/sigio;~/nemsio;~/sp;~/ip" -DCMAKE_Fortran_FLAGS="-g -fprofile-arcs -ftest-coverage -O0" -DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -O0" -DCMAKE_BUILD_TYPE=Debug .. make -j2 VERBOSE=1 - name: test From 2149addd335124e2d4931b7e1d75bdcd96c91d16 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 3 Apr 2023 20:21:02 +0000 Subject: [PATCH 06/10] Update to later version of w3emc in developer.yml. Fixes #801. --- .github/workflows/developer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 9fe2cab0e..14544b08c 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -194,7 +194,7 @@ jobs: with: repository: NOAA-EMC/NCEPLIBS-w3emc path: w3emc - ref: v2.9.0 + ref: v2.9.3 - name: build-w3emc run: | From 87d1f9f29d146f857a07c4337abe619f6cca7859 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 3 Apr 2023 20:38:07 +0000 Subject: [PATCH 07/10] Update Linux_versions_ext.yml to use w3emc. Fixes #801 --- .github/workflows/Linux_versions_ext.yml | 48 ++++++++---------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/.github/workflows/Linux_versions_ext.yml b/.github/workflows/Linux_versions_ext.yml index 98dac4d95..68a815b12 100644 --- a/.github/workflows/Linux_versions_ext.yml +++ b/.github/workflows/Linux_versions_ext.yml @@ -35,7 +35,7 @@ jobs: g2_version: [3.4.3] sp_version: [2.3.3] ip_version: [3.3.3] - w3nco_version: [2.4.0] + w3emc_version: [2.9.3] nemsio_version: [2.5.0] sfcio_version: [1.4.0] sigio_version: [2.3.0] @@ -210,22 +210,6 @@ jobs: make -j2 make install - # - name: checkout-w3emc - # uses: actions/checkout@v2 - # with: - # repository: NOAA-EMC/NCEPLIBS-w3emc - # path: w3emc - # ref: develop - - # - name: build-w3emc - # run: | - # cd w3emc - # mkdir build - # cd build - # cmake -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc .. - # make -j2 - # make install - # - name: checkout-g2c # uses: actions/checkout@v2 # with: @@ -267,28 +251,28 @@ jobs: make -j2 make install - - name: cache-w3nco - id: cache-w3nco + - name: cache-w3emc + id: cache-w3emc uses: actions/cache@v2 with: - path: ~/w3nco - key: Linux_versions-w3nco-${{ runner.os }}-${{ matrix.w3nco_version }} + path: ~/w3emc + key: Linux_versions-w3emc-${{ runner.os }}-${{ matrix.w3emc_version }} - - name: checkout-w3nco - if: steps.cache-w3nco.outputs.cache-hit != 'true' + - name: checkout-w3emc + if: steps.cache-w3emc.outputs.cache-hit != 'true' uses: actions/checkout@v2 with: - repository: NOAA-EMC/NCEPLIBS-w3nco - path: w3nco - ref: v${{ matrix.w3nco_version }} + repository: NOAA-EMC/NCEPLIBS-w3emc + path: w3emc + ref: v${{ matrix.w3emc_version }} - - name: build-w3nco - if: steps.cache-w3nco.outputs.cache-hit != 'true' + - name: build-w3emc + if: steps.cache-w3emc.outputs.cache-hit != 'true' run: | - cd w3nco + cd w3emc mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/w3nco + cmake .. -DCMAKE_INSTALL_PREFIX=~/w3emc make -j2 make install @@ -313,7 +297,7 @@ jobs: cd nemsio mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=~/nemsio -DCMAKE_PREFIX_PATH="~/bacio;~/w3nco" .. + cmake -DCMAKE_INSTALL_PREFIX=~/nemsio -DCMAKE_PREFIX_PATH="~/bacio;~/w3emc" .. make -j2 make install @@ -362,7 +346,7 @@ jobs: mkdir build cd build export ESMFMKFILE=~/esmf/lib/esmf.mk - cmake -DTEST_FILE_DIR=/home/runner/data -DCMAKE_PREFIX_PATH="~/jasper;~/g2c;~/bacio;~/g2;~/w3nco;~/sfcio;~/sigio;~/nemsio;~/sp;~/ip" .. + cmake -DTEST_FILE_DIR=/home/runner/data -DCMAKE_PREFIX_PATH="~/jasper;~/g2c;~/bacio;~/g2;~/w3emc;~/sfcio;~/sigio;~/nemsio;~/sp;~/ip" .. make -j2 VERBOSE=1 - name: test From df9ae1956ea30d6ea3beab21e93f240f8e5aa2a7 Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Tue, 4 Apr 2023 12:54:37 +0000 Subject: [PATCH 08/10] Attempt to fix the w3emc compile. Fixes #801. --- .github/workflows/Linux_versions_ext.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux_versions_ext.yml b/.github/workflows/Linux_versions_ext.yml index 68a815b12..954458e2a 100644 --- a/.github/workflows/Linux_versions_ext.yml +++ b/.github/workflows/Linux_versions_ext.yml @@ -272,7 +272,7 @@ jobs: cd w3emc mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/w3emc + cmake .. -DCMAKE_INSTALL_PREFIX=~/w3emc -DCMAKE_PREFIX_PATH=~/bacio make -j2 make install From c283e6e77623e9e7b991fe3ba357d9b73ca780a1 Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Tue, 4 Apr 2023 13:50:07 +0000 Subject: [PATCH 09/10] Attempt to fix Linux_versions.yml. Fixes #801. --- .github/workflows/Linux_versions.yml | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index a67abe615..03baff39d 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -35,7 +35,7 @@ jobs: g2_version: [3.4.3] sp_version: [2.3.3] ip_version: [3.3.3] - w3nco_version: [2.4.0] + w3emc_version: [2.9.3] nemsio_version: [2.5.0] sfcio_version: [1.4.0] sigio_version: [2.3.0] @@ -267,28 +267,28 @@ jobs: make -j2 make install - - name: cache-w3nco - id: cache-w3nco + - name: cache-w3emc + id: cache-w3emc uses: actions/cache@v2 with: - path: ~/w3nco - key: Linux_versions-w3nco-${{ runner.os }}-${{ matrix.w3nco_version }} + path: ~/w3emc + key: Linux_versions-w3emc-${{ runner.os }}-${{ matrix.w3emc_version }} - - name: checkout-w3nco - if: steps.cache-w3nco.outputs.cache-hit != 'true' + - name: checkout-w3emc + if: steps.cache-w3emc.outputs.cache-hit != 'true' uses: actions/checkout@v2 with: - repository: NOAA-EMC/NCEPLIBS-w3nco - path: w3nco - ref: v${{ matrix.w3nco_version }} + repository: NOAA-EMC/NCEPLIBS-w3emc + path: w3emc + ref: v${{ matrix.w3emc_version }} - - name: build-w3nco - if: steps.cache-w3nco.outputs.cache-hit != 'true' + - name: build-w3emc + if: steps.cache-w3emc.outputs.cache-hit != 'true' run: | - cd w3nco + cd w3emc mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/w3nco + cmake .. -DCMAKE_INSTALL_PREFIX=~/w3emc -DCMAKE_PREFIX_PATH=~/bacio make -j2 make install @@ -313,7 +313,7 @@ jobs: cd nemsio mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=~/nemsio -DCMAKE_PREFIX_PATH="~/bacio;~/w3nco" .. + cmake -DCMAKE_INSTALL_PREFIX=~/nemsio -DCMAKE_PREFIX_PATH="~/bacio;~/w3emc" .. make -j2 make install @@ -362,7 +362,7 @@ jobs: mkdir build cd build export ESMFMKFILE=~/esmf/lib/esmf.mk - cmake -DTEST_FILE_DIR=/home/runner/data -DCMAKE_PREFIX_PATH="~/jasper;~/g2c;~/bacio;~/g2;~/w3nco;~/sfcio;~/sigio;~/nemsio;~/sp;~/ip" .. + cmake -DTEST_FILE_DIR=/home/runner/data -DCMAKE_PREFIX_PATH="~/jasper;~/g2c;~/bacio;~/g2;~/w3emc;~/sfcio;~/sigio;~/nemsio;~/sp;~/ip" .. make -j2 VERBOSE=1 - name: test From 4590d05a4367b6579db52f1a8f0c9e807eb7dabf Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 5 Apr 2023 15:28:39 +0000 Subject: [PATCH 10/10] Update README.md file. Fixes #801. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c01fce21d..65661d60a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ UFS_UTILS Code managers: George Gayno, Jeff Beck, Larissa Reames This package uses the [hpc-stack](https://github.com/NOAA-EMC/hpc-stack) for the following NCEPLIBS packages: - [NCEPLIBS-sfcio](https://github.com/NOAA-EMC/NCEPLIBS-sfcio) - - [NCEPLIBS-w3nco](https://github.com/NOAA-EMC/NCEPLIBS-w3nco) + - [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc) - [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio) - [NCEPLIBS-nemsio](https://github.com/NOAA-EMC/NCEPLIBS-nemsio) - [NCEPLIBS-sigio](https://github.com/NOAA-EMC/NCEPLIBS-sigio) @@ -91,7 +91,7 @@ are called from driver scripts. The `util` directory contains utility scripts. -The `parm` directory contains variable mapping parameter tables used by +The `parm` directory contains parameter files used by the chgres_cube program. The `driver_scripts` directory contains high-level driver scripts to