testing on FCR

AquaticEcoDynamics · Apr 10, 2022 · b78873d · b78873d
1 parent 0a933ab
commit b78873d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/aed_carbon.F90 b/src/aed_carbon.F90
@@ -204,7 +204,6 @@ SUBROUTINE aed_define_carbon(data, namlst)
  data%simDIC = .false.
  data%simCH4 = .false.
  data%simCH4ebb = .false.
- IF (ebb_model>0) data%simCH4ebb = .true.
 
  !# Read the namelist
  read(namlst,nml=aed_carbon,iostat=status)
@@ -213,6 +212,8 @@ SUBROUTINE aed_define_carbon(data, namlst)
  STOP
  ENDIF
 
+ IF (ebb_model>0) data%simCH4ebb = .true.
+
  !# Store parameter values in modules own derived type
  ! Note: rates are provided in values per day, and
  ! are converted here to values per second.

diff --git a/src/aed_phosphorus.F90 b/src/aed_phosphorus.F90
@@ -468,8 +468,6 @@ SUBROUTINE aed_calculate_benthic_phosphorus(data,column,layer_idx)
  !ENDIF
  frp_flux = Fsed_frp
 
- print *,'frp_flux,',frp,frp_flux
-
  ! Set bottom fluxes for the pelagic (change per surface area per second)
  _FLUX_VAR_(data%id_frp) = _FLUX_VAR_(data%id_frp) + frp_flux
 

diff --git a/src/aed_phytoplankton.F90 b/src/aed_phytoplankton.F90
@@ -571,6 +571,7 @@ SUBROUTINE aed_define_phytoplankton(data, namlst)
  dtlim = zerolimitfudgefactor
  IF( extra_debug ) extra_diag = .true. ! legacy use of extra_debug
  IF ( extra_diag ) diag_level = 10
+ IF ( do_mpb==0 ) resus_link = ''
 
  ! Set module parameters
  data%min_rho = min_rho ; data%max_rho = max_rho

diff --git a/src/aed_sedflux.F90 b/src/aed_sedflux.F90
@@ -596,6 +596,7 @@ SUBROUTINE aed_initialize_benthic_sedflux(data, column, layer_idx)
 
  !zone = INT(_STATE_VAR_S_(data%id_zones)) !MH upgrade this for active zones
  sedz = _STATE_VAR_S_(data%id_zones)
+
  IF ( .NOT. in_zone_set(sedz, data%active_zones) ) RETURN
 
  zone = 0
@@ -640,6 +641,7 @@ SUBROUTINE aed_initialize_benthic_sedflux(data, column, layer_idx)
  IF ( data%id_Fsed_ch4 > 0 ) _DIAG_VAR_S_(data%id_Fsed_ch4) = Fsed_ch4
  IF ( data%id_Fsed_feii > 0 ) _DIAG_VAR_S_(data%id_Fsed_feii) = Fsed_feii
  IF ( data%id_Fsed_ch4_ebb > 0 ) _DIAG_VAR_S_(data%id_Fsed_ch4_ebb) = Fsed_ch4_ebb
+
 END SUBROUTINE aed_initialize_benthic_sedflux
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
@@ -657,7 +659,6 @@ SUBROUTINE aed_calculate_benthic_sedflux(data,column,layer_idx)
 ! INTEGER :: zone
 !
 !-------------------------------------------------------------------------------
-
  IF ( data%sed_modl .EQ. SED_CONSTANT .OR. data%sed_modl .EQ. SED_CONSTANT_2D ) &
  CALL aed_initialize_benthic_sedflux(data, column, layer_idx)