From 2b0e335574b6bf83ab9fdb210ef3ed651dae27bc Mon Sep 17 00:00:00 2001
From: Mats Bentsen <mben@norceresearch.no>
Date: Tue, 5 May 2020 22:14:46 +0200
Subject: [PATCH] Modified configuration files and makefile to complete the
 transition from MICOM to BLOM.

---
 config/cesm/config_archive.xml                |  4 +-
 config/cesm/config_files.xml                  | 12 ++---
 config/cesm/machines/config_compilers.xml     |  6 +--
 scripts/Tools/Makefile                        |  2 +-
 .../datm/cime_config/config_component.xml     |  4 +-
 .../mct/cime_config/config_component_cesm.xml | 52 +++++++++----------
 .../runoff_to_ocn/runoff_map_gl4_tnx1v4.nml   |  4 +-
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/config/cesm/config_archive.xml b/config/cesm/config_archive.xml
index 9b828f6c180..d2276ffbf5a 100644
--- a/config/cesm/config_archive.xml
+++ b/config/cesm/config_archive.xml
@@ -126,7 +126,7 @@
       </test_file_names>
     </comp_archive_spec>
 
-    <comp_archive_spec compname="micom" compclass="ocn">
+    <comp_archive_spec compname="blom" compclass="ocn">
       <rest_file_extension>r</rest_file_extension>
       <rest_file_extension>rbgc</rest_file_extension>
       <hist_file_extension>h[dmy]\d*.*\.nc$</hist_file_extension>
@@ -134,7 +134,7 @@
       <rest_history_varname>unset</rest_history_varname>
       <rpointer>
         <rpointer_file>rpointer$NINST_STRING.ocn</rpointer_file>
-        <rpointer_content>./$CASE.micom$NINST_STRING.r.$DATENAME.nc</rpointer_content>
+        <rpointer_content>./$CASE.blom$NINST_STRING.r.$DATENAME.nc</rpointer_content>
       </rpointer>
     </comp_archive_spec>
   </components>
diff --git a/config/cesm/config_files.xml b/config/cesm/config_files.xml
index 8a512ea9c02..2f38d3529b1 100644
--- a/config/cesm/config_files.xml
+++ b/config/cesm/config_files.xml
@@ -125,7 +125,7 @@
     <default_value>unset</default_value>
     <values>
       <value component="pop"       >$SRCROOT/components/pop/</value>
-      <value component="micom"     >$SRCROOT/components/micom/</value>
+      <value component="blom"      >$SRCROOT/components/blom/</value>
       <value component="docn"      >$CIMEROOT/src/components/data_comps/docn</value>
       <value component="socn"      >$CIMEROOT/src/components/stub_comps/socn</value>
       <value component="xocn"      >$CIMEROOT/src/components/xcpl_comps/xocn</value>
@@ -237,7 +237,7 @@
       <value component="cice"     >$COMP_ROOT_DIR_ICE/cime_config/config_compsets.xml</value>
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
       <value component="mpas-o"   >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
-      <value component="micom"    >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
+      <value component="blom"     >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>
@@ -257,7 +257,7 @@
       <value component="cice"     >$COMP_ROOT_DIR_ICE/cime_config/config_pes.xml</value>
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/config_pes.xml</value>
       <value component="mpas-o"   >$COMP_ROOT_DIR_OCN/cime_config/config_pes.xml</value>
-      <value component="micom"    >$COMP_ROOT_DIR_OCN/cime_config/config_pes.xml</value>
+      <value component="blom"     >$COMP_ROOT_DIR_OCN/cime_config/config_pes.xml</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>
@@ -322,7 +322,7 @@
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/testdefs/testlist_pop.xml</value>
       <value component="rtm"      >$COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_rtm.xml</value>
       <value component="mosart"   >$COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_mosart.xml</value>
