Changes to compile with nag on hobart

NordicESMhub · Dec 21, 2017 · a7e5afe · a7e5afe
1 parent d33131d
commit a7e5afe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/biogeochem/EDCohortDynamicsMod.F90 b/biogeochem/EDCohortDynamicsMod.F90
@@ -851,7 +851,7 @@ subroutine fuse_cohorts(patchptr, bc_in)
                                          nextc%n*nextc%lmort_logging)/newn
                                    currentCohort%lmort_infra          = (currentCohort%n*currentCohort%lmort_infra       + &
                                          nextc%n*nextc%lmort_infra)/newn
-                                   currentCohort%lmort_collateral          = (currentCohort%n*currentCohort%lmort_collateral       + &
+                                   currentCohort%lmort_collateral          = (currentCohort%n*currentCohort%lmort_collateral + &
                                          nextc%n*nextc%lmort_collateral)/newn
 
                                    currentCohort%fire_mort      = (currentCohort%n*currentCohort%fire_mort   + &

diff --git a/biogeochem/EDPhysiologyMod.F90 b/biogeochem/EDPhysiologyMod.F90
@@ -843,9 +843,11 @@ subroutine Growth_Derivatives( currentSite, currentCohort, bc_in)
 
     if (hlm_use_ed_prescribed_phys .eq. itrue) then
        if (currentCohort%canopy_layer .eq. 1) then
-          currentCohort%npp_acc_hold = EDPftvarcon_inst%prescribed_npp_canopy(currentCohort%pft) * currentCohort%c_area / currentCohort%n
+          currentCohort%npp_acc_hold = EDPftvarcon_inst%prescribed_npp_canopy(currentCohort%pft) &
+                                       * currentCohort%c_area / currentCohort%n
        else
-          currentCohort%npp_acc_hold = EDPftvarcon_inst%prescribed_npp_understory(currentCohort%pft) * currentCohort%c_area / currentCohort%n
+          currentCohort%npp_acc_hold = EDPftvarcon_inst%prescribed_npp_understory(currentCohort%pft) &
+                                       * currentCohort%c_area / currentCohort%n
        endif
     endif