Merge pull request #46 from mvertens/feature/add_new_blomgrid

New 1/2 degree blom grid and updates to betzy
NorESMhub · Aug 19, 2024 · daa8195 · daa8195
2 parents 33371dd + 5e399a3
commit daa8195
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 180 deletions.
diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
@@ -376,6 +376,12 @@
     <desc>tnx2v1 is tripole v1 2-deg BLOM grid:</desc>
     <support>Experimental for BLOM experiments</support>
   </domain>
+  <domain name="tnx0.5v1">
+    <nx>720</nx> <ny>640</ny>
+    <mesh>$DIN_LOC_ROOT/share/meshes/tnx0.5v1_20240702_cdf5_ESMFmesh.nc</mesh>
+    <desc>tnx0.5v1 is tripole v1 1/2-deg BLOM grid:</desc>
+    <support>Experimental for BLOM experiments</support>
+  </domain>
   <domain name="tnx0.25v4">
     <nx>1440</nx> <ny>1152</ny>
     <mesh>$DIN_LOC_ROOT/share/meshes/tnx0.25v4_ESMFmesh_cdf5_c20231006.nc</mesh>

diff --git a/machines/config_batch.xml b/machines/config_batch.xml
@@ -688,11 +688,11 @@
     </directives>
     <directives queue = "preproc">
       <directive> --partition=preproc</directive>
-      <directive> --mem=16G</directive>
+      <directive> --mem-per-cpu=1900M</directive>
     </directives>
     <queues>
-      <queue walltimemax="00:59:00" nodemin="4" nodemax="1024" default="true">normal</queue>
-      <queue walltimemax="00:59:00" nodemin="1" nodemax="1" >preproc</queue>
+      <queue walltimedef="00:59:00" walltimemax="48:00:00" nodemin="4" nodemax="1024" default="true">normal</queue>
+      <queue walltimemax="00:59:00" jobmin="1" jobmax="1" >preproc</queue>
       <queue walltimemax="00:59:00" nodemin="1" nodemax="4" >devel</queue>
     </queues>
   </batch_system>

diff --git a/maps_nuopc.xml b/maps_nuopc.xml
@@ -6,6 +6,8 @@
     <!--- river to ocn -->
     <!-- ======================================================== -->
 
+    <!-- rx1 river grid -->
+
     <gridmap rof_grid="rx1" ocn_grid="gx3v7" >
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx3v7_nnsm_e1000r500_180430.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx3v7_nnsm_e1000r500_180430.nc</map>
@@ -34,6 +36,13 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_tnx1v4_e1000r300_170606.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_tnx1v4_e1000r300_170606.nc</map>
     </gridmap>
+    <gridmap rof_grid="rx1" ocn_grid="tnx0.5v1" >
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_tnx0.5v1_e300r100_20240702.nc</map>
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_tnx0.5v1_e300r100_20240702.nc</map>
+    </gridmap>
+
+    <!-- r05 river grid -->
+
     <gridmap rof_grid="r05" ocn_grid="gx3v7" >
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx3v7_nnsm_e1000r500_180430.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx3v7_nnsm_e1000r500_180430.nc</map>
@@ -42,9 +51,9 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tnx1v4_e1000r300_170609.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tnx1v4_e1000r300_170609.nc</map>
     </gridmap>
-    <gridmap rof_grid="r05" ocn_grid="gx1v7" >
-      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc</map>
-      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v7_nnsm_e1000r300_170413.nc</map>
+    <gridmap rof_grid="r05" ocn_grid="tnx0.5v1" >
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tnx0.5v1_e300r100_20240702.nc</map>
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tnx0.5v1_e300r100_20240702.nc</map>
     </gridmap>
     <gridmap rof_grid="r05" ocn_grid="tx1v1" >
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc</map>
@@ -54,14 +63,17 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tx0.1v2_r500e1000_080620.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tx0.1v2_r500e1000_080620.nc</map>
     </gridmap>
-    <gridmap rof_grid="JRA025v2" ocn_grid="gx1v7" >
-      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_190214.nc</map>
-      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_gx1v7_e1000r300_190214.nc</map>
+    <gridmap rof_grid="r05" ocn_grid="tx0.66v1" >
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx0.66v1_e1000r300_190314.nc</map>
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx0.66v1_e1000r300_190314.nc</map>
     </gridmap>
-    <gridmap rof_grid="JRA025" ocn_grid="gx1v7" >
-      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170801.nc</map>
-      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_gx1v7_e1000r300_170801.nc</map>
+    <gridmap rof_grid="r05" ocn_grid="tx2_3v2" >
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx2_3_nnsm_e250r250_230914.nc</map>
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx2_3_nnsm_e1000r1000_230415.nc</map>
     </gridmap>
+
+    <!-- JRA025 river grid -->
+
     <gridmap rof_grid="JRA025" ocn_grid="tx0.1v2" >
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_tx0.1v2_e333r100_170619.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_tx0.1v2_e333r100_170619.nc</map>
@@ -74,14 +86,6 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_tx0.1v3_e333r100_170830.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_tx0.1v3_e333r100_170830.nc</map>
     </gridmap>
-    <gridmap rof_grid="r05" ocn_grid="tx0.66v1" >
-      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx0.66v1_e1000r300_190314.nc</map>
-      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx0.66v1_e1000r300_190314.nc</map>
-    </gridmap>
-    <gridmap rof_grid="r05" ocn_grid="tx2_3v2" >
-      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx2_3_nnsm_e250r250_230914.nc</map>
-      <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx2_3_nnsm_e1000r1000_230415.nc</map>
-    </gridmap>
     <gridmap rof_grid="JRA025" ocn_grid="tx0.66v1" >
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_tx0.66v1_nnsm_e333r100_190910.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_tx0.66v1_nnsm_e333r100_190910.nc</map>
@@ -94,6 +98,11 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_tnx1v4_e1000r300_170928.nc</map>
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_tnx1v4_e1000r300_170928.nc</map>
     </gridmap>
+    <gridmap rof_grid="JRA025" ocn_grid="tnx0.5v1" >
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_tnx0.5v1_e300r100_20240702.nc</map>
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_tnx0.5v1_e300r100_20240702.nc</map>
+    </gridmap>
+
 
     <!-- ======================================================== -->
     <!-- MizuRoute mapping files -->