-      <value component="micom"   >$COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_micom.xml</value>
+      <value component="blom"     >$COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_blom.xml</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>
@@ -343,7 +343,7 @@
       <value component="rtm"      >$COMP_ROOT_DIR_ROF/cime_config/testdefs/testmods_dirs</value>
       <value component="mosart"   >$COMP_ROOT_DIR_ROF/cime_config/testdefs/testmods_dirs</value>
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/testdefs/testmods_dirs</value>
-      <value component="micom"    >$COMP_ROOT_DIR_OCN/cime_config/testdefs/testmods_dirs</value>
+      <value component="blom"     >$COMP_ROOT_DIR_OCN/cime_config/testdefs/testmods_dirs</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>
@@ -364,7 +364,7 @@
       <value component="mosart"   >$COMP_ROOT_DIR_ROF/cime_config/usermods_dirs</value>
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/usermods_dirs</value>
       <value component="mpas-o"   >$COMP_ROOT_DIR_OCN/cime_config/usermods_dirs</value>
-      <value component="micom"    >$COMP_ROOT_DIR_OCN/cime_config/usermods_dirs</value>
+      <value component="blom"     >$COMP_ROOT_DIR_OCN/cime_config/usermods_dirs</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>
diff --git a/config/cesm/machines/config_compilers.xml b/config/cesm/machines/config_compilers.xml
index 71693c43baf..8a9aec470cd 100644
--- a/config/cesm/machines/config_compilers.xml
+++ b/config/cesm/machines/config_compilers.xml
@@ -1184,7 +1184,7 @@ using a fortran linker.
   <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
   <FFLAGS>
     <append DEBUG="FALSE"> -O2 -xAVX </append>
-    <append MODEL="micom"> -r8 </append>
+    <append MODEL="blom"> -r8 </append>
     <append MODEL="cam"> -init=zero,arrays </append>
   </FFLAGS>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
@@ -1206,7 +1206,7 @@ using a fortran linker.
   <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
   <FFLAGS>
     <append DEBUG="FALSE"> -O2 </append>
-    <append MODEL="micom"> -r8 </append>
+    <append MODEL="blom"> -r8 </append>
     <append MODEL="cam"> -init=zero,arrays </append>
   </FFLAGS>
   <MPICC> mpiicc </MPICC>
@@ -1225,7 +1225,7 @@ using a fortran linker.
   <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
   <FFLAGS>
     <append DEBUG="FALSE"> -O2 -xAVX </append>
-    <append MODEL="micom"> -r8 </append>
+    <append MODEL="blom"> -r8 </append>
   </FFLAGS>
   <MPICC> mpiicc </MPICC>
   <SLIBS>
diff --git a/scripts/Tools/Makefile b/scripts/Tools/Makefile
index 2cfe912ef1d..20ee6f71020 100644
--- a/scripts/Tools/Makefile
+++ b/scripts/Tools/Makefile
@@ -624,7 +624,7 @@ GPTLLIB = $(GPTL_LIBDIR)/libgptl.a
 
 ULIBS += -L$(INSTALL_SHAREDPATH)/$(COMP_INTERFACE)/$(ESMFDIR)/$(NINST_VALUE)/lib -lcsm_share -L$(INSTALL_SHAREDPATH)/lib $(PIOLIBNAME) -lgptl -lmct -lmpeu
 
-ifeq ($(MODEL), micom)
+ifeq ($(MODEL), blom)
   ifdef PNETCDF_PATH
     FFLAGS += -DPNETCDF
   endif
diff --git a/src/components/data_comps/datm/cime_config/config_component.xml b/src/components/data_comps/datm/cime_config/config_component.xml
index 72d1d16062a..b75b87474ac 100644
--- a/src/components/data_comps/datm/cime_config/config_component.xml
+++ b/src/components/data_comps/datm/cime_config/config_component.xml
@@ -102,8 +102,8 @@
       <value compset="^RCP4">rcp4.5</value>
       <value compset="^RCP2">rcp2.6</value>
       <value compset="^HIST">20tr</value>
