diff --git a/atmos_model.F90 b/atmos_model.F90 index e2e776030..25cc61a88 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -2015,7 +2015,7 @@ subroutine assign_importdata(jdat, rc) ! get upward LW flux: for sea ice covered area !---------------------------------------------- - fldname = 'mean_up_lw_flx_ice' + fldname = 'lwup_flx_ice' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2042,7 +2042,7 @@ subroutine assign_importdata(jdat, rc) ! get latent heat flux: for sea ice covered area !------------------------------------------------ - fldname = 'mean_laten_heat_flx_atm_into_ice' + fldname = 'laten_heat_flx_atm_into_ice' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2062,7 +2062,7 @@ subroutine assign_importdata(jdat, rc) ! get sensible heat flux: for sea ice covered area !-------------------------------------------------- - fldname = 'mean_sensi_heat_flx_atm_into_ice' + fldname = 'sensi_heat_flx_atm_into_ice' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2122,7 +2122,7 @@ subroutine assign_importdata(jdat, rc) ! get sea ice volume: for sea ice covered area !---------------------------------------------- - fldname = 'mean_ice_volume' + fldname = 'sea_ice_volume' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2143,7 +2143,7 @@ subroutine assign_importdata(jdat, rc) ! get snow volume: for sea ice covered area !------------------------------------------- - fldname = 'mean_snow_volume' + fldname = 'snow_volume_on_sea_ice' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2251,7 +2251,7 @@ subroutine assign_importdata(jdat, rc) ! get upward LW flux: for open ocean !---------------------------------------------- - fldname = 'mean_up_lw_flx_ocn' + fldname = 'lwup_flx_ocn' if (trim(impfield_name) == trim(fldname) .and. GFS_control%use_med_flux) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2271,7 +2271,7 @@ subroutine assign_importdata(jdat, rc) ! get latent heat flux: for open ocean !------------------------------------------------ - fldname = 'mean_laten_heat_flx_atm_into_ocn' + fldname = 'laten_heat_flx_atm_into_ocn' if (trim(impfield_name) == trim(fldname) .and. GFS_control%use_med_flux) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2291,7 +2291,7 @@ subroutine assign_importdata(jdat, rc) ! get sensible heat flux: for open ocean !-------------------------------------------------- - fldname = 'mean_sensi_heat_flx_atm_into_ocn' + fldname = 'sensi_heat_flx_atm_into_ocn' if (trim(impfield_name) == trim(fldname) .and. GFS_control%use_med_flux) then findex = queryImportFields(fldname) if (importFieldsValid(findex)) then @@ -2936,6 +2936,15 @@ subroutine setup_exportdata(rc) ! Instantaneous Evap flux (kg/m**2/s) case ('inst_evap_rate') call block_data_copy(datar82d, GFS_data(nb)%coupling%dqsfci_cpl, Atm_block, nb, -revap, spval, rc=localrc) + ! Instantaneous precipitation rate (kg/m2/s) + case ('inst_prec_rate') + call block_data_copy(datar82d, GFS_data(nb)%coupling%rain_cpl, Atm_block, nb, rtimek, spval, rc=localrc) + ! Instantaneous convective precipitation rate (kg/m2/s) + case ('inst_prec_rate_conv') + call block_data_copy(datar82d, GFS_Data(nb)%Coupling%rainc_cpl, Atm_block, nb, rtimek, spval, rc=localrc) + ! Instaneous snow precipitation rate (kg/m2/s) + case ('inst_fprec_rate') + call block_data_copy(datar82d, GFS_data(nb)%coupling%snow_cpl, Atm_block, nb, rtimek, spval, rc=localrc) ! Instantaneous Downward long wave radiation flux (W/m**2) case ('inst_down_lw_flx') call block_data_copy(datar82d, GFS_data(nb)%coupling%dlwsfci_cpl, Atm_block, nb, rc=localrc) @@ -3042,15 +3051,6 @@ subroutine setup_exportdata(rc) ! MEAN NET sfc uv+vis diffused flux (W/m**2) case ('mean_net_sw_vis_dif_flx') call block_data_copy(datar82d, GFS_data(nb)%coupling%nvisdf_cpl, Atm_block, nb, rtime, spval, rc=localrc) - ! MEAN precipitation rate (kg/m2/s) - case ('mean_prec_rate') - call block_data_copy(datar82d, GFS_data(nb)%coupling%rain_cpl, Atm_block, nb, rtimek, spval, rc=localrc) - ! MEAN convective precipitation rate (kg/m2/s) - case ('mean_prec_rate_conv') - call block_data_copy(datar82d, GFS_Data(nb)%Coupling%rainc_cpl, Atm_block, nb, rtimek, spval, rc=localrc) - ! MEAN snow precipitation rate (kg/m2/s) - case ('mean_fprec_rate') - call block_data_copy(datar82d, GFS_data(nb)%coupling%snow_cpl, Atm_block, nb, rtimek, spval, rc=localrc) ! oceanfrac used by atm to calculate fluxes case ('openwater_frac_in_atm') call block_data_combine_fractions(datar82d, GFS_data(nb)%sfcprop%oceanfrac, GFS_Data(nb)%sfcprop%fice, Atm_block, nb, rc=localrc) diff --git a/cpl/module_cplfields.F90 b/cpl/module_cplfields.F90 index 884a3bdeb..83d62ee30 100644 --- a/cpl/module_cplfields.F90 +++ b/cpl/module_cplfields.F90 @@ -64,7 +64,7 @@ module module_cplfields FieldInfo("mean_evap_rate ", "s"), & FieldInfo("mean_down_lw_flx ", "s"), & FieldInfo("mean_down_sw_flx ", "s"), & - FieldInfo("mean_prec_rate ", "s"), & + FieldInfo("inst_prec_rate ", "s"), & FieldInfo("inst_zonal_moment_flx ", "s"), & FieldInfo("inst_merid_moment_flx ", "s"), & FieldInfo("inst_sensi_heat_flx ", "s"), & @@ -106,7 +106,7 @@ module module_cplfields FieldInfo("inst_merid_wind_height_lowest ", "s"), & FieldInfo("inst_pres_height_lowest ", "s"), & FieldInfo("inst_height_lowest ", "s"), & - FieldInfo("mean_fprec_rate ", "s"), & + FieldInfo("inst_fprec_rate ", "s"), & FieldInfo("openwater_frac_in_atm ", "s"), & FieldInfo("ice_fraction_in_atm ", "s"), & FieldInfo("lake_fraction ", "s"), & @@ -122,7 +122,7 @@ module module_cplfields FieldInfo("inst_merid_wind_height_lowest_from_phys ", "s"), & FieldInfo("inst_pres_height_lowest_from_phys ", "s"), & FieldInfo("inst_spec_humid_height_lowest_from_phys ", "s"), & - FieldInfo("mean_prec_rate_conv ", "s"), & + FieldInfo("inst_prec_rate_conv ", "s"), & FieldInfo("inst_temp_height_lowest_from_phys ", "s"), & FieldInfo("inst_exner_function_height_lowest ", "s"), & FieldInfo("surface_friction_velocity ", "s"), & @@ -168,13 +168,13 @@ module module_cplfields FieldInfo("sea_ice_surface_temperature ", "s"), & FieldInfo("sea_surface_temperature ", "s"), & FieldInfo("ice_fraction ", "s"), & - FieldInfo("mean_up_lw_flx_ice ", "s"), & - FieldInfo("mean_laten_heat_flx_atm_into_ice ", "s"), & - FieldInfo("mean_sensi_heat_flx_atm_into_ice ", "s"), & + FieldInfo("lwup_flx_ice ", "s"), & + FieldInfo("laten_heat_flx_atm_into_ice ", "s"), & + FieldInfo("sensi_heat_flx_atm_into_ice ", "s"), & FieldInfo("stress_on_air_ice_zonal ", "s"), & FieldInfo("stress_on_air_ice_merid ", "s"), & - FieldInfo("mean_ice_volume ", "s"), & - FieldInfo("mean_snow_volume ", "s"), & + FieldInfo("sea_ice_volume ", "s"), & + FieldInfo("snow_volume_on_sea_ice ", "s"), & FieldInfo("inst_ice_ir_dif_albedo ", "s"), & FieldInfo("inst_ice_ir_dir_albedo ", "s"), & FieldInfo("inst_ice_vis_dif_albedo ", "s"), & @@ -185,9 +185,9 @@ module module_cplfields ! For receiving fluxes from mediator FieldInfo("stress_on_air_ocn_zonal ", "s"), & FieldInfo("stress_on_air_ocn_merid ", "s"), & - FieldInfo("mean_laten_heat_flx_atm_into_ocn ", "s"), & - FieldInfo("mean_sensi_heat_flx_atm_into_ocn ", "s"), & - FieldInfo("mean_up_lw_flx_ocn ", "s"), & + FieldInfo("laten_heat_flx_atm_into_ocn ", "s"), & + FieldInfo("sensi_heat_flx_atm_into_ocn ", "s"), & + FieldInfo("lwup_flx_ocn ", "s"), & ! For JEDI ! dynamics