Update M4AGO scheme to version v1.1.1 (equivalent to dev-1.1.1) (#460)

* Update M4AGO to v1.1.0 (equivalent dev-1.0.10)

* adjust meson.build file for updated M4AGO scheme

* Introduce new init of M4AGO

* Switch to latest M4AGO release version

hamocc/mo_hamocc_init.F90

@@ -47,7 +47,7 @@ subroutine hamocc_init(read_rest,rstfnm_hamocc)
                               ocn_co2_type, use_sedbypass, use_BOXATM, use_BROMO,use_extNcycle,    &
                               use_nuopc_ndep,lTO2depremin
     use mo_param1_bgc,  only: ks,init_por2octra_mapping
-    use mo_param_bgc,   only: ini_parambgc
+    use mo_param_bgc,   only: ini_parambgc,claydens,calcdens,calcwei,opaldens,opalwei,ropal
     use mo_carbch,      only: alloc_mem_carbch,ocetra,atm,atm_co2
     use mo_biomod,      only: alloc_mem_biomod
     use mo_sedmnt,      only: alloc_mem_sedmnt,sedlay,powtra,burial,ini_sedmnt
@@ -66,7 +66,8 @@ subroutine hamocc_init(read_rest,rstfnm_hamocc)
     use mo_ini_fields,  only: ini_fields_ocean,ini_fields_atm
     use mo_aufr_bgc,    only: aufr_bgc
     use mo_extNsediment,only: alloc_mem_extNsediment_diag
-    use mo_ihamocc4m4ago, only: alloc_mem_m4ago,init_m4ago_nml_params, init_m4ago_params
+    use mo_ihamocc4m4ago, only: alloc_mem_m4ago
+    use mo_m4ago_HAMOCCinit,only: init_m4ago_nml_params, init_m4ago_derived_params
     use mo_read_shelfmask,only: ini_read_shelfmask,shelfsea_maskfile
 
 
@@ -182,8 +183,8 @@ subroutine hamocc_init(read_rest,rstfnm_hamocc)
     !
     call ini_parambgc()
     if (use_M4AGO) then
-      call init_m4ago_nml_params
-      call init_m4ago_params
+      call init_m4ago_nml_params(claydens,calcdens,calcwei,opaldens,opalwei)
+      call init_m4ago_derived_params(ropal)
     endif
 
     ! --- Initialize atmospheric fields with (updated) parameter values

pkgs/meson.build

@@ -17,4 +17,19 @@ if get_option('ecosys')
    if fs.exists('M4AGO-sinking-scheme/src/mo_m4ago_kind.F90')
      sources += files('M4AGO-sinking-scheme/src/mo_m4ago_kind.F90')
    endif
+   if fs.exists('M4AGO-sinking-scheme/src/mo_m4ago_control.f90')
+     sources += files('M4AGO-sinking-scheme/src/mo_m4ago_control.f90')
+   endif
+   if fs.exists('M4AGO-sinking-scheme/src/mo_m4ago_params.f90')
+     sources += files('M4AGO-sinking-scheme/src/mo_m4ago_params.f90')
+   endif
+   if fs.exists('M4AGO-sinking-scheme/src/mo_m4ago_types.f90')
+     sources += files('M4AGO-sinking-scheme/src/mo_m4ago_types.f90')
+   endif
+   if fs.exists('M4AGO-sinking-scheme/src/mo_m4ago_HAMOCCinit.F90')
+     sources += files('M4AGO-sinking-scheme/src/mo_m4ago_HAMOCCinit.F90')
+   endif
+   if fs.exists('M4AGO-sinking-scheme/src/mo_m4ago_HAMOCCPrimPart.F90')
+     sources += files('M4AGO-sinking-scheme/src/mo_m4ago_HAMOCCPrimPart.F90')
+   endif
 endif