-      <value compset="20TR_DATM%IAF.*_MICOM%ECO" cime_model="cesm">20tr</value>
-      <value compset="20TR_DATM%JRA.*_MICOM%ECO" cime_model="cesm">omip2</value>
+      <value compset="20TR_DATM%IAF.*_BLOM%ECO" cime_model="cesm">20tr</value>
+      <value compset="20TR_DATM%JRA.*_BLOM%ECO" cime_model="cesm">omip2</value>
     </values>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
diff --git a/src/drivers/mct/cime_config/config_component_cesm.xml b/src/drivers/mct/cime_config/config_component_cesm.xml
index 12c6bef5054..4534cde77d5 100644
--- a/src/drivers/mct/cime_config/config_component_cesm.xml
+++ b/src/drivers/mct/cime_config/config_component_cesm.xml
@@ -124,7 +124,7 @@
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>FALSE</default_value>
     <values>
-      <value compset="_MICOM">TRUE</value>
+      <value compset="_BLOM">TRUE</value>
     </values>
     <group>run_flags</group>
     <file>env_run.xml</file>
@@ -153,7 +153,7 @@
       <value compset="_CAM">CO2A</value>
       <value compset="_DATM">none</value>
       <value compset="_DATM%CPLHIST.+POP\d">CO2A</value>
-      <value compset="_DATM%CPLHIST.+MICOM%ECO">CO2A</value>
+      <value compset="_DATM%CPLHIST.+BLOM%ECO">CO2A</value>
       <value compset="HIST.*_DATM.*_CLM">CO2A</value>
       <value compset="RCP.*_DATM.*_CLM">CO2A</value>
       <value compset="_BGC%BPRP">CO2C</value>
@@ -163,8 +163,8 @@
       <value compset="_BGC%DMS">CO2_DMSB</value>
       <value compset="HIST.*_DATM%(QIA|CRU)">CO2A</value>
       <value compset="RCP.*_DATM%(QIA|CRU)" >CO2A</value>
-      <value compset="20TR_DATM%IAF.*_MICOM%ECO">CO2A</value>
-      <value compset="20TR_DATM%JRA.*_MICOM%ECO">CO2A</value>
+      <value compset="20TR_DATM%IAF.*_BLOM%ECO">CO2A</value>
+      <value compset="20TR_DATM%JRA.*_BLOM%ECO">CO2A</value>
     </values>
     <group>run_coupling</group>
     <file>env_run.xml</file>
@@ -226,9 +226,9 @@
       <value compset="_DATM%COPYALL_NPS">72</value>
       <value compset="_DATM.*_CLM">48</value>
       <value compset="_DATM.*_DICE.*_POP2">4</value>
-      <value compset="_DATM.*_DICE.*_MICOM">4</value>
+      <value compset="_DATM.*_DICE.*_BLOM">4</value>
       <value compset="_DATM.*_SLND.*_CICE.*_POP2">24</value>
-      <value compset="_DATM.*_SLND.*_CICE.*_MICOM">24</value>
+      <value compset="_DATM.*_SLND.*_CICE.*_BLOM">24</value>
       <value compset="_DATM.*_CICE.*_DOCN">24</value>
       <value compset="_DATM.*_DOCN%US20">24</value>
       <value compset="_DATM%CPLHIST.+POP\d">48</value>
@@ -255,9 +255,9 @@
       <value compset="_DLND.*_CISM\d">1</value>
       <value compset="_DATM.*_DICE.*_POP2.*_WW3">4</value>
       <value compset="_DATM.*_DICE.*_POP2.*_DWAV">4</value>
-      <value compset="_DATM.*_DICE.*_MICOM.*_WW3" >4</value>
-      <value compset="_DATM.*_DICE.*_MICOM.*_DWAV">4</value>
-      <value compset="_MICOM" grid="oi%tnx0.25v">48</value>
+      <value compset="_DATM.*_DICE.*_BLOM.*_WW3" >4</value>
+      <value compset="_DATM.*_DICE.*_BLOM.*_DWAV">4</value>
+      <value compset="_BLOM" grid="oi%tnx0.25v">48</value>
     </values>
     <group>run_coupling</group>
     <file>env_run.xml</file>
