Skip to content

Commit

Permalink
Merge branch 'jonbob/cpl/fix-bgc-oi-budget' (PR #5115)
Browse files Browse the repository at this point in the history 
Fix issue in debug mode when ocn-ice field indices are zero

Adds local logical flags to wrap the inclusion of ocn-ice BGC fields in
the carbon budget, since they are not always defined and can have
indices set to zero.

Fixes #5114

[BFB]
  • Loading branch information
@jonbob
jonbob committed Aug 10, 2022
2 parents 6417d3d + c26bee2 commit 3c9f1c5
Showing 1 changed file with 60 additions and 42 deletions.
102 changes: 60 additions & 42 deletions driver-mct/main/seq_diagBGC_mct.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ subroutine seq_diagBGC_ocn_mct( ocn, xao_o, frac_o, infodata, do_o2x, do_x2o, do
integer(in) :: lSize ! size of aVect
real(r8) :: ca_i,ca_o ! area of a grid cell
logical,save :: first_time=.true. ! initialization flag
logical,save :: flds_c_oi=.false.

!----- formats -----
character(*),parameter :: subName = '(seq_diagBGC_ocn_mct) '
Expand Down Expand Up @@ -874,14 +875,17 @@ subroutine seq_diagBGC_ocn_mct( ocn, xao_o, frac_o, infodata, do_o2x, do_x2o, do
index_x2o_Faxa_ocphidry = mct_aVect_indexRA(x2o_o,'Faxa_ocphidry')
index_x2o_Faxa_ocphodry = mct_aVect_indexRA(x2o_o,'Faxa_ocphodry')
index_x2o_Faxa_ocphiwet = mct_aVect_indexRA(x2o_o,'Faxa_ocphiwet')
index_x2o_Fioi_algae1 = mct_aVect_indexRA(x2o_o,'Fioi_algae1',perrWith='quiet')
index_x2o_Fioi_algae2 = mct_aVect_indexRA(x2o_o,'Fioi_algae2',perrWith='quiet')
index_x2o_Fioi_algae3 = mct_aVect_indexRA(x2o_o,'Fioi_algae3',perrWith='quiet')
index_x2o_Fioi_dic1 = mct_aVect_indexRA(x2o_o,'Fioi_dic1',perrWith='quiet')
index_x2o_Fioi_docr = mct_aVect_indexRA(x2o_o,'Fioi_docr',perrWith='quiet')
index_x2o_Fioi_doc1 = mct_aVect_indexRA(x2o_o,'Fioi_doc1',perrWith='quiet')
index_x2o_Fioi_doc2 = mct_aVect_indexRA(x2o_o,'Fioi_doc2',perrWith='quiet')
index_x2o_Fioi_doc3 = mct_aVect_indexRA(x2o_o,'Fioi_doc3',perrWith='quiet')
if ( index_x2o_Fioi_algae1 /= 0 ) flds_c_oi = .true.
if ( flds_c_oi ) then
index_x2o_Fioi_algae1 = mct_aVect_indexRA(x2o_o,'Fioi_algae1')
index_x2o_Fioi_algae2 = mct_aVect_indexRA(x2o_o,'Fioi_algae2')
index_x2o_Fioi_algae3 = mct_aVect_indexRA(x2o_o,'Fioi_algae3')
index_x2o_Fioi_dic1 = mct_aVect_indexRA(x2o_o,'Fioi_dic1')
index_x2o_Fioi_docr = mct_aVect_indexRA(x2o_o,'Fioi_docr')
index_x2o_Fioi_doc1 = mct_aVect_indexRA(x2o_o,'Fioi_doc1')
index_x2o_Fioi_doc2 = mct_aVect_indexRA(x2o_o,'Fioi_doc2')
index_x2o_Fioi_doc3 = mct_aVect_indexRA(x2o_o,'Fioi_doc3')
end if
end if

lSize = mct_avect_lSize(x2o_o)
Expand All @@ -891,22 +895,28 @@ subroutine seq_diagBGC_ocn_mct( ocn, xao_o, frac_o, infodata, do_o2x, do_x2o, do
ca_i = dom_o%data%rAttr(kArea,n) * frac_o%rAttr(ki,n)
nf = f_area ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_o

nf = f_cblack; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_bcphidry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_bcphodry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_bcphiwet,n)
nf = f_corgnc; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_ocphidry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_ocphodry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_ocphiwet,n)
nf = f_ioinor; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_dic1,n) &
* shr_const_mwc * 1.0e-06_R8
nf = f_ioorgn; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ((ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_algae1,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_algae2,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_algae3,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_docr,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_doc1,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_doc2,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_doc3,n)) &
* shr_const_mwc * 1.0e-06_R8
nf = f_cblack;
budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_bcphidry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_bcphodry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_bcphiwet,n)
nf = f_corgnc;
budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_ocphidry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_ocphodry,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Faxa_ocphiwet,n)
if ( flds_c_oi ) then
nf = f_ioinor;
budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_dic1,n) &
* shr_const_mwc * 1.0e-06_R8
nf = f_ioorgn;
budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ((ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_algae1,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_algae2,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_algae3,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_docr,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_doc1,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_doc2,n) &
+ (ca_o+ca_i)*x2o_o%rAttr(index_x2o_Fioi_doc3,n)) &
* shr_const_mwc * 1.0e-06_R8
end if
end do
end if

