fixes for testing

cime_config/buildcpp

@@ -141,10 +141,10 @@ def buildcpp(case):
                 if hamocc_sedbypass:
                     blom_cppdefs = blom_cppdefs + " -Dsedbypass"
                 if hamocc_ciso:
-                    expect(hamocc_sedbypass, 
-                           "HAMOCC C-isotopes currently not supported in the sediment module. Use HAMOCC_SEDBYPASS=TRUE")
+                    expect(hamocc_sedbypass, "HAMOCC C-isotopes currently not supported in the sediment module. Use HAMOCC_SEDBYPASS=TRUE")
                     blom_cppdefs = blom_cppdefs + " -Dcisonew"
-                if hamocc_vsls:
+                if ocn_grid in ["tnx1v4"]:
+                    # HAMOCC will always compute bromoform flux and dms flux and send to the mediator
                     blom_cppdefs = blom_cppdefs + " -DBROMO"
                 if co2type == "prognostic":
                     blom_cppdefs = blom_cppdefs + " -DPROGCO2"
@@ -163,7 +163,7 @@ def buildcpp(case):
     blom_cppdefs = "-DMPI" + blom_cppdefs
 
     # update the xml variable BLOM_CPPDEFS with the above definition
-    # case.set_value("BLOM_CPPDEFS", blom_cppdefs)
+    #case.set_value("BLOM_CPPDEFS", blom_cppdefs)
 
     return blom_cppdefs
 

cime_config/config_component.xml

@@ -206,18 +206,6 @@
     <desc>Set preprocessor option to activate the debugging mode for iHAMOCC. Requires module ecosys</desc>
   </entry>
 
-  <entry id="HAMOCC_VSLS">
-    <type>logical</type>
-    <valid_values>TRUE,FALSE</valid_values>
-    <default_value>FALSE</default_value>
-    <values>
-      <value compset="BGC%.*BRF.*">TRUE</value>
-    </values>
-    <group>build_component_blom</group>
-    <file>env_build.xml</file>
-    <desc>Set preprocessor option to activate the VSLS-Bromoform tracer code. Requires module ecosys</desc>
-  </entry>
-
   <entry id="BLOM_TURBULENT_CLOSURE">
     <type>char</type>
     <valid_values></valid_values>