@@ -297,12 +297,12 @@
     <default_value>$ATM_NCPL</default_value>
     <values match="last">
       <value compset="_POP2">1</value>
-      <value compset="_MICOM">1</value>
+      <value compset="_BLOM">1</value>
       <value compset="_POP2" grid="oi%tx0.1v2">4</value>
       <value compset="_POP2" grid="oi%gx1v6">24</value>
       <value compset="_POP2" grid="oi%gx1v7">24</value>
-      <value compset="_MICOM" grid="oi%tnx1v">24</value>
-      <value compset="_MICOM" grid="oi%tnx0.25v">48</value>
+      <value compset="_BLOM" grid="oi%tnx1v">24</value>
+      <value compset="_BLOM" grid="oi%tnx0.25v">48</value>
       <value compset="_DATM%NYF.*_SLND.*_DICE.*_DOCN.*_SWAV">1</value>
       <value compset="_DATM%NYF.*_DLND.*_DICE.*_DOCN.*_DWAV">1</value>
       <value compset="_DLND.*_CISM\d">1</value>
@@ -355,7 +355,7 @@
     <default_value>8</default_value>
     <values match="last">
       <value compset="_DATM.*_POP2.*_DROF">$ATM_NCPL</value>
-      <value compset="_DATM.*_MICOM.*_DROF">$ATM_NCPL</value>
+      <value compset="_DATM.*_BLOM.*_DROF">$ATM_NCPL</value>
       <value compset="_DATM.*_DOCN%SOM">$ATM_NCPL</value>
       <value compset="_DATM.*_SLND.*_DICE.*_DOCN">$ATM_NCPL</value>
       <value compset="_DATM%CPLHIST.+POP\d">8</value>
@@ -392,8 +392,8 @@
       <value compset="DATM.+POP\d">TRUE</value>
       <value compset="DATM.+DOCN%IAF">TRUE</value>
       <value compset="DATM%CPLHIST.+POP\d">FALSE</value>
-      <value compset="DATM.+MICOM">TRUE</value>
-      <value compset="DATM%CPLHIST.+MICOM">FALSE</value>
+      <value compset="DATM.+BLOM">TRUE</value>
+      <value compset="DATM%CPLHIST.+BLOM">FALSE</value>
     </values>
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
@@ -419,9 +419,9 @@
     <default_value>off</default_value>
     <values match="last">
       <value compset="DATM.+POP\d">ocn</value>
-      <value compset="DATM.+MICOM">ocn</value>
+      <value compset="DATM.+BLOM">ocn</value>
       <value compset="DATM%CPLHIST.+POP\d">off</value>
-      <value compset="DATM%CPLHIST.+MICOM">off</value>
+      <value compset="DATM%CPLHIST.+BLOM">off</value>
     </values>
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
@@ -448,7 +448,7 @@
       <value compset="_CAM5%NUDGEPTAEROUPD1">.true.</value>
       <value compset="_CAM54%NUDGEPTAERO">.true.</value>
       <value compset="_CAM60%NUDGEPTAERO">.true.</value>
-      <value compset="_MICOM">.true.</value>
+      <value compset="_BLOM">.true.</value>
     </values>
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
@@ -469,9 +469,9 @@
       <value compset="_CAM5%NUDGEPTAEROUPD1">1</value>
       <value compset="_CAM54%NUDGEPTAERO">1</value>
       <value compset="_CAM60%NUDGEPTAERO">1</value>
-      <value compset="_MICOM">1</value>
-      <value compset="_DATM.*_MICOM">0</value>
-      <value compset="_DATM%CPLHIST.*_MICOM">1</value>
+      <value compset="_BLOM">1</value>
+      <value compset="_DATM.*_BLOM">0</value>
+      <value compset="_DATM%CPLHIST.*_BLOM">1</value>
     </values>
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
@@ -487,10 +487,10 @@
     <values match="last">
       <value compset="_DATM.*_DOCN%SOM"          >CESM1_MOD</value>
       <value compset="_POP2"                     >CESM1_MOD</value>
