Skip to content

Commit

Permalink
Revert "Revert "Merge branch 'bishtgautam/lnd/fix-cnallocation-thread…
Browse files Browse the repository at this point in the history
…ing' into next (PR #1468)""

This reverts commit 2545899.
  • Loading branch information
jqyin committed Aug 17, 2017
1 parent 9ecfe60 commit edff8e7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions components/clm/src/biogeochem/CNAllocationMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3880,8 +3880,8 @@ subroutine CNAllocation3_PlantCNPAlloc (bounds , &

else ! use_nitrif_denitrif

temp_sminn_to_plant = sminn_to_plant
temp_sminp_to_plant = sminp_to_plant
temp_sminn_to_plant(bounds%begc:bounds%endc) = sminn_to_plant(bounds%begc:bounds%endc)
temp_sminp_to_plant(bounds%begc:bounds%endc) = sminp_to_plant(bounds%begc:bounds%endc)

call p2c(bounds,num_soilc,filter_soilc, &
sminn_to_npool(bounds%begp:bounds%endp), &
Expand Down Expand Up @@ -3958,8 +3958,8 @@ subroutine CNAllocation3_PlantCNPAlloc (bounds , &
.not.cnallocate_carbonnitrogen_only().and. &
.not.cnallocate_carbon_only() )then

temp_sminn_to_plant = sminn_to_plant
temp_sminp_to_plant = sminp_to_plant
temp_sminn_to_plant(bounds%begc:bounds%endc) = sminn_to_plant(bounds%begc:bounds%endc)
temp_sminp_to_plant(bounds%begc:bounds%endc) = sminp_to_plant(bounds%begc:bounds%endc)

call p2c(bounds,num_soilc,filter_soilc, &
sminn_to_npool(bounds%begp:bounds%endp), &
Expand Down Expand Up @@ -3995,7 +3995,7 @@ subroutine CNAllocation3_PlantCNPAlloc (bounds , &

if( cnallocate_carbonnitrogen_only() )then

temp_sminp_to_plant = sminp_to_plant
temp_sminp_to_plant(bounds%begc:bounds%endc) = sminp_to_plant(bounds%begc:bounds%endc)

call p2c(bounds,num_soilc,filter_soilc, &
sminp_to_ppool(bounds%begp:bounds%endp), &
Expand Down

0 comments on commit edff8e7

Please sign in to comment.