Expand Down Expand Up @@ -948,6 +958,7 @@ subroutine seq_diagBGC_ice_mct( ice, frac_i, infodata, do_i2x, do_x2i)
integer(in) :: lSize ! size of aVect
real(r8) :: ca_i,ca_o ! area of a grid cell
logical,save :: first_time=.true. ! initialization flag
logical,save :: flds_c_oi=.false.

!----- formats -----
character(*),parameter :: subName = '(seq_diagBGC_ice_mct) '
Expand All @@ -971,14 +982,17 @@ subroutine seq_diagBGC_ice_mct( ice, frac_i, infodata, do_i2x, do_x2i)

if (present(do_i2x)) then
if (first_time) then
index_i2x_Fioi_algae1 = mct_aVect_indexRA(i2x_i,'Fioi_algae1',perrWith='quiet')
index_i2x_Fioi_algae2 = mct_aVect_indexRA(i2x_i,'Fioi_algae2',perrWith='quiet')
index_i2x_Fioi_algae3 = mct_aVect_indexRA(i2x_i,'Fioi_algae3',perrWith='quiet')
index_i2x_Fioi_dic1 = mct_aVect_indexRA(i2x_i,'Fioi_dic1',perrWith='quiet')
index_i2x_Fioi_docr = mct_aVect_indexRA(i2x_i,'Fioi_docr',perrWith='quiet')
index_i2x_Fioi_doc1 = mct_aVect_indexRA(i2x_i,'Fioi_doc1',perrWith='quiet')
index_i2x_Fioi_doc2 = mct_aVect_indexRA(i2x_i,'Fioi_doc2',perrWith='quiet')
index_i2x_Fioi_doc3 = mct_aVect_indexRA(i2x_i,'Fioi_doc3',perrWith='quiet')
if ( index_i2x_Fioi_algae1 /= 0 ) flds_c_oi = .true.
if ( flds_c_oi ) then
index_i2x_Fioi_algae1 = mct_aVect_indexRA(i2x_i,'Fioi_algae1')
index_i2x_Fioi_algae2 = mct_aVect_indexRA(i2x_i,'Fioi_algae2')
index_i2x_Fioi_algae3 = mct_aVect_indexRA(i2x_i,'Fioi_algae3')
index_i2x_Fioi_dic1 = mct_aVect_indexRA(i2x_i,'Fioi_dic1')
index_i2x_Fioi_docr = mct_aVect_indexRA(i2x_i,'Fioi_docr')
index_i2x_Fioi_doc1 = mct_aVect_indexRA(i2x_i,'Fioi_doc1')
index_i2x_Fioi_doc2 = mct_aVect_indexRA(i2x_i,'Fioi_doc2')
index_i2x_Fioi_doc3 = mct_aVect_indexRA(i2x_i,'Fioi_doc3')
end if
endif

lSize = mct_avect_lSize(i2x_i)
Expand All @@ -991,16 +1005,20 @@ subroutine seq_diagBGC_ice_mct( ice, frac_i, infodata, do_i2x, do_x2i)
ca_o = dom_i%data%rAttr(kArea,n) * frac_i%rAttr(ko,n)
ca_i = dom_i%data%rAttr(kArea,n) * frac_i%rAttr(ki,n)
nf = f_area ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_i
nf = f_ioinor; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - ca_i*i2x_i%rAttr(index_i2x_Fioi_dic1,n) &
* shr_const_mwc * 1.0e-06_R8
nf = f_ioorgn; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_i*i2x_i%rAttr(index_i2x_Fioi_algae1,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_algae2,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_algae3,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_docr,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_doc1,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_doc2,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_doc3,n)) &
* shr_const_mwc * 1.0e-06_R8
if ( flds_c_oi ) then
nf = f_ioinor;
budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - ca_i*i2x_i%rAttr(index_i2x_Fioi_dic1,n) &
* shr_const_mwc * 1.0e-06_R8
nf = f_ioorgn;
budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_i*i2x_i%rAttr(index_i2x_Fioi_algae1,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_algae2,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_algae3,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_docr,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_doc1,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_doc2,n) &
+ ca_i*i2x_i%rAttr(index_i2x_Fioi_doc3,n)) &
* shr_const_mwc * 1.0e-06_R8
end if
end do
end if

Expand Down

0 comments on commit 3c9f1c5

Please sign in to comment.