Merge pull request #362 from mvertens/feature/fixbugs

bug fixes
NorESMhub · Jul 9, 2024 · c1c0658 · c1c0658
2 parents 30fdd27 + 2a0d544
commit c1c0658
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/cime_config/buildlib_2.2 b/cime_config/buildlib_2.2
@@ -66,7 +66,6 @@ def _main_func():
                      os.path.join(comp_root_dir_ocn, "channel"),
                      os.path.join(comp_root_dir_ocn, "single_column"),
                      os.path.join(comp_root_dir_ocn, "pkgs", "CVMix-src", "src", "shared"),
-                     os.path.join(comp_root_dir_ocn, "pkgs", "M4AGO-sinking-scheme", "src"),
                      os.path.join(comp_root_dir_ocn, "phy"),
                      os.path.join(comp_root_dir_ocn, "trc"),
                      os.path.join(comp_root_dir_ocn, "idlage")]
@@ -77,6 +76,7 @@ def _main_func():
                         continue
                     elif module == "ecosys":
                         paths.append(os.path.join(comp_root_dir_ocn, "hamocc"))
+                        paths.append(os.path.join(comp_root_dir_ocn, "pkgs", "M4AGO-sinking-scheme", "src"))
                     else:
                         expect(False, "tracer module {} is not recognized".format(module))
 

diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -327,14 +327,14 @@ def buildnml(case, caseroot, compname):
     # used by cmeps to change attributes that are sent to the atm
     # TODO: add n2o_emis and nh3_emis logic
     if "ecosys" in case.get_value("BLOM_TRACER_MODULES"):
-        dms_emis = case.get_value("DMS_EMIS")
-        if dms_emis is not None or dms_emis is False:
+        dms_emis = case.get_value("DMS_EMIS_OCN")
+        if dms_emis is not None:
             case.set_value('DMS_EMIS_OCN','TRUE')
-            print ("   ***Resetting DMS_EMIS_OCN to TRUE***")
+            print ("   ***Setting DMS_EMIS_OCN to TRUE***")
         brf_emis = pg_blom.get_value('use_bromo')
         if brf_emis == ".true.":
             case.set_value('BRF_EMIS_OCN','TRUE')
-            print ("   ***Resetting BRF_EMIS to TRUE***")
+            print ("   ***Setting BRF_EMIS_OCN to TRUE***")
 
 ###############################################################################
 def _main_func():

diff --git a/drivers/nuopc/mod_nuopc_methods.F90 b/drivers/nuopc/mod_nuopc_methods.F90
@@ -45,6 +45,7 @@ module mod_nuopc_methods
 #ifdef HAMOCC
    use mo_control_bgc, only: use_BROMO, ocn_co2_type
 #endif
+   use mod_fill_global, only: fill_global
 
    implicit none
    private
@@ -263,11 +264,11 @@ subroutine blom_advertise_exports(flds_scalar_name, fldsFrOcn_num, fldsFrOcn)
      call fldlist_add(fldsFrOcn_num, fldsFrOcn, 'Fioo_q'        , index_Fioo_q)
      call fldlist_add(fldsFrOcn_num, fldsFrOcn, 'Faoo_fco2_ocn' , index_Faoo_fco2)
 #ifdef HAMOCC
-     call fldlist_add(fldsToOcn_num, fldsToOcn, 'Faoo_fdms_ocn' , index_Faoo_fdms)
+     call fldlist_add(fldsFrOcn_num, fldsFrOcn, 'Faoo_fdms_ocn' , index_Faoo_fdms)
      call fldlist_add(fldsFrOcn_num, fldsFrOcn, 'Faoo_fn2o_ocn' , index_Faoo_fn2o)
      call fldlist_add(fldsFrOcn_num, fldsFrOcn, 'Faoo_fnh3_ocn' , index_Faoo_fnh3)
      if (use_BROMO) then
-        call fldlist_add(fldsToOcn_num, fldsToOcn, 'Faoo_fbrf_ocn', index_Faoo_fbrf)
+        call fldlist_add(fldsFrOcn_num, fldsFrOcn, 'Faoo_fbrf_ocn', index_Faoo_fbrf)
      end if
 #endif
 

diff --git a/hamocc/mo_hamocc_init.F90 b/hamocc/mo_hamocc_init.F90
@@ -178,7 +178,7 @@ subroutine hamocc_init(read_rest,rstfnm_hamocc)
     !
     ! --- Initialize parameters
     !
-    call ini_parambgc(idm,jdm)
+    call ini_parambgc()
     if (use_M4AGO) then
       call init_m4ago_nml_params
       call init_m4ago_params

diff --git a/pkgs/M4AGO-sinking-scheme b/pkgs/M4AGO-sinking-scheme