Skip to content

UFS-dev PR#118 #109

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

Merged
grantfirl merged 7 commits into from
Feb 2, 2024
Merged

UFS-dev PR#118 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a13a239
mean to inst field names, part I (#704)
DeniseWorthen Oct 10, 2023
eadb52f
bug fixed for mraerosol (#700)
AnningCheng-NOAA Oct 17, 2023
1a5ad28
allow cpllnd to use inst lw and sw down (#711)
DeniseWorthen Oct 20, 2023
6209b19
Merge commit '1a5ad2' into ufs-dev-PR118
grantfirl Dec 3, 2023
2120975
Merge branch 'main' into ufs-dev-PR118
grantfirl Jan 30, 2024
8166c87
update .gitmodules for testing
grantfirl Jan 30, 2024
9cb29c8
update ccpp/physics and revert .gitmodules
grantfirl Feb 2, 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
34 changes: 17 additions & 17 deletions atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading