Fixing variable sediment porosity - field initialization in case of `…

…sedbypass=true` (#198) * Removing bodensed - Initialization of sediment parameters and fields now in mo_sedmnt
NorESMhub · Sep 27, 2022 · c863a47 · c863a47
1 parent 83d9237
commit c863a47
Show file tree

Hide file tree

Showing 5 changed files with 200 additions and 210 deletions.
diff --git a/hamocc/bodensed.F90 b/hamocc/bodensed.F90
diff --git a/hamocc/dipowa.F90 b/hamocc/dipowa.F90
@@ -40,7 +40,7 @@ subroutine dipowa(kpie,kpje,kpke,omask,lspin)
 !     Method
 !     -------
 !     implicit formulation;
-!     constant diffusion coefficient : 1.e-9 set in BODENSED.
+!     constant diffusion coefficient : 1.e-9 set in ini_sedmnt in mo_sedmnt
 !     diffusion coefficient : zcoefsu/zcoeflo for upper/lower
 !     sediment layer boundary.
 !

diff --git a/hamocc/hamocc_init.F90 b/hamocc/hamocc_init.F90
@@ -47,10 +47,10 @@ subroutine hamocc_init(read_rest,rstfnm_hamocc)
        &                    sedspin_yr_s,sedspin_yr_e,sedspin_ncyc,             &
        &                    dtb,dtbgc,io_stdo_bgc,ldtbgc,                       &
        &                    ldtrunbgc,ndtdaybgc,with_dmsph,l_3Dvarsedpor
-  use mo_param1_bgc,  only: ks,nsedtra,npowtra,init_por2octra_mapping
+  use mo_param1_bgc,  only: ks,init_por2octra_mapping
   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
+  use mo_sedmnt,      only: alloc_mem_sedmnt,sedlay,powtra,burial,ini_sedmnt
   use mo_vgrid,       only: alloc_mem_vgrid,set_vgrid
   use mo_bgcmean,     only: alloc_mem_bgcmean
   use mo_read_rivin,  only: ini_read_rivin,rivinfile
@@ -176,9 +176,9 @@ subroutine hamocc_init(read_rest,rstfnm_hamocc)
   call set_vgrid(idm,jdm,kdm,bgc_dp)
   !
   ! --- Initialize sediment layering
-  ! First raed the porosity, then apply it in bodensed
+  ! First read the porosity, then apply it in ini_sedmnt
   CALL read_sedpor(idm,jdm,ks,omask,sed_por)
-  CALL BODENSED(idm,jdm,kdm,bgc_dp,omask,sed_por)
+  CALL ini_sedmnt(idm,jdm,kdm,omask,sed_por)
   !
   ! --- Initialize parameters, sediment and ocean tracer.
   !

diff --git a/hamocc/meson.build b/hamocc/meson.build
@@ -4,7 +4,6 @@ sources += files(
   'aufw_bgc.F90',
   'beleg_parm.F90',
   'beleg_vars.F90',
-  'bodensed.F90',
   'carchm.F90',
   'carchm_kequi.F90',
   'carchm_solve.F90',