From b2624e812d6bb151220c4a687bca273e737bf34a Mon Sep 17 00:00:00 2001 From: Daniele Peano Date: Wed, 2 Feb 2022 17:04:15 +0100 Subject: [PATCH] add grids for nemo and changes for zeus --- component_grids_mct.xml | 6 ++ machines/cmake_macros/zeus.cmake | 3 +- machines/config_machines.xml | 10 ++-- maps_mct.xml | 94 ++++++++++++++++++++++++++++++++ modelgrid_aliases_mct.xml | 21 +++++++ 5 files changed, 127 insertions(+), 7 deletions(-) diff --git a/component_grids_mct.xml b/component_grids_mct.xml index 374de56c..613c9acf 100644 --- a/component_grids_mct.xml +++ b/component_grids_mct.xml @@ -55,6 +55,8 @@ domain.ocn.0.47x0.63_gx1v6_090408.nc domain.lnd.fv0.47x0.63_gx1v7.180521.nc domain.ocn.fv0.47x0.63_gx1v7.180521.nc + domain.lnd.fv0.47x0.63_tn0.25v3.211026.nc + domain.ocn.fv0.47x0.63_tn0.25v3.211026.nc 0.47x0.63 is FV 1/2-deg grid: @@ -223,6 +225,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30_gx1v7.171003.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_tn0.25v3.211029.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_tn0.25v3.211029.nc ne30np4 is Spectral Elem 1-deg grid: @@ -254,6 +258,8 @@ 194402 1 $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_gx1v6.120406.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_gx1v6.121113.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_tn0.25v3.210915.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_tn0.25v3.210915.nc ne60np4 is Spectral Elem 1/2-deg grid: diff --git a/machines/cmake_macros/zeus.cmake b/machines/cmake_macros/zeus.cmake index 3629c363..8c24e3dc 100644 --- a/machines/cmake_macros/zeus.cmake +++ b/machines/cmake_macros/zeus.cmake @@ -5,5 +5,4 @@ string(APPEND CPPDEFS " -DNO_R16 -DHAVE_NANOTIME") if (COMP_NAME STREQUAL nemo) string(APPEND FFLAGS " $(FC_AUTO_R8) -O3 -assume norealloc_lhs") endif() -execute_process(COMMAND ${NETCDF_PATH}/bin/nc-config --flibs OUTPUT_VARIABLE SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0 OUTPUT_STRIP_TRAILING_WHITESPACE) -string(APPEND SLIBS " ${SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0}") +execute_process(COMMAND ${NETCDF_PATH}/bin/nc-config --flibs) diff --git a/machines/config_machines.xml b/machines/config_machines.xml index 1180f26f..cf985be3 100644 --- a/machines/config_machines.xml +++ b/machines/config_machines.xml @@ -3557,20 +3557,20 @@ This allows using a different mpirun command to launch unit tests impi20.1/parallel-netcdf/1.12.1 - impi20.1/esmf/8.0.1-intelmpi-64-g + impi20.1/esmf/8.1.1-intelmpi-64-g - impi20.1/esmf/8.0.1-intelmpi-64-O + impi20.1/esmf/8.1.1-intelmpi-64-O - intel20.1/esmf/8.0.1-mpiuni-64-g + intel20.1/esmf/8.1.1-mpiuni-64-g - intel20.1/esmf/8.0.1-mpiuni-64-O + intel20.1/esmf/8.1.1-mpiuni-64-O - /work/csp/cmip01/csm/xios + /data/inputs/CESM/xios-2.5 1 diff --git a/maps_mct.xml b/maps_mct.xml index 94554f26..0364d5bf 100644 --- a/maps_mct.xml +++ b/maps_mct.xml @@ -110,6 +110,22 @@ cpl/cpl6/map_tx0.1v2_to_fv0.23x0.31_aave_da_090127.nc + + cpl/cpl6/map_fv0.23x0.31_TO_tn1v3_aave.160414.nc + cpl/cpl6/map_fv0.23x0.31_TO_tn1v3_blin.160414.nc + cpl/cpl6/map_fv0.23x0.31_TO_tn1v3_blin.160414.nc + cpl/cpl6/map_tn1v3_TO_fv0.23x0.31_aave.160414.nc + cpl/cpl6/map_tn1v3_TO_fv0.23x0.31_aave.160414.nc + + + + cpl/cpl6/map_fv0.23x0.31_TO_tn0.25v3_aave.160721.nc + cpl/cpl6/map_fv0.23x0.31_TO_tn0.25v3_blin.160721.nc + cpl/cpl6/map_fv0.23x0.31_TO_tn0.25v3_blin.160721.nc + cpl/cpl6/map_tn0.25v3_TO_fv0.23x0.31_aave.160721.nc + cpl/cpl6/map_tn0.25v3_TO_fv0.23x0.31_aave.160721.nc + + cpl/cpl6/map_fv0.47x0.63_to_gx1v6_aave_da_090407.nc cpl/cpl6/map_fv0.47x0.63_to_gx1v6_patch_090401.nc @@ -126,6 +142,14 @@ cpl/cpl6/map_tx0.1v2_to_fv0.47x0.63_aave_da_090218.nc + + cpl/cpl6/map_fv0.47x0.63_TO_tn0.25v3_aave.211025.nc + cpl/cpl6/map_fv0.47x0.63_TO_tn0.25v3_blin.211025.nc + cpl/cpl6/map_fv0.47x0.63_TO_tn0.25v3_blin.211025.nc + cpl/cpl6/map_tn0.25v3_TO_fv0.47x0.63_aave.211025.nc + cpl/cpl6/map_tn0.25v3_TO_fv0.47x0.63_aave.211025.nc + + cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_TO_gx1v6_aave.130322.nc cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_TO_gx1v6_blin.130322.nc @@ -158,6 +182,22 @@ cpl/cpl6/map_mp120v1_to_fv0.9x1.25_aave_da_111004.nc + + cpl/cpl6/map_fv0.9x1.25_TO_tn1v3_aave.160414.nc + cpl/cpl6/map_fv0.9x1.25_TO_tn1v3_blin.160414.nc + cpl/cpl6/map_fv0.9x1.25_TO_tn1v3_patc.160414.nc + cpl/cpl6/map_tn1v3_TO_fv0.9x1.25_aave.160414.nc + cpl/cpl6/map_tn1v3_TO_fv0.9x1.25_aave.160414.nc + + + + cpl/cpl6/map_fv0.9x1.25_TO_tn0.25v3_aave.160721.nc + cpl/cpl6/map_fv0.9x1.25_TO_tn0.25v3_blin.160721.nc + cpl/cpl6/map_fv0.9x1.25_TO_tn0.25v3_patc.160721.nc + cpl/cpl6/map_tn0.25v3_TO_fv0.9x1.25_aave.160721.nc + cpl/cpl6/map_tn0.25v3_TO_fv0.9x1.25_aave.160721.nc + + cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v6_aave.130322.nc cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v6_blin.130322.nc @@ -229,6 +269,14 @@ cpl/gridmaps/ne30np4/map_ne30_TO_ww3a_blin.190214.nc + + cpl/cpl6/map_ne30np4_TO_tn0.25v3_aave.211029.nc + cpl/cpl6/map_ne30np4_TO_tn0.25v3_blin.211029.nc + cpl/cpl6/map_ne30np4_TO_tn0.25v3_patc.211029.nc + cpl/cpl6/map_tn0.25v3_TO_ne30np4_aave.211029.nc + cpl/cpl6/map_tn0.25v3_TO_ne30np4_aave.211029.nc + + cpl/gridmaps/ne30np4.pg2/map_ne30np4.pg2_TO_gx1v7_aave.200626.nc cpl/gridmaps/ne30np4.pg2/map_ne30np4.pg2_TO_gx1v7_blin.200626.nc @@ -259,6 +307,14 @@ cpl/gridmaps/gx1v6/map_gx1v6_TO_ne60np4_aave.120406.nc + + cpl/cpl6/map_ne60np4_TO_tn0.25v3_aave.210914.nc + cpl/cpl6/map_ne60np4_TO_tn0.25v3_blin.210914.nc + cpl/cpl6/map_ne60np4_TO_tn0.25v3_patc.210914.nc + cpl/cpl6/map_tn0.25v3_TO_ne60np4_aave.210914.nc + cpl/cpl6/map_tn0.25v3_TO_ne60np4_aave.210914.nc + + cpl/gridmaps/ne120np4/map_ne120np4_to_gx1v6_aave_110428.nc cpl/gridmaps/ne120np4/map_ne120np4_to_gx1v6_bilin_110428.nc @@ -464,6 +520,20 @@ cpl/gridmaps/oQU120/map_oQU120_TO_T62_aave.151209.nc cpl/gridmaps/oQU120/map_oQU120_TO_T62_aave.151209.nc + + cpl/cpl6/map_T62_TO_tn1v3_aave.160414.nc + cpl/cpl6/map_T62_TO_tn1v3_blin.160414.nc + cpl/cpl6/map_T62_TO_tn1v3_patc.160414.nc + cpl/cpl6/map_tn1v3_TO_T62_aave.160414.nc + cpl/cpl6/map_tn1v3_TO_T62_aave.160414.nc + + + cpl/cpl6/map_T62_TO_tn0.25v3_aave.160721.nc + cpl/cpl6/map_T62_TO_tn0.25v3_blin.160721.nc + cpl/cpl6/map_T62_TO_tn0.25v3_patc.160721.nc + cpl/cpl6/map_tn0.25v3_TO_T62_aave.160721.nc + cpl/cpl6/map_tn0.25v3_TO_T62_aave.160721.nc + @@ -728,6 +798,14 @@ cpl/gridmaps/r05/map_r05_TO_gx1v7_aave.161012.nc + + cpl/cpl6/map_r05_to_tn1v3_e1000r300_160414.nc + + + + cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc + + @@ -981,6 +1059,14 @@ cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc + + cpl/cpl6/map_rx1_to_tn1v3_e1000r300_160414.nc + cpl/cpl6/map_rx1_to_tn1v3_e1000r300_160414.nc + + + cpl/cpl6/map_rx1_to_tn0.25v3_e1000r300_160721.nc + cpl/cpl6/map_rx1_to_tn0.25v3_e1000r300_160721.nc + cpl/gridmaps/rx1/map_rx1_to_tx0.66v1_nnsm_e1000r300_190315.nc cpl/gridmaps/rx1/map_rx1_to_tx0.66v1_nnsm_e1000r300_190315.nc @@ -1010,6 +1096,14 @@ cpl/gridmaps/r05/map_r05_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc cpl/gridmaps/r05/map_r05_to_gx1v7_nnsm_e1000r300_170413.nc + + cpl/cpl6/map_r05_to_tn1v3_e1000r300_160414.nc + cpl/cpl6/map_r05_to_tn1v3_e1000r300_160414.nc + + + cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc + cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc + cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml index fa1d47ec..919110d8 100644 --- a/modelgrid_aliases_mct.xml +++ b/modelgrid_aliases_mct.xml @@ -489,6 +489,13 @@ gx1v7 + + 0.47x0.63 + 0.47x0.63 + tn0.25v3 + tn0.25v3 + + 0.47x0.63 0.47x0.63 @@ -831,6 +838,13 @@ gx1v7 + + ne30np4 + ne30np4 + tn0.25v3 + tn0.25v3 + + ne30np4.pg3 ne30np4.pg3 @@ -898,6 +912,13 @@ gx1v7 + + ne60np4 + ne60np4 + tn0.25v3 + tn0.25v3 + + ne60np4 ne60np4