Merge pull request #270 from rem1776/platform-updates

update esm4p2 and null model yamls for c5 update
NOAA-GFDL · Nov 26, 2024 · 5775bab · 5775bab
2 parents ad7b893 + 26956ba
commit 5775bab
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 320 deletions.
diff --git a/fre/make/tests/ESM4_example/compile.yaml b/fre/make/tests/ESM4_example/compile.yaml
diff --git a/fre/make/tests/ESM4_example/esm4.yaml b/fre/make/tests/ESM4_example/esm4.yaml
diff --git a/fre/make/tests/ESM4_example/platforms.yaml b/fre/make/tests/ESM4_example/platforms.yaml
diff --git a/fre/make/tests/SHiELD_example/SHiELD.yaml b/fre/make/tests/SHiELD_example/SHiELD.yaml
diff --git a/fre/make/tests/SHiELD_example/compile.yaml b/fre/make/tests/SHiELD_example/compile.yaml
diff --git a/fre/make/tests/SHiELD_example/platforms.yaml b/fre/make/tests/SHiELD_example/platforms.yaml
diff --git a/fre/make/tests/null_example/compile.yaml b/fre/make/tests/null_example/compile.yaml
@@ -5,7 +5,7 @@ compile:
      src:
           - component: "FMS"
             repo: "https://github.com/NOAA-GFDL/FMS.git"
-            cppdefs: "-Duse_netCDF -Duse_libMPI -DMAXFIELDS_=200 -DMAXFIELDMETHODS_=200 -DINTERNAL_FILE_NML -DHAVE_GETTID" # gettid flag is platform specific
+            cppdefs: "-Duse_netCDF -Duse_libMPI -DMAXFIELDS_=200 -DMAXFIELDMETHODS_=200 -DINTERNAL_FILE_NML"
             otherFlags: "-fallow-argument-mismatch" # only needed for gcc
             branch: *branch
           - component: "atmos_null"

diff --git 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"]