BLOM CIME cpp updates to run in NorESM

cime_config/buildcpp

@@ -87,6 +87,7 @@ def buildcpp(case):
     hamocc_sedbypass = case.get_value("HAMOCC_SEDBYPASS")
     hamocc_ciso = case.get_value("HAMOCC_CISO")
     hamocc_vsls = case.get_value("HAMOCC_VSLS")
+    cgsmks = case.get_value("BLOM_UNIT")
 
     expect(blom_vcoord != "cntiso_hybrid" or not turbclo, "BLOM_VCOORD == {} and BLOM_TURBULENT_CLOSURE == {} is not a valid combination".format(blom_vcoord, turbclo))
 
@@ -146,6 +147,15 @@ def buildcpp(case):
             else:
                 expect(False, "tracer module {} is not recognized".format(module))
 
+    if cgsmks:
+        for option in cgsmks.split():
+            if option == "cgs":
+                blom_cppdefs = blom_cppdefs + " -DCGS"
+            elif option == "mks":
+                blom_cppdefs = blom_cppdefs + " -DMKS"
+            else:
+                expect(False, "SI_UNIT module {} is not recognized".format(option))
+
     blom_cppdefs = "-DMPI" + blom_cppdefs
 
     # update the xml variable BLOM_CPPDEFS with the above definition

cime_config/config_component.xml

@@ -218,6 +218,15 @@
     <desc>Optional turbulent closure.  Valid values one of: twoeq oneeq. Additional values: advection isodif</desc>
   </entry>
 
+  <entry id="BLOM_UNIT">
+    <type>char</type>
+    <valid_values></valid_values>
+    <default_value>cgs</default_value>
+    <group>build_component_blom</group>
+    <file>env_build.xml</file>
+    <desc>BLOM UNIT values.  Valid values one of: cgs mks. </desc>
+  </entry>
+
   <description>
     <desc compset="_BLOM"    >BLOM default:</desc>
     <desc compset="_BLOM%ECO">BLOM/Ecosystem:</desc>