From bb99e679bda60d50bc95d5458fe6992c77fe6c3e Mon Sep 17 00:00:00 2001
From: rgknox <rgknox@gmail.com>
Date: Thu, 22 Mar 2018 15:31:36 -0700
Subject: [PATCH] bug fix on merge resolution

---
 biogeophys/FatesPlantRespPhotosynthMod.F90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biogeophys/FatesPlantRespPhotosynthMod.F90 b/biogeophys/FatesPlantRespPhotosynthMod.F90
index 6ba30b37..5aeee1f1 100644
--- a/biogeophys/FatesPlantRespPhotosynthMod.F90
+++ b/biogeophys/FatesPlantRespPhotosynthMod.F90
@@ -328,7 +328,7 @@ subroutine FatesPlantRespPhotosynthDrive (nsites, sites,bc_in,bc_out,dtime)
                            laican = 0._r8
                         else
 
-                           laican = sum(currentPatch%canopy_layertlai(1:cl-1)) 
+                           laican = sum(currentPatch%canopy_layer_tai(1:cl-1)) 
 
                         end if