Commit 40f79d6c authored by Jorn Bruggeman's avatar Jorn Bruggeman
Browse files

test case tweaks

parent 7cd90438
...@@ -19,7 +19,7 @@ module akvaplan_tracer_sed ...@@ -19,7 +19,7 @@ module akvaplan_tracer_sed
! Environmental dependencies ! Environmental dependencies
type (type_dependency_id) :: id_T ! temperature type (type_dependency_id) :: id_T ! temperature
type (type_horizontal_dependency_id) :: id_shear !Bottom shear type (type_bottom_dependency_id) :: id_shear !Bottom shear
type (type_dependency_id) :: id_h ! layer thicknesis type (type_dependency_id) :: id_h ! layer thicknesis
! Parameters ! Parameters
...@@ -169,8 +169,8 @@ contains ...@@ -169,8 +169,8 @@ contains
! Environment ! Environment
_GET_(self%id_c,c) _GET_(self%id_c,c)
_GET_(self%id_h,h) _GET_(self%id_h,h)
_GET_HORIZONTAL_(self%id_c_bot,c_bot) _GET_BOTTOM_(self%id_c_bot,c_bot)
_GET_HORIZONTAL_(self%id_shear,shear) _GET_BOTTOM_(self%id_shear,shear)
! Sedimentation ! Sedimentation
if (self%do_sed) then if (self%do_sed) then
......
...@@ -67,14 +67,14 @@ contains ...@@ -67,14 +67,14 @@ contains
_HORIZONTAL_LOOP_BEGIN_ _HORIZONTAL_LOOP_BEGIN_
! Retrieve current predator density (bottom-bound state variable) ! Retrieve current predator density (bottom-bound state variable)
_GET_HORIZONTAL_(self%id_biomass,biomass) _GET_BOTTOM_(self%id_biomass,biomass)
if (self%interact_with_pelagic) then if (self%interact_with_pelagic) then
! Retrieve current prey density (pelagic state variable) ! Retrieve current prey density (pelagic state variable)
_GET_(self%id_prey, prey) _GET_(self%id_prey, prey)
else else
! Retrieve current prey density (bottom-bound state variable) ! Retrieve current prey density (bottom-bound state variable)
_GET_HORIZONTAL_(self%id_bottom_prey, prey) _GET_BOTTOM_(self%id_bottom_prey, prey)
end if end if
! Calculate grazing rate (mmol m-2 s-1) ! Calculate grazing rate (mmol m-2 s-1)
......
...@@ -15,7 +15,7 @@ module examples_npzd_phy ...@@ -15,7 +15,7 @@ module examples_npzd_phy
type (type_state_variable_id) :: id_exctarget,id_morttarget,id_upttarget type (type_state_variable_id) :: id_exctarget,id_morttarget,id_upttarget
type (type_dependency_id) :: id_par type (type_dependency_id) :: id_par
type (type_surface_dependency_id) :: id_I_0 type (type_surface_dependency_id) :: id_I_0
type (type_diagnostic_variable_id) :: id_GPP,id_NCP,id_PPR,id_NPR,id_dPAR type (type_diagnostic_variable_id) :: id_PPR,id_NPR,id_dPAR
! Model parameters ! Model parameters
real(rk) :: p0,z0,kc,i_min,rmax,gmax,iv,alpha,rpn,rpdu,rpdl real(rk) :: p0,z0,kc,i_min,rmax,gmax,iv,alpha,rpn,rpdu,rpdl
...@@ -59,8 +59,6 @@ contains ...@@ -59,8 +59,6 @@ contains
call self%register_state_dependency(self%id_morttarget, 'mortality_target', 'mmol m-3', 'sink for dead matter') call self%register_state_dependency(self%id_morttarget, 'mortality_target', 'mmol m-3', 'sink for dead matter')
! Register diagnostic variables ! Register diagnostic variables
call self%register_diagnostic_variable(self%id_GPP, 'GPP', 'mmol m-3', 'gross primary production')
call self%register_diagnostic_variable(self%id_NCP, 'NCP', 'mmol m-3', 'net community production')
call self%register_diagnostic_variable(self%id_PPR, 'PPR', 'mmol m-3 d-1', 'gross primary production rate') call self%register_diagnostic_variable(self%id_PPR, 'PPR', 'mmol m-3 d-1', 'gross primary production rate')
call self%register_diagnostic_variable(self%id_NPR, 'NPR', 'mmol m-3 d-1', 'net community production rate') call self%register_diagnostic_variable(self%id_NPR, 'NPR', 'mmol m-3 d-1', 'net community production rate')
call self%register_diagnostic_variable(self%id_dPAR, 'PAR', 'W m-2', 'photosynthetically active radiation') call self%register_diagnostic_variable(self%id_dPAR, 'PAR', 'W m-2', 'photosynthetically active radiation')
...@@ -116,8 +114,6 @@ contains ...@@ -116,8 +114,6 @@ contains
! Export diagnostic variables ! Export diagnostic variables
_SET_DIAGNOSTIC_(self%id_dPAR,par) _SET_DIAGNOSTIC_(self%id_dPAR,par)
_SET_DIAGNOSTIC_(self%id_GPP ,primprod)
_SET_DIAGNOSTIC_(self%id_NCP ,primprod - self%rpn*p)
_SET_DIAGNOSTIC_(self%id_PPR ,primprod*secs_pr_day) _SET_DIAGNOSTIC_(self%id_PPR ,primprod*secs_pr_day)
_SET_DIAGNOSTIC_(self%id_NPR ,(primprod - self%rpn*p)*secs_pr_day) _SET_DIAGNOSTIC_(self%id_NPR ,(primprod - self%rpn*p)*secs_pr_day)
...@@ -166,8 +162,6 @@ contains ...@@ -166,8 +162,6 @@ contains
! Export diagnostic variables ! Export diagnostic variables
_SET_DIAGNOSTIC_(self%id_dPAR,par) _SET_DIAGNOSTIC_(self%id_dPAR,par)
_SET_DIAGNOSTIC_(self%id_GPP,primprod)
_SET_DIAGNOSTIC_(self%id_NCP,primprod-self%rpn*p)
_SET_DIAGNOSTIC_(self%id_PPR,primprod*secs_pr_day) _SET_DIAGNOSTIC_(self%id_PPR,primprod*secs_pr_day)
_SET_DIAGNOSTIC_(self%id_NPR,(primprod-self%rpn*p)*secs_pr_day) _SET_DIAGNOSTIC_(self%id_NPR,(primprod-self%rpn*p)*secs_pr_day)
......
...@@ -8,7 +8,7 @@ module gotm_light ...@@ -8,7 +8,7 @@ module gotm_light
private private
type,extends(type_base_model), public :: type_gotm_light type, extends(type_base_model), public :: type_gotm_light
! Identifiers for dependencies [model inputs] ! Identifiers for dependencies [model inputs]
type (type_surface_dependency_id) :: id_swr0 ! Surface shortwave radiation type (type_surface_dependency_id) :: id_swr0 ! Surface shortwave radiation
type (type_dependency_id) :: id_dz ! Cell thickness type (type_dependency_id) :: id_dz ! Cell thickness
......
...@@ -77,14 +77,14 @@ module gotm_npzd ...@@ -77,14 +77,14 @@ module gotm_npzd
type, extends(type_base_model), public :: type_gotm_npzd type, extends(type_base_model), public :: type_gotm_npzd
! Variable identifiers ! Variable identifiers
type (type_state_variable_id) :: id_n,id_p,id_z,id_d type (type_state_variable_id) :: id_n, id_p, id_z, id_d
type (type_state_variable_id) :: id_dic type (type_state_variable_id) :: id_dic
type (type_dependency_id) :: id_par type (type_dependency_id) :: id_par
type (type_surface_dependency_id) :: id_I_0 type (type_surface_dependency_id) :: id_I_0
type (type_diagnostic_variable_id) :: id_GPP,id_NCP,id_PPR,id_NPR,id_dPAR type (type_diagnostic_variable_id) :: id_PPR, id_NPR, id_dPAR
! Model parameters ! Model parameters
real(rk) :: p0,z0,kc,i_min,rmax,gmax,iv,alpha,rpn,rzn,rdn,rpdu,rpdl,rzd real(rk) :: p0, z0, kc, i_min, rmax, gmax, iv, alpha, rpn, rzn, rdn, rpdu, rpdl, rzd
real(rk) :: dic_per_n real(rk) :: dic_per_n
contains contains
procedure :: initialize procedure :: initialize
...@@ -200,8 +200,6 @@ contains ...@@ -200,8 +200,6 @@ contains
! Export diagnostic variables ! Export diagnostic variables
_SET_DIAGNOSTIC_(self%id_dPAR,par) _SET_DIAGNOSTIC_(self%id_dPAR,par)
_SET_DIAGNOSTIC_(self%id_GPP ,primprod)
_SET_DIAGNOSTIC_(self%id_NCP ,primprod - self%rpn*p)
_SET_DIAGNOSTIC_(self%id_PPR ,primprod*secs_pr_day) _SET_DIAGNOSTIC_(self%id_PPR ,primprod*secs_pr_day)
_SET_DIAGNOSTIC_(self%id_NPR ,(primprod - self%rpn*p)*secs_pr_day) _SET_DIAGNOSTIC_(self%id_NPR ,(primprod - self%rpn*p)*secs_pr_day)
...@@ -261,8 +259,6 @@ contains ...@@ -261,8 +259,6 @@ contains
! Export diagnostic variables ! Export diagnostic variables
_SET_DIAGNOSTIC_(self%id_dPAR,par) _SET_DIAGNOSTIC_(self%id_dPAR,par)
_SET_DIAGNOSTIC_(self%id_GPP,primprod)
_SET_DIAGNOSTIC_(self%id_NCP,primprod-self%rpn*p)
_SET_DIAGNOSTIC_(self%id_PPR,primprod*secs_pr_day) _SET_DIAGNOSTIC_(self%id_PPR,primprod*secs_pr_day)
_SET_DIAGNOSTIC_(self%id_NPR,(primprod-self%rpn*p)*secs_pr_day) _SET_DIAGNOSTIC_(self%id_NPR,(primprod-self%rpn*p)*secs_pr_day)
......
...@@ -29,7 +29,7 @@ module fabm_pml_carbonate ...@@ -29,7 +29,7 @@ module fabm_pml_carbonate
! Variable identifiers ! Variable identifiers
type (type_state_variable_id) :: id_dic, id_alk type (type_state_variable_id) :: id_dic, id_alk
type (type_dependency_id) :: id_temp, id_salt, id_pres, id_dens type (type_dependency_id) :: id_temp, id_salt, id_pres, id_dens
type (type_horizontal_dependency_id) :: id_wind, id_pco2_surf type (type_surface_dependency_id) :: id_wind, id_pco2_surf
type (type_diagnostic_variable_id) :: id_ph, id_pco2, id_CarbA, id_Bicarb, & type (type_diagnostic_variable_id) :: id_ph, id_pco2, id_CarbA, id_Bicarb, &
id_Carb, id_Om_cal, id_Om_arg, id_alk_diag id_Carb, id_Om_cal, id_Om_arg, id_alk_diag
type (type_surface_diagnostic_variable_id) :: id_co2_flux type (type_surface_diagnostic_variable_id) :: id_co2_flux
...@@ -217,9 +217,9 @@ contains ...@@ -217,9 +217,9 @@ contains
_GET_(self%id_temp,temp) _GET_(self%id_temp,temp)
_GET_(self%id_salt,salt) _GET_(self%id_salt,salt)
_GET_(self%id_dens,dens) _GET_(self%id_dens,dens)
_GET_HORIZONTAL_(self%id_wind,wnd) _GET_SURFACE_(self%id_wind,wnd)
if (self%pCO2a==0.0_rk) then if (self%pCO2a==0.0_rk) then
_GET_HORIZONTAL_(self%id_pco2_surf,pCO2a) _GET_SURFACE_(self%id_pco2_surf,pCO2a)
else else
pCO2a = self%pCO2a pCO2a = self%pCO2a
end if end if
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
type (type_bottom_state_variable_id) :: id_fl type (type_bottom_state_variable_id) :: id_fl
type (type_dependency_id) :: id_par type (type_dependency_id) :: id_par
type (type_dependency_id) :: id_temp type (type_dependency_id) :: id_temp
type (type_horizontal_dependency_id) :: id_taub type (type_bottom_dependency_id) :: id_taub
type (type_diagnostic_variable_id) :: id_chla type (type_diagnostic_variable_id) :: id_chla
type (type_diagnostic_variable_id) :: id_GPP type (type_diagnostic_variable_id) :: id_GPP
type (type_diagnostic_variable_id) :: id_NPP type (type_diagnostic_variable_id) :: id_NPP
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
! Retrieve current (local) state variable values. ! Retrieve current (local) state variable values.
! if (self%fluff) then ! if (self%fluff) then
_GET_(self%id_c,c) _GET_(self%id_c,c)
_GET_HORIZONTAL_(self%id_taub,taub) _GET_BOTTOM_(self%id_taub,taub)
! Resuspension-sedimentation rate are computed as in GOTM-BIO ! Resuspension-sedimentation rate are computed as in GOTM-BIO
! Phytoplankton is assumed to become detritus/fluff as soon as it settles to bottom sediments, ! Phytoplankton is assumed to become detritus/fluff as soon as it settles to bottom sediments,
......
...@@ -56,12 +56,13 @@ ...@@ -56,12 +56,13 @@
private private
! !
! !PUBLIC_DERIVED_TYPES: ! !PUBLIC_DERIVED_TYPES:
type,extends(type_base_model),public :: type_selma type,extends(type_base_model),public :: type_selma
! Variable identifiers ! Variable identifiers
type (type_state_variable_id) :: id_dd,id_aa,id_nn,id_po,id_o2,id_pw,id_dic type (type_state_variable_id) :: id_dd,id_aa,id_nn,id_po,id_o2,id_pw,id_dic
type (type_bottom_state_variable_id) :: id_fl,id_pb type (type_bottom_state_variable_id) :: id_fl,id_pb
type (type_dependency_id) :: id_temp,id_salt type (type_dependency_id) :: id_temp,id_salt
type (type_horizontal_dependency_id) :: id_taub,id_wind type (type_bottom_dependency_id) :: id_taub
type (type_surface_dependency_id) :: id_wind
type (type_diagnostic_variable_id) :: id_DNP,id_NO3,id_NH4,id_PO4,id_O2_mg type (type_diagnostic_variable_id) :: id_DNP,id_NO3,id_NH4,id_PO4,id_O2_mg
type (type_bottom_diagnostic_variable_id) :: id_DNB,id_SBR,id_PBR type (type_bottom_diagnostic_variable_id) :: id_DNB,id_SBR,id_PBR
type (type_surface_diagnostic_variable_id) :: id_OFL type (type_surface_diagnostic_variable_id) :: id_OFL
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
CONTAINS contains
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -175,7 +176,7 @@ ...@@ -175,7 +176,7 @@
call self%register_dependency(self%id_wind, standard_variables%wind_speed) call self%register_dependency(self%id_wind, standard_variables%wind_speed)
call self%register_dependency(self%id_taub, standard_variables%bottom_stress) call self%register_dependency(self%id_taub, standard_variables%bottom_stress)
END subroutine initialize end subroutine initialize
!EOC !EOC
...@@ -283,10 +284,10 @@ ...@@ -283,10 +284,10 @@
_GET_(self%id_nn,nnb) _GET_(self%id_nn,nnb)
_GET_(self%id_o2,oxb) _GET_(self%id_o2,oxb)
_GET_(self%id_pw,pwb) _GET_(self%id_pw,pwb)
_GET_HORIZONTAL_(self%id_fl,fl) _GET_BOTTOM_(self%id_fl,fl)
_GET_HORIZONTAL_(self%id_pb,pb) _GET_BOTTOM_(self%id_pb,pb)
_GET_HORIZONTAL_(self%id_taub,taub) _GET_BOTTOM_(self%id_taub,taub)
_GET_(self%id_temp,temp) _GET_(self%id_temp,temp)
!increased phosphorus burial !increased phosphorus burial
...@@ -438,7 +439,7 @@ ...@@ -438,7 +439,7 @@
_GET_(self%id_temp,temp) _GET_(self%id_temp,temp)
_GET_(self%id_salt,salt) _GET_(self%id_salt,salt)
_GET_HORIZONTAL_(self%id_wind,wnd) _GET_SURFACE_(self%id_wind,wnd)
_GET_(self%id_o2,o2) _GET_(self%id_o2,o2)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment