-
Notifications
You must be signed in to change notification settings - Fork 65
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.
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
Passing shelf_sfc_mass_flux to ice shelf #818
base: dev/gfdl
Are you sure you want to change the base?
Changes from 10 commits
938daa4
7124693
bb8d015
0960ee8
f876e0e
5ffc687
8db4c6e
f12080a
d52fd45
bcd49f5
cce849d
390cae4
490feb6
42bd12c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1962,9 +1962,6 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, Time_init, | |
'ice shelf thickness', 'm', conversion=US%Z_to_m) | ||
CS%id_dhdt_shelf = register_diag_field('ice_shelf_model', 'dhdt_shelf', CS%diag%axesT1, CS%Time, & | ||
'change in ice shelf thickness over time', 'm s-1', conversion=US%Z_to_m*US%s_to_T) | ||
CS%id_mass_flux = register_diag_field('ice_shelf_model', 'mass_flux', CS%diag%axesT1,& | ||
CS%Time, 'Total mass flux of freshwater across the ice-ocean interface.', & | ||
'kg/s', conversion=US%RZ_T_to_kg_m2s*US%L_to_m**2) | ||
|
||
if (CS%const_gamma) then ! use ISOMIP+ eq. with rho_fw = 1000. kg m-3 | ||
meltrate_conversion = 86400.0*365.0*US%Z_to_m*US%s_to_T / (1000.0*US%kg_m3_to_R) | ||
|
@@ -1998,11 +1995,12 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, Time_init, | |
if (CS%active_shelf_dynamics) then | ||
CS%id_h_mask = register_diag_field('ice_shelf_model', 'h_mask', CS%diag%axesT1, CS%Time, & | ||
'ice shelf thickness mask', 'none', conversion=1.0) | ||
CS%id_shelf_sfc_mass_flux = register_diag_field('ice_shelf_model', 'sfc_mass_flux', CS%diag%axesT1, CS%Time, & | ||
'ice shelf surface mass flux deposition from atmosphere', & | ||
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s) | ||
endif | ||
|
||
CS%id_shelf_sfc_mass_flux = register_diag_field('ice_shelf_model', 'sfc_mass_flux', CS%diag%axesT1, CS%Time, & | ||
'ice shelf surface mass flux deposition from atmosphere', & | ||
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s) | ||
|
||
! Scalars (area integrated over all ice sheets) | ||
CS%id_vaf = register_scalar_field('ice_shelf_model', 'int_vaf', CS%diag%axesT1, CS%Time, & | ||
'Area integrated ice sheet volume above floatation', 'm3', conversion=US%Z_to_m*US%L_to_m**2) | ||
|
@@ -2178,7 +2176,12 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, Time_init, | |
|
||
call MOM_IS_diag_mediator_close_registration(CS%diag) | ||
|
||
if (present(fluxes_in)) call initialize_ice_shelf_fluxes(CS, ocn_grid, US, fluxes_in) | ||
if (present(fluxes_in)) then | ||
call initialize_ice_shelf_fluxes(CS, ocn_grid, US, fluxes_in) | ||
call register_restart_field(fluxes_in%shelf_sfc_mass_flux, "sfc_mass_flux", .true., CS%restart_CSp, & | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This restart registration is occurring after the call to |
||
"ice shelf surface mass flux deposition from atmosphere", & | ||
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s) | ||
endif | ||
if (present(forces_in)) call initialize_ice_shelf_forces(CS, ocn_grid, US, forces_in) | ||
|
||
end subroutine initialize_ice_shelf | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was the removal of the
CS%id_mass_flux = register_diag_field()
call intentional? If so, the correspondingpost_data(CS%id_mass_flux, ...)
call on line 849 should also be removed, and a comment explaining why should be added to the description of the commit.