Merge branch 'master' of https://github.com/AquaticEcoDynamics/libaed2

Mitch3007 · Oct 2, 2019 · 9e5b744 · 9e5b744
2 parents 2ac4e8b + 518cab3
commit 9e5b744
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/aed2_nitrogen.F90 b/src/aed2_nitrogen.F90
@@ -252,7 +252,8 @@ SUBROUTINE aed2_define_nitrogen(data, namlst)
       ! TODO check here to see if oxy is simulated if simN2O is also on
      IF (nitrif_reactant_variable .NE. '') THEN
        print *,'          advanced nitrogen redox model linking to ',TRIM(nitrif_reactant_variable)
-       data%id_oxy = aed2_locate_variable(nitrif_reactant_variable)
+       ! this allocation is done below with other state var dependancies
+       !data%id_oxy = aed2_locate_variable(nitrif_reactant_variable)
        print *,'          ... found'
       ELSE
         PRINT *,'  ERROR advanced nitrogen redox set (simN2O) but no oxygen target variable is set'

diff --git a/src/aed2_organic_matter.F90 b/src/aed2_organic_matter.F90
@@ -935,7 +935,7 @@ SUBROUTINE aed2_calculate_benthic_organic_matter(data,column,layer_idx)
    AED_REAL :: Fsed_poc,Fsed_doc
    AED_REAL :: Fsed_pon,Fsed_don
    AED_REAL :: Fsed_pop,Fsed_dop
-   AED_REAL :: Psed_poc, Psed_pon, Psed_pop
+   AED_REAL :: Psed_poc, Psed_pon = 0., Psed_pop = 0.
    AED_REAL :: fT, fDO, fDOM
 
 !-------------------------------------------------------------------------------

diff --git a/src/aed2_phosphorus.F90 b/src/aed2_phosphorus.F90
@@ -185,14 +185,12 @@ SUBROUTINE aed2_define_phosphorus(data, namlst)
 
    ! Register external state variable dependencies (for benthic flux)
    data%ben_use_oxy = phosphorus_reactant_variable .NE. '' !This means oxygen module switched on
-   IF (data%ben_use_oxy) THEN
+   IF (data%ben_use_oxy) &
      data%id_oxy = aed2_locate_variable(phosphorus_reactant_variable)
-   ENDIF
 
    data%ben_use_aedsed = Fsed_frp_variable .NE. '' !This means aed sediment module switched on
-   IF (data%ben_use_aedsed) THEN
+   IF (data%ben_use_aedsed) &
      data%id_Fsed_frp = aed2_locate_global_sheet(Fsed_frp_variable)
-   ENDIF
 
    data%id_frpads = -1
    data%id_frpads_vvel = -1