@@ -645,7 +645,7 @@ subroutine Allocation1_PlantNPDemand (bounds, num_soilc, filter_soilc, num_soilp
645645 mr = leaf_mr(p) + froot_mr(p)
646646 if (woody(ivt(p)) >= 1.0_r8 ) then
647647 mr = mr + livestem_mr(p) + livecroot_mr(p)
648- else if (iscft(ivt(p)) > = 1 ) then
648+ else if (iscft(ivt(p))) then
649649 if (croplive(p)) mr = mr + livestem_mr(p) + grain_mr(p)
650650 end if
651651
@@ -726,7 +726,7 @@ subroutine Allocation1_PlantNPDemand (bounds, num_soilc, filter_soilc, num_soilp
726726
727727 f5 = 0._r8 ! continued intializations from above
728728
729- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
729+ if (iscft(ivt(p))) then ! skip 2 generic crops
730730
731731 if (croplive(p)) then
732732 ! same phases appear in subroutine CropPhenology
@@ -859,7 +859,7 @@ subroutine Allocation1_PlantNPDemand (bounds, num_soilc, filter_soilc, num_soilp
859859 p_allometry(p) = 1._r8 / cpl + f1/ cpfr + (f3* f4* (1._r8 + f2))/ cplw + &
860860 (f3* (1._r8 - f4)* (1._r8 + f2))/ cpdw
861861
862- else if (iscft(ivt(p)) > = 1 ) then ! skip generic crops
862+ else if (iscft(ivt(p))) then ! skip generic crops
863863 cng = graincn(ivt(p))
864864 cpg = graincp(ivt(p))
865865 c_allometry(p) = (1._r8 + g1)* (1._r8 + f1+ f5+ f3* (1._r8 + f2))
@@ -889,10 +889,10 @@ subroutine Allocation1_PlantNPDemand (bounds, num_soilc, filter_soilc, num_soilp
889889 ! retransn pool has N from leaves, stems, and roots for
890890 ! retranslocation
891891
892- if (iscft(ivt(p)) > = 1 .and. grain_flag(p) == 1._r8 ) then
892+ if (iscft(ivt(p)) .and. grain_flag(p) == 1._r8 ) then
893893 avail_retransn(p) = plant_ndemand(p)
894894 avail_retransp(p) = plant_pdemand(p)
895- else if (iscft(ivt(p)) < 1 .and. annsum_potential_gpp(p) > 0._r8 ) then
895+ else if (( .not. iscft(ivt(p))) .and. annsum_potential_gpp(p) > 0._r8 ) then
896896 avail_retransn(p) = (annmax_retransn(p)/ 2._r8 )* (gpp(p)/ annsum_potential_gpp(p))/ dt
897897 avail_retransp(p) = (annmax_retransp(p)/ 2._r8 )* (gpp(p)/ annsum_potential_gpp(p))/ dt
898898 else
@@ -1105,14 +1105,10 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
11051105 use shr_sys_mod , only: shr_sys_flush
11061106 use elm_varctl , only: iulog,cnallocate_carbon_only,cnallocate_carbonnitrogen_only,&
11071107 cnallocate_carbonphosphorus_only
1108- ! use pftvarcon , only: iscft, declfact, bfact, aleaff, arootf, astemf
1109- ! use pftvarcon , only: arooti, fleafi, allconsl, allconss, grperc, grpnow, nsoybean
11101108 use pftvarcon , only: noveg
11111109 use pftvarcon , only: iscft, grperc, grpnow
11121110 use elm_varpar , only: nlevdecomp ! !nlevsoi,
11131111 use elm_varcon , only: nitrif_n2o_loss_frac, secspday
1114- ! use landunit_varcon , only: istsoil, istcrop
1115- ! use elm_time_manager , only: get_step_size
11161112 !
11171113 ! !ARGUMENTS:
11181114 type (bounds_type) , intent (in ) :: bounds
@@ -1393,7 +1389,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
13931389
13941390 fcur = fcur2(ivt(p))
13951391
1396- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1392+ if (iscft(ivt(p))) then ! skip 2 generic crops
13971393 if (croplive(p)) then
13981394 f1 = aroot(p) / aleaf(p)
13991395 f3 = astem(p) / aleaf(p)
@@ -1412,10 +1408,10 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
14121408 plant_n_buffer_patch(p) = plant_n_buffer_patch(p) * (1._r8 - dt/ taun)
14131409 plant_p_buffer_patch(p) = plant_p_buffer_patch(p) * (1._r8 - dt/ taun)
14141410
1415- if (iscft(ivt(p)) > = 1 .and. grain_flag(p) == 1._r8 ) then
1411+ if (iscft(ivt(p)) .and. grain_flag(p) == 1._r8 ) then
14161412 avail_retransn(p) = retransn(p)/ dt
14171413 avail_retransp(p) = retransp(p)/ dt
1418- else if (iscft(ivt(p)) < 1 .and. annsum_potential_gpp(p) > 0._r8 ) then
1414+ else if (( .not. iscft(ivt(p))) .and. annsum_potential_gpp(p) > 0._r8 ) then
14191415 avail_retransn(p) = (annmax_retransn(p)/ 2._r8 )* (gpp(p)/ annsum_potential_gpp(p))/ dt
14201416 avail_retransp(p) = (annmax_retransp(p)/ 2._r8 )* (gpp(p)/ annsum_potential_gpp(p))/ dt
14211417 else
@@ -1436,7 +1432,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
14361432 mr = leaf_mr(p) + froot_mr(p)
14371433 if (woody(ivt(p)) >= 1.0_r8 ) then
14381434 mr = mr + livestem_mr(p) + livecroot_mr(p)
1439- else if (iscft(ivt(p)) > = 1 ) then
1435+ else if (iscft(ivt(p))) then
14401436 if (croplive(p)) mr = mr + livestem_mr(p) + grain_mr(p)
14411437 end if
14421438 ! try to take mr from xsmr storage pool first
@@ -1530,7 +1526,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
15301526 p_allometry(p) = 1._r8 / cpl + f1/ cpfr + (f3* f4* (1._r8 + f2))/ cplw + &
15311527 (f3* (1._r8 - f4)* (1._r8 + f2))/ cpdw
15321528
1533- else if (iscft(ivt(p)) > = 1 ) then ! skip generic crops
1529+ else if (iscft(ivt(p))) then ! skip generic crops
15341530 cng = graincn(ivt(p))
15351531 cpg = graincp(ivt(p))
15361532 c_allometry(p) = (1._r8 + g1)* (1._r8 + f1+ f5+ f3* (1._r8 + f2))
@@ -1614,7 +1610,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
16141610 cpool_to_xsmrpool(p) = cpool_to_xsmrpool(p) + nlc * f2 * f3 * (1._r8 - f4) * fcur * (1 + g1)
16151611 cpool_to_xsmrpool(p) = cpool_to_xsmrpool(p) + nlc * f2 * f3 * (1._r8 - f4) * (1._r8 - fcur) * (1 + g1)
16161612 end if
1617- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1613+ if (iscft(ivt(p))) then ! skip 2 generic crops
16181614 cpool_to_xsmrpool(p) = cpool_to_xsmrpool(p) + nlc * f3 * f4 * fcur * (1 + g1)
16191615 cpool_to_xsmrpool(p) = cpool_to_xsmrpool(p) + nlc * f3 * f4 * (1._r8 - fcur) * (1 + g1)
16201616 cpool_to_xsmrpool(p) = cpool_to_xsmrpool(p) + nlc * f3 * (1._r8 - f4) * fcur * (1 + g1)
@@ -1645,7 +1641,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
16451641 cpool_to_deadcrootc(p) = nlc * f2 * f3 * (1._r8 - f4) * fcur
16461642 cpool_to_deadcrootc_storage(p) = nlc * f2 * f3 * (1._r8 - f4) * (1._r8 - fcur)
16471643 end if
1648- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1644+ if (iscft(ivt(p))) then ! skip 2 generic crops
16491645 cpool_to_livestemc(p) = nlc * f3 * f4 * fcur
16501646 cpool_to_livestemc_storage(p) = nlc * f3 * f4 * (1._r8 - fcur)
16511647 cpool_to_deadstemc(p) = nlc * f3 * (1._r8 - f4) * fcur
@@ -1698,7 +1694,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
16981694 npool_to_deadcrootn(p) = (nlc * f2 * f3 * (1._r8 - f4) / cndw) * fcur
16991695 npool_to_deadcrootn_storage(p) = (nlc * f2 * f3 * (1._r8 - f4) / cndw) * (1._r8 - fcur)
17001696 end if
1701- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1697+ if (iscft(ivt(p))) then ! skip 2 generic crops
17021698 cng = graincn(ivt(p))
17031699 npool_to_livestemn(p) = (nlc * f3 * f4 / cnlw) * fcur
17041700 npool_to_livestemn_storage(p) = (nlc * f3 * f4 / cnlw) * (1._r8 - fcur)
@@ -1742,7 +1738,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
17421738 ppool_to_deadcrootp(p) = (nlc * f2 * f3 * (1._r8 - f4) / cpdw)* fcur
17431739 ppool_to_deadcrootp_storage(p) = (nlc * f2 * f3 * (1._r8 - f4) / cpdw)* (1._r8 - fcur)
17441740 end if
1745- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1741+ if (iscft(ivt(p))) then ! skip 2 generic crops
17461742 cpg = graincp(ivt(p))
17471743 ppool_to_livestemp(p) = (nlc * f3 * f4 / cplw) * fcur
17481744 ppool_to_livestemp_storage(p) = (nlc * f3 * f4 / cplw) * (1._r8 - fcur)
@@ -1772,7 +1768,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
17721768 gresp_storage = gresp_storage + cpool_to_livecrootc_storage(p)
17731769 gresp_storage = gresp_storage + cpool_to_deadcrootc_storage(p)
17741770 end if
1775- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1771+ if (iscft(ivt(p))) then ! skip 2 generic crops
17761772 gresp_storage = gresp_storage + cpool_to_livestemc_storage(p)
17771773 gresp_storage = gresp_storage + cpool_to_grainc_storage(p)
17781774 end if
@@ -1820,7 +1816,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
18201816 npool_to_deadcrootn(p) = cpool_to_deadcrootc(p) / cndw
18211817 npool_to_deadcrootn_storage(p) = cpool_to_deadcrootc_storage(p) / cndw
18221818 end if
1823- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1819+ if (iscft(ivt(p))) then ! skip 2 generic crops
18241820 cng = graincn(ivt(p))
18251821 supplement_to_sminn_vr(c,1 ) = supplement_to_sminn_vr(c,1 ) + cpool_to_livestemc(p) / cnlw - npool_to_livestemn(p)
18261822 supplement_to_sminn_vr(c,1 ) = supplement_to_sminn_vr(c,1 ) + cpool_to_livestemc_storage(p) / cnlw &
@@ -1891,7 +1887,7 @@ subroutine Allocation3_PlantCNPAlloc (bounds , &
18911887 ppool_to_deadcrootp(p) = cpool_to_deadcrootc(p) / cpdw
18921888 ppool_to_deadcrootp_storage(p) = cpool_to_deadcrootc_storage(p) / cpdw
18931889 end if
1894- if (iscft(ivt(p)) > = 1 ) then ! skip 2 generic crops
1890+ if (iscft(ivt(p))) then ! skip 2 generic crops
18951891 cpg = graincp(ivt(p))
18961892 supplement_to_sminp_vr(c,1 ) = supplement_to_sminp_vr(c,1 ) + max (cpool_to_livestemc(p) / cplw &
18971893 - ppool_to_livestemp(p),0._r8 )
0 commit comments