Skip to content

Commit

Permalink
Feature iHAMOCC nml (#261)
Browse files Browse the repository at this point in the history
* renaming beleg_parm to mo_parambgc_ini without any further changes - not executable

* adjust description to new module name

* adjust description

* initial step to rewrite mo_parambgc_ini to real module - compilable

* Restructuring mo_parambgc_ini

* Placing the nml-read call

* First working namelist read for BGC parameters

* Re-arrange parameter initialization and tidy up a bit

* add the namelist to the cime config buildnml file - for expert use only

* Add missing parameters to the log-writing subroutine

* Declare local parameters for cisonew

* Remove unused parameter

* fix compile error wrt AGG=true

* Add typical tuning parameters to namelist and introduce readjust routine for parameters that depend on tuning parameters

* add white space

* add Martin curve sinking parameters to bgc-namelist

* Add information to NML-readme file

* Remove old attached version of beleg_parm

* Cleaning write of parameters

* add some white space

* rename mo_parambgc_ini

* Adjust files to new name
  • Loading branch information
jmaerz authored Aug 9, 2023
1 parent aa737aa commit 26ea524
Show file tree
Hide file tree
Showing 9 changed files with 708 additions and 513 deletions.
3 changes: 3 additions & 0 deletions cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,9 @@ cat >>! $RUNDIR/ocn_in$inststr << EOF
SEDPORFILE = $SEDPORFILE
/
&BGCPARAMS
/
&BGCOAFX
OALKSCEN = $BGCOAFX_OALKSCEN
OALKFILE = $BGCOAFX_OALKFILE
Expand Down
12 changes: 9 additions & 3 deletions cime_config/ocn_in.readme
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
! SSTGA - global average sea surface temperature [degC]
!
!===========================================================================
! NAMELIST FOR iHAMOCC OPTIONS
! NAMELIST BGCNML FOR iHAMOCC OPTIONS
!
! CONTENTS:
!
Expand All @@ -376,7 +376,13 @@
! SEDPORFILE : File name (incl. full path) for sediment porosity
!
!===========================================================================
! NAMELIST FOR ALKALINIZATION SCENARIO
! NAMELIST BGCPARAMS FOR iHAMOCC-BGC PARAMETERS (DEVELOPERS ONLY)
!
! CONTENTS: EMPTY BY DEFAULT
! FOR ADJUSTABLE PARAMETERS, SEE CODE
!
!===========================================================================
! NAMELIST BGCOAFX FOR ALKALINIZATION SCENARIO
!
! CONTENTS:
!
Expand All @@ -389,7 +395,7 @@
! RAMP_END : End year for ramp up in 'ramp' scenario
!
!===========================================================================
! IO-NAMELIST FOR DIAGNOSTIC iHAMOCC OUTPUT
! IO-NAMELIST DIABGC FOR DIAGNOSTIC iHAMOCC OUTPUT
!
! Namelist acronyms:
! GLB_ - global parameters i.e. valid for entire output group
Expand Down
2 changes: 1 addition & 1 deletion hamocc/aufr_bgc.F90
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ SUBROUTINE AUFR_BGC(kpie,kpje,kpke,ntr,ntrbgc,itrbgc,trc, &
INTEGER :: idate(5),i,j,k
logical :: lread_cfc,lread_nat,lread_iso,lread_atm,lread_bro
#ifdef cisonew
REAL :: rco213,rco214,alpha14,beta13,beta14,d13C_atm,d14cat
REAL :: rco213,rco214,alpha14,beta13,beta14,d14cat
#endif
INTEGER ncid,ncstat,ncvarid

Expand Down
Loading

0 comments on commit 26ea524

Please sign in to comment.