From ea2e0065c55d70fee12c3d6c0defa1160e34ee13 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 1 Dec 2022 12:34:28 +0100 Subject: [PATCH 1/6] changes for bringing in nemo --- component_grids_nuopc.xml | 11 +++++++++++ machines/config_batch.xml | 3 ++- machines/config_machines.xml | 14 +++++++++----- maps_nuopc.xml | 8 ++++++++ modelgrid_aliases_nuopc.xml | 21 +++++++++++++++++++++ 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index 0c10a574..8076e6c2 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -33,6 +33,11 @@ $DIN_LOC_ROOT/share/meshes/0.125nldas2_ESMFmesh_cd5_241220.nc Regional NLDAS-2 grid over the U.S. (0.125 degree resolution; 25-53N, 235-293E) + + 576 384 + $DIN_LOC_ROOT/share/meshes/fv0.47x0.63_141008_FIX102722_polemod_ESMFMesh.nc + 0.47x0.63 is FV 1/2-deg grid: + 288 192 @@ -308,6 +313,12 @@ $DIN_LOC_ROOT/share/meshes/gx1v7_151008_ESMFmesh.nc gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature: + + 1440 1050 + + $DIN_LOC_ROOT/share/scripgrids/tn0.25v3_160721.nc + tn0.25v3 is NEMO ORCA1 tripole grid at 1/4 deg (reduced eORCA): + 100 116 $DIN_LOC_ROOT/share/meshes/gx3v7_120309_ESMFmesh.nc diff --git a/machines/config_batch.xml b/machines/config_batch.xml index 7a28fffb..2a80c711 100644 --- a/machines/config_batch.xml +++ b/machines/config_batch.xml @@ -765,9 +765,10 @@ + - -R "span[ptile={{ tasks_per_node }}]" + -R "span[ptile=30]" p_short diff --git a/machines/config_machines.xml b/machines/config_machines.xml index 476752b2..3a1aaffc 100644 --- a/machines/config_machines.xml +++ b/machines/config_machines.xml @@ -3589,7 +3589,7 @@ This allows using a different mpirun command to launch unit tests CMCC Lenovo ThinkSystem SD530, os is Linux, 36 pes/node, batch system is LSF - (login[1,2]-ib|n[0-9][0-9][0-9]-ib) + (login[1,2].cluster.net|n[0-9][0-9][0-9].cluster.net) LINUX intel impi,mpi-serial @@ -3639,21 +3639,25 @@ This allows using a different mpirun command to launch unit tests impi20.1/parallel-netcdf/1.12.1 - impi20.1/esmf/8.1.1-intelmpi-64-g + impi20.1/esmf/8.2.0-intelmpi-64-g - impi20.1/esmf/8.1.1-intelmpi-64-O + impi20.1/esmf/8.2.0-intelmpi-64-O - intel20.1/esmf/8.1.1-mpiuni-64-g + intel20.1/esmf/8.2.0-mpiuni-64-g - intel20.1/esmf/8.1.1-mpiuni-64-O + intel20.1/esmf/8.2.0-mpiuni-64-O /data/inputs/CESM/xios-2.5 + + ON + SUMMARY + 1 gpfs diff --git a/maps_nuopc.xml b/maps_nuopc.xml index c07cf206..e79f0337 100644 --- a/maps_nuopc.xml +++ b/maps_nuopc.xml @@ -18,6 +18,10 @@ cpl/gridmaps/rx1/map_rx1_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc cpl/gridmaps/rx1/map_rx1_to_gx1v7_nnsm_e1000r300_170413.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_tx1v1_e1000r300_161214.nc cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc @@ -46,6 +50,10 @@ 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_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_nuopc.xml b/modelgrid_aliases_nuopc.xml index 127bb986..89d3d545 100644 --- a/modelgrid_aliases_nuopc.xml +++ b/modelgrid_aliases_nuopc.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 From c16077a2eeadefe449fd869526296cc570fb2c39 Mon Sep 17 00:00:00 2001 From: Daniele Peano Date: Thu, 1 Dec 2022 12:42:26 +0100 Subject: [PATCH 2/6] First porting of NEMO into the system --- component_grids_nuopc.xml | 6 ++++++ machines/config_batch.xml | 3 ++- machines/config_machines.xml | 14 +++++++++----- maps_nuopc.xml | 8 ++++++++ modelgrid_aliases_nuopc.xml | 21 +++++++++++++++++++++ 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index 0c10a574..283328b0 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -308,6 +308,12 @@ $DIN_LOC_ROOT/share/meshes/gx1v7_151008_ESMFmesh.nc gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature: + + 1440 1050 + + $DIN_LOC_ROOT/share/scripgrids/tn0.25v3_160721.nc + tn0.25v3 is NEMO ORCA1 tripole grid at 1/4 deg (reduced eORCA): + 100 116 $DIN_LOC_ROOT/share/meshes/gx3v7_120309_ESMFmesh.nc diff --git a/machines/config_batch.xml b/machines/config_batch.xml index 7a28fffb..2a80c711 100644 --- a/machines/config_batch.xml +++ b/machines/config_batch.xml @@ -765,9 +765,10 @@ + - -R "span[ptile={{ tasks_per_node }}]" + -R "span[ptile=30]" p_short diff --git a/machines/config_machines.xml b/machines/config_machines.xml index 476752b2..3a1aaffc 100644 --- a/machines/config_machines.xml +++ b/machines/config_machines.xml @@ -3589,7 +3589,7 @@ This allows using a different mpirun command to launch unit tests CMCC Lenovo ThinkSystem SD530, os is Linux, 36 pes/node, batch system is LSF - (login[1,2]-ib|n[0-9][0-9][0-9]-ib) + (login[1,2].cluster.net|n[0-9][0-9][0-9].cluster.net) LINUX intel impi,mpi-serial @@ -3639,21 +3639,25 @@ This allows using a different mpirun command to launch unit tests impi20.1/parallel-netcdf/1.12.1 - impi20.1/esmf/8.1.1-intelmpi-64-g + impi20.1/esmf/8.2.0-intelmpi-64-g - impi20.1/esmf/8.1.1-intelmpi-64-O + impi20.1/esmf/8.2.0-intelmpi-64-O - intel20.1/esmf/8.1.1-mpiuni-64-g + intel20.1/esmf/8.2.0-mpiuni-64-g - intel20.1/esmf/8.1.1-mpiuni-64-O + intel20.1/esmf/8.2.0-mpiuni-64-O /data/inputs/CESM/xios-2.5 + + ON + SUMMARY + 1 gpfs diff --git a/maps_nuopc.xml b/maps_nuopc.xml index c07cf206..e79f0337 100644 --- a/maps_nuopc.xml +++ b/maps_nuopc.xml @@ -18,6 +18,10 @@ cpl/gridmaps/rx1/map_rx1_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc cpl/gridmaps/rx1/map_rx1_to_gx1v7_nnsm_e1000r300_170413.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_tx1v1_e1000r300_161214.nc cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc @@ -46,6 +50,10 @@ 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_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_nuopc.xml b/modelgrid_aliases_nuopc.xml index 127bb986..89d3d545 100644 --- a/modelgrid_aliases_nuopc.xml +++ b/modelgrid_aliases_nuopc.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 From 91f6e32133635aa0949c61dba122ad4c9894ee81 Mon Sep 17 00:00:00 2001 From: Daniele Peano Date: Mon, 5 Dec 2022 14:03:54 +0100 Subject: [PATCH 3/6] Change for reduced core use in Zeus --- machines/config_batch.xml | 2 +- machines/config_machines.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/config_batch.xml b/machines/config_batch.xml index 2a80c711..3bb7c1ad 100644 --- a/machines/config_batch.xml +++ b/machines/config_batch.xml @@ -768,7 +768,7 @@ - -R "span[ptile=30]" + -R "span[ptile={{ tasks_per_node }}]" p_short diff --git a/machines/config_machines.xml b/machines/config_machines.xml index 3a1aaffc..e212383d 100644 --- a/machines/config_machines.xml +++ b/machines/config_machines.xml @@ -3605,7 +3605,7 @@ This allows using a different mpirun command to launch unit tests lsf cmcc 72 - 36 + 30 TRUE mpirun From ef66928e13804646fb3b630132f3042310a40cd1 Mon Sep 17 00:00:00 2001 From: Daniele Peano Date: Fri, 9 Dec 2022 14:58:32 +0100 Subject: [PATCH 4/6] Update for alpha10c tag --- machines/config_machines.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/machines/config_machines.xml b/machines/config_machines.xml index 53468623..75abdcb3 100644 --- a/machines/config_machines.xml +++ b/machines/config_machines.xml @@ -3613,16 +3613,16 @@ This allows using a different mpirun command to launch unit tests impi20.1/parallel-netcdf/1.12.1 - impi20.1/esmf/8.1.1-intelmpi-64-g + impi20.1/esmf/8.2.0-intelmpi-64-g - impi20.1/esmf/8.1.1-intelmpi-64-O + impi20.1/esmf/8.2.0-intelmpi-64-O - intel20.1/esmf/8.1.1-mpiuni-64-g + intel20.1/esmf/8.2.0-mpiuni-64-g - intel20.1/esmf/8.1.1-mpiuni-64-O + intel20.1/esmf/8.2.0-mpiuni-64-O From 0014e6022767c6aebf13382f44d387666f82aa85 Mon Sep 17 00:00:00 2001 From: Daniele Peano Date: Tue, 13 Dec 2022 11:09:54 +0100 Subject: [PATCH 5/6] Update ZEUS configuration --- machines/config_batch.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/machines/config_batch.xml b/machines/config_batch.xml index 1a863883..6327165e 100644 --- a/machines/config_batch.xml +++ b/machines/config_batch.xml @@ -749,19 +749,13 @@ -env -<<<<<<< HEAD - -q $JOB_QUEUE - -W $JOB_WALLCLOCK_TIME - -P $PROJECT -======= ->>>>>>> a864944cc2da07c8a4493fc7346f5010b24a9431 - -R "span[ptile=30]" + -R "span[ptile={{ tasks_per_node }}]" p_short From 5228f180e7e0509393309d455262c9aa7fffc350 Mon Sep 17 00:00:00 2001 From: Daniele Peano Date: Tue, 13 Dec 2022 11:14:44 +0100 Subject: [PATCH 6/6] Update fv0.47x0.63 Mesh file --- component_grids_nuopc.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index c281b866..7f86f782 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -67,11 +67,6 @@ 10x15 is FV 10-deg grid: For low resolution testing - - 576 384 - $DIN_LOC_ROOT/share/meshes/fv0.47x0.63_141008_ESMFmesh.nc - 0.47x0.63 is FV 0.5-deg grid: - 16 8 $DIN_LOC_ROOT/share/meshes/T5_ESMFmesh_cdf5_c20210923.nc