-      <value compset="_MICOM"                    >CESM1_MOD</value>
+      <value compset="_BLOM"                     >CESM1_MOD</value>
       <value compset="_POP2" grid="oi%gx1v6"     >RASM_OPTION1</value>
       <value compset="_POP2" grid="oi%gx1v7"     >RASM_OPTION1</value>
-      <value compset="_MICOM" grid="oi%tnx1v"     >RASM_OPTION1</value>
+      <value compset="_BLOM" grid="oi%tnx1v"     >RASM_OPTION1</value>
       <value compset="_DATM%NYF.*_SLND.*_DICE.*_DOCN">CESM1_MOD</value>
       <value compset="_XATM.*_XLND.*_XICE.*_XOCN">CESM1_MOD</value>
       <value compset="_SOCN"                     >CESM1_MOD</value>
@@ -556,8 +556,8 @@
     <values match="last">
       <value compset="DATM.*_POP\d">TRUE</value>
       <value compset="CAM.*_POP\d">TRUE</value>
-      <value compset="DATM.*_MICOM"    >TRUE</value>
-      <value compset="CAM.*_MICOM"     >TRUE</value>
+      <value compset="DATM.*_BLOM">TRUE</value>
+      <value compset="CAM.*_BLOM">TRUE</value>
       <value compset="CAM.*_DOCN%SOM">TRUE</value>
     </values>
     <group>run_budgets</group>
@@ -572,7 +572,7 @@
     <values match="last">
       <value compset="^2000">367.0</value>
       <value compset="DATM.*POP2%ECO">284.317</value>
-      <value compset="^1850.+DATM%NYF.*_MICOM%ECO"  >284.32</value>
+      <value compset="^1850.+DATM%NYF.*_BLOM%ECO"  >284.32</value>
     </values>
     <group>run_co2</group>
     <file>env_run.xml</file>
diff --git a/tools/mapping/gen_mapping_files/runoff_to_ocn/runoff_map_gl4_tnx1v4.nml b/tools/mapping/gen_mapping_files/runoff_to_ocn/runoff_map_gl4_tnx1v4.nml
index 260a053f04e..d4dc16832ac 100644
--- a/tools/mapping/gen_mapping_files/runoff_to_ocn/runoff_map_gl4_tnx1v4.nml
+++ b/tools/mapping/gen_mapping_files/runoff_to_ocn/runoff_map_gl4_tnx1v4.nml
@@ -1,8 +1,8 @@
 &input_nml
    gridtype     = 'scrip'
    file_roff    = '/cluster/shared/noresm/inputdata/glc/cism/griddata/SCRIPgrid_greenland_4km_epsg3413_c170414.nc'
-   file_ocn     = '/cluster/shared/noresm/inputdata/ocn/micom/tnx1v4/20170601/remap_grid_tnx1v4_20170601.nc'
-   file_ocn_coastal_mask     = '/cluster/shared/noresm/inputdata/ocn/micom/tnx1v4/20170601/remap_grid_tnx1v4_20170601.nc'
+   file_ocn     = '/cluster/shared/noresm/inputdata/ocn/blom/tnx1v4/20170601/remap_grid_tnx1v4_20170601.nc'
+   file_ocn_coastal_mask     = '/cluster/shared/noresm/inputdata/ocn/blom/tnx1v4/20170601/remap_grid_tnx1v4_20170601.nc'
    file_nn      = 'map_gland4km_epsg3413_to_tnx1v4_nn.nc '
    file_smooth  = 'map_tnx1v4_coast_to_tnx1v4_sm_for_gland4km.nc '
    file_new     = 'map_gland4km_to_tnx1v4_nnsm_e1000r300_181030.nc'