Skip to content

Commit

Permalink
Fix for the new part of ESMCI#68, for compiling with gnu 7.2.0 and later
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekluzek
ekluzek committed May 2, 2018
1 parent d4e85df commit 3bcda57
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions src/soilbiogeochem/SoilBiogeochemDecompCascadeBGCMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ subroutine init_decompcascade_bgc(bounds, soilbiogeochem_state_inst, soilstate_i

cellsand => soilstate_inst%cellsand_col , & ! Input: [real(r8) (:,:) ] column 3D sand

cascade_step_name => decomp_cascade_con%cascade_step_name , & ! Output: [character(len=8) (:) ] name of transition
cascade_donor_pool => decomp_cascade_con%cascade_donor_pool , & ! Output: [integer (:) ] which pool is C taken from for a given decomposition step
cascade_receiver_pool => decomp_cascade_con%cascade_receiver_pool , & ! Output: [integer (:) ] which pool is C added to for a given decomposition step
floating_cn_ratio_decomp_pools => decomp_cascade_con%floating_cn_ratio_decomp_pools , & ! Output: [logical (:) ] TRUE => pool has fixed C:N ratio
Expand Down Expand Up @@ -558,71 +557,71 @@ subroutine init_decompcascade_bgc(bounds, soilbiogeochem_state_inst, soilstate_i

!---------------- list of transitions and their time-independent coefficients ---------------!
i_l1s1 = 1
cascade_step_name(i_l1s1) = 'L1S1'
decomp_cascade_con%cascade_step_name(i_l1s1) = 'L1S1'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_l1s1) = rf_l1s1
cascade_donor_pool(i_l1s1) = i_litr1
cascade_receiver_pool(i_l1s1) = i_soil1
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_l1s1) = 1.0_r8

i_l2s1 = 2
cascade_step_name(i_l2s1) = 'L2S1'
decomp_cascade_con%cascade_step_name(i_l2s1) = 'L2S1'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_l2s1) = rf_l2s1
cascade_donor_pool(i_l2s1) = i_litr2
cascade_receiver_pool(i_l2s1) = i_soil1
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_l2s1)= 1.0_r8

i_l3s2 = 3
cascade_step_name(i_l3s2) = 'L3S2'
decomp_cascade_con%cascade_step_name(i_l3s2) = 'L3S2'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_l3s2) = rf_l3s2
cascade_donor_pool(i_l3s2) = i_litr3
cascade_receiver_pool(i_l3s2) = i_soil2
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_l3s2) = 1.0_r8

i_s1s2 = 4
cascade_step_name(i_s1s2) = 'S1S2'
decomp_cascade_con%cascade_step_name(i_s1s2) = 'S1S2'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s1s2) = rf_s1s2(bounds%begc:bounds%endc,1:nlevdecomp)
cascade_donor_pool(i_s1s2) = i_soil1
cascade_receiver_pool(i_s1s2) = i_soil2
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s1s2) = f_s1s2(bounds%begc:bounds%endc,1:nlevdecomp)

i_s1s3 = 5
cascade_step_name(i_s1s3) = 'S1S3'
decomp_cascade_con%cascade_step_name(i_s1s3) = 'S1S3'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s1s3) = rf_s1s3(bounds%begc:bounds%endc,1:nlevdecomp)
cascade_donor_pool(i_s1s3) = i_soil1
cascade_receiver_pool(i_s1s3) = i_soil3
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s1s3) = f_s1s3(bounds%begc:bounds%endc,1:nlevdecomp)

i_s2s1 = 6
cascade_step_name(i_s2s1) = 'S2S1'
decomp_cascade_con%cascade_step_name(i_s2s1) = 'S2S1'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s2s1) = rf_s2s1
cascade_donor_pool(i_s2s1) = i_soil2
cascade_receiver_pool(i_s2s1) = i_soil1
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s2s1) = f_s2s1

i_s2s3 = 7
cascade_step_name(i_s2s3) = 'S2S3'
decomp_cascade_con%cascade_step_name(i_s2s3) = 'S2S3'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s2s3) = rf_s2s3
cascade_donor_pool(i_s2s3) = i_soil2
cascade_receiver_pool(i_s2s3) = i_soil3
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s2s3) = f_s2s3

i_s3s1 = 8
cascade_step_name(i_s3s1) = 'S3S1'
decomp_cascade_con%cascade_step_name(i_s3s1) = 'S3S1'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s3s1) = rf_s3s1
cascade_donor_pool(i_s3s1) = i_soil3
cascade_receiver_pool(i_s3s1) = i_soil1
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_s3s1) = 1.0_r8

if (.not. use_fates) then
i_cwdl2 = 9
cascade_step_name(i_cwdl2) = 'CWDL2'
decomp_cascade_con%cascade_step_name(i_cwdl2) = 'CWDL2'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_cwdl2) = rf_cwdl2
cascade_donor_pool(i_cwdl2) = i_cwd
cascade_receiver_pool(i_cwdl2) = i_litr2
pathfrac_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_cwdl2) = cwd_fcel

i_cwdl3 = 10
cascade_step_name(i_cwdl3) = 'CWDL3'
decomp_cascade_con%cascade_step_name(i_cwdl3) = 'CWDL3'
rf_decomp_cascade(bounds%begc:bounds%endc,1:nlevdecomp,i_cwdl3) = rf_cwdl3
cascade_donor_pool(i_cwdl3) = i_cwd
cascade_receiver_pool(i_cwdl3) = i_litr3
Expand Down

0 comments on commit 3bcda57

Please sign in to comment.