From 4b3cde4ad219051fd36c14cfd088f9fa0209953e Mon Sep 17 00:00:00 2001 From: Ryan Mulhall Date: Fri, 15 Nov 2024 11:43:54 -0500 Subject: [PATCH] update esm4p2 and null model yamls for c5 update --- fre/make/tests/ESM4_example/compile.yaml | 2 +- fre/make/tests/ESM4_example/platforms.yaml | 10 +--------- fre/make/tests/null_example/platforms.yaml | 10 +--------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/fre/make/tests/ESM4_example/compile.yaml b/fre/make/tests/ESM4_example/compile.yaml index ee51658d..c4e63597 100644 --- a/fre/make/tests/ESM4_example/compile.yaml +++ b/fre/make/tests/ESM4_example/compile.yaml @@ -5,7 +5,7 @@ compile: src: - component: "FMS" repo: "https://github.com/NOAA-GFDL/FMS.git" - cppdefs: "-Duse_libMPI -Duse_netCDF -DMAXFIELDMETHODS_=500" + cppdefs: "-Duse_libMPI -Duse_netCDF -DMAXFIELDMETHODS_=500 -DHAVE_GETTID" branch: *FMS_GIT_TAG - component: "atmos_phys" requires: ["FMS"] diff --git a/fre/make/tests/ESM4_example/platforms.yaml b/fre/make/tests/ESM4_example/platforms.yaml index 14d4dfff..2114f9da 100644 --- a/fre/make/tests/ESM4_example/platforms.yaml +++ b/fre/make/tests/ESM4_example/platforms.yaml @@ -1,16 +1,8 @@ platforms: - - name: ncrc5.intel - compiler: intel - modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] - modules: [ !join [*INTEL, "/2022.2.1"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] - fc: ftn - cc: cc - mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL,".mk"] - modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel23 compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] - modules: [!join [*INTEL, "/2023.1.0"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] + modules: [ !join [*INTEL, "/2023.2.0"],"fre/bronx-21",cray-hdf5/1.12.2.11, cray-netcdf/4.9.0.11] fc: ftn cc: cc mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"] diff --git a/fre/make/tests/null_example/platforms.yaml b/fre/make/tests/null_example/platforms.yaml index fdfa9d4f..d2a3c97f 100644 --- a/fre/make/tests/null_example/platforms.yaml +++ b/fre/make/tests/null_example/platforms.yaml @@ -1,16 +1,8 @@ platforms: - - name: ncrc5.intel - compiler: intel - modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] - modules: [ !join [*INTEL, "/2022.2.1"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] - fc: ftn - cc: cc - mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"] - modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel23 compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] - modules: [!join [*INTEL, "/2023.1.0"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] + modules: [!join [*INTEL, "/2023.2.0"],"fre/bronx-21",cray-hdf5/1.12.2.11, cray-netcdf/4.9.0.11] fc: ftn cc: cc mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"]