diff --git a/hamocc/mo_hamocc_init.F90 b/hamocc/mo_hamocc_init.F90 index e643e3d0..64f50341 100644 --- a/hamocc/mo_hamocc_init.F90 +++ b/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 diff --git a/pkgs/M4AGO-sinking-scheme b/pkgs/M4AGO-sinking-scheme index a20622fc..e77441d9 160000 --- a/pkgs/M4AGO-sinking-scheme +++ b/pkgs/M4AGO-sinking-scheme @@ -1 +1 @@ -Subproject commit a20622fc631ade5094a4dbbeb5d615314d19adec +Subproject commit e77441d9da95b7e3eb0e89d1564cda131cf7be7b diff --git a/pkgs/meson.build b/pkgs/meson.build index d672e2a4..bbf101a3 100644 --- a/pkgs/meson.build +++ b/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