Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add generic tracer budget diagnostics #82

Merged
merged 16 commits into from
Aug 22, 2024
Merged

Add generic tracer budget diagnostics #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d3d05dc
Add code for BGC budget diagnostics
andrew-c-ross Jul 16, 2024
53423c1
Updated budget code from Fan
andrew-c-ross Oct 5, 2023
fa052f5
Merge branch 'dev/cefi' into feature/o2-budget-diagnostics
andrew-c-ross Aug 2, 2024
2e386fa
Cleanup
andrew-c-ross Aug 2, 2024
e691005
Merge branch 'dev/cefi' into feature/o2-budget-diagnostics
andrew-c-ross Aug 6, 2024
ca17914
Fully eliminate use of do_diagnostic
andrew-c-ross Aug 9, 2024
3c965b7
Merge branch 'feature/o2-budget-diagnostics' of github.com:andrew-c-r…
andrew-c-ross Aug 9, 2024
a7f4139
Make alignment look nice
andrew-c-ross Aug 12, 2024
1dba0df
Undo additions to g_tracer_diag
andrew-c-ross Aug 13, 2024
ec2b004
Remove addition of vdiffuseh_impl
andrew-c-ross Aug 13, 2024
667bf01
Fix unit metadata
andrew-c-ross Aug 13, 2024
eb9bd41
Correct description in g_tracer_type
andrew-c-ross Aug 13, 2024
03bfa53
Add an attribution
andrew-c-ross Aug 21, 2024
e75d9fb
jo2 is layer integral, not concentration
andrew-c-ross Aug 21, 2024
5aba5df
Merge branch 'dev/cefi' into feature/o2-budget-diagnostics
andrew-c-ross Aug 21, 2024
9d08f4f
Merge branch 'dev/cefi' into feature/o2-budget-diagnostics
yichengt900 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions generic_tracers/cobalt_reg_diag.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,11 +1225,11 @@ subroutine cobalt_reg_diagnostics(diag_list,axes,init_time,phyto,zoo,bact,cobalt
vardesc_temp = vardesc("jfed","Dissolved Iron Change layer integral",'h','L','s','mol Fe m-2 s-1','f')
cobalt%id_jfed = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao
vardesc_temp = vardesc("jfedc","Dissolved Iron Change concentration",'h','L','s','mol Fe m-2 s-1','f')

vardesc_temp = vardesc("jfedc","Dissolved Iron Change concentration",'h','L','s','mol Fe kg-1 s-1','f')
cobalt%id_jfedc = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao

vardesc_temp = vardesc("jfe_ads","Iron adsorption layer integral",'h','L','s','mol Fe m-2 s-1','f')
cobalt%id_jfe_ads = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
Expand Down Expand Up @@ -2615,35 +2615,35 @@ subroutine cobalt_reg_diagnostics(diag_list,axes,init_time,phyto,zoo,bact,cobalt
vardesc_temp = vardesc("jalk","Alkalinity source layer integral",'h','L','s','eq m-2 s-1','f')
cobalt%id_jalk = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao
vardesc_temp = vardesc("jalkc","Alkalinity source layer concentration",'h','L','s','eq m-3 s-1','f')

vardesc_temp = vardesc("jalkc","Alkalinity source layer concentration",'h','L','s','eq kg-1 s-1','f')
cobalt%id_jalkc = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao

vardesc_temp = vardesc("jalk_plus_btm","Alkalinity source plus btm layer integral",'h','L','s','eq m-2 s-1','f')
cobalt%id_jalk_plus_btm = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("jdic","Dissolved Inorganic Carbon source layer integral",'h','L','s','mol m-2 s-1','f')
cobalt%id_jdic = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao
vardesc_temp = vardesc("jdicc","Dissolved Inorganic Carbon source concentration",'h','L','s','mol m-2 s-1','f')

vardesc_temp = vardesc("jdicc","Dissolved Inorganic Carbon source concentration",'h','L','s','mol kg-1 s-1','f')
cobalt%id_jdicc = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("jno3c","no3 source concentration",'h','L','s','mol m-2 s-1','f')
vardesc_temp = vardesc("jno3c","no3 source concentration",'h','L','s','mol kg-1 s-1','f')
cobalt%id_jno3c = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("jpo4c","po4 source concentration",'h','L','s','mol m-2 s-1','f')
vardesc_temp = vardesc("jpo4c","po4 source concentration",'h','L','s','mol kg-1 s-1','f')
cobalt%id_jpo4c = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("jsio4c","sio4 source concentration",'h','L','s','mol m-2 s-1','f')
vardesc_temp = vardesc("jsio4c","sio4 source concentration",'h','L','s','mol kg-1 s-1','f')
cobalt%id_jsio4c = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao

vardesc_temp = vardesc("jdic_plus_btm","Dissolved Inorganic Carbon source plus btm layer integral",'h','L','s','mol m-2 s-1','f')
cobalt%id_jdic_plus_btm = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
Expand All @@ -2663,15 +2663,15 @@ subroutine cobalt_reg_diagnostics(diag_list,axes,init_time,phyto,zoo,bact,cobalt
vardesc_temp = vardesc("jo2_plus_btm","O2 source plus btm layer integral",'h','L','s','mol m-2 s-1','f')
cobalt%id_jo2_plus_btm = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao
vardesc_temp = vardesc("jo2","O2 source concentration",'h','L','s','mol m-3 s-1','f')

vardesc_temp = vardesc("jo2","O2 source concentration layer integral",'h','L','s','mol m-2 s-1','f')
cobalt%id_jo2 = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("jo2c","O2 source concentration",'h','L','s','mol m-3 s-1','f')
vardesc_temp = vardesc("jo2c","O2 source concentration",'h','L','s','mol kg-1 s-1','f')
cobalt%id_jo2c = register_diag_field(package_name, vardesc_temp%name, axes(1:3),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
!liao

!==============================================================================================================
! 2016/07/05 jgj register and send temperature as a test

Expand Down
13 changes: 5 additions & 8 deletions generic_tracers/cobalt_send_diag.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,9 @@ subroutine cobalt_send_diagnostics(model_time,grid_tmask,Temp,rho_dzt,dzt,&
used = g_send_data(cobalt%id_jfed, cobalt%jfed*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao
used = g_send_data(cobalt%id_jfedc, cobalt%jfed, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao
used = g_send_data(cobalt%id_jfe_ads, cobalt%jfe_ads*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
Expand Down Expand Up @@ -1204,19 +1202,19 @@ subroutine cobalt_send_diagnostics(model_time,grid_tmask,Temp,rho_dzt,dzt,&
used = g_send_data(cobalt%id_jalk, cobalt%jalk*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao

used = g_send_data(cobalt%id_jalkc, cobalt%jalk, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao

used = g_send_data(cobalt%id_jalk_plus_btm, cobalt%jalk_plus_btm*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)

used = g_send_data(cobalt%id_jdic, cobalt%jdic*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao

used = g_send_data(cobalt%id_jdicc, cobalt%jdic, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
Expand All @@ -1232,7 +1230,6 @@ subroutine cobalt_send_diagnostics(model_time,grid_tmask,Temp,rho_dzt,dzt,&
used = g_send_data(cobalt%id_jsio4c, cobalt%jsio4, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao

used = g_send_data(cobalt%id_jdic_plus_btm, cobalt%jdic_plus_btm*rho_dzt, &
model_time, rmask = grid_tmask,&
Expand All @@ -1253,15 +1250,15 @@ subroutine cobalt_send_diagnostics(model_time,grid_tmask,Temp,rho_dzt,dzt,&
used = g_send_data(cobalt%id_jo2_plus_btm, cobalt%jo2_plus_btm*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao

used = g_send_data(cobalt%id_jo2, cobalt%jo2*rho_dzt, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)

used = g_send_data(cobalt%id_jo2c, cobalt%jo2, &
model_time, rmask = grid_tmask,&
is_in=isc, js_in=jsc, ks_in=1,ie_in=iec, je_in=jec, ke_in=nk)
!liao

!==============================================================================================================
! 2016/07/05 jgj send temperature as a test

Expand Down
16 changes: 8 additions & 8 deletions generic_tracers/cobalt_types.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ module cobalt_types
id_irr_aclm = -1, &
id_irr_aclm_z = -1, &
id_jfed = -1, &
id_jfedc = -1, & !liao
id_jfedc = -1, &
id_jprod_ndet = -1, &
id_jprod_pdet = -1, &
id_jprod_sldon = -1, &
Expand Down Expand Up @@ -1019,13 +1019,13 @@ module cobalt_types
id_irr_mix = -1, &
id_irr_aclm_inst = -1, &
id_jalk = -1, &
id_jalkc = -1, & !liao
id_jalkc = -1, &
id_jalk_plus_btm = -1, &
id_jdic = -1, &
id_jdicc = -1, & !liao
id_jno3c = -1, & !liao
id_jpo4c = -1, & !liao
id_jsio4c = -1, & !liao
id_jdicc = -1, &
id_jno3c = -1, &
id_jpo4c = -1, &
id_jsio4c = -1, &
id_jdic_plus_btm = -1, &
id_jnh4 = -1, &
id_jndet = -1, &
Expand Down Expand Up @@ -1228,8 +1228,8 @@ module cobalt_types
id_f_po4_int_100 = -1, &
id_f_sio4_int_100 = -1, &
id_jo2_plus_btm = -1, &
id_jo2 = -1, & !liao
id_jo2c = -1, & !liao
id_jo2 = -1, &
id_jo2c = -1, &
id_jalk_100 = -1, &
id_jdic_100 = -1, &
id_jdin_100 = -1, &
Expand Down
Loading
Loading