From f4cbc079d41d4c7933fec39c0f03ba8db2d14f9c Mon Sep 17 00:00:00 2001 From: Ufuk Turuncoglu Date: Tue, 9 Jan 2024 14:44:41 -0600 Subject: [PATCH] rename exchange fields to follow inst convention --- atmos_model.F90 | 12 ++++++------ cpl/module_cplfields.F90 | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index d3213e751..7e19fee3d 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -2371,7 +2371,7 @@ subroutine assign_importdata(jdat, rc) ! get latent heat flux: over land (if cpllnd=true and cpllnd2atm=true) !------------------------------------------------ - fldname = 'mean_laten_heat_flx_lnd' + fldname = 'inst_laten_heat_flx_lnd' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex) .and. GFS_control%cpllnd .and. GFS_control%cpllnd2atm) then @@ -2391,7 +2391,7 @@ subroutine assign_importdata(jdat, rc) ! get sensible heat flux: over land (if cpllnd=true and cpllnd2atm=true) !-------------------------------------------------- - fldname = 'mean_sensi_heat_flx_lnd' + fldname = 'inst_sensi_heat_flx_lnd' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex) .and. GFS_control%cpllnd .and. GFS_control%cpllnd2atm) then @@ -2411,7 +2411,7 @@ subroutine assign_importdata(jdat, rc) ! get surface upward potential latent heat flux: over land (if cpllnd=true and cpllnd2atm=true) !------------------------------------------------ - fldname = 'mean_potential_laten_heat_flx_lnd' + fldname = 'inst_potential_laten_heat_flx_lnd' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex) .and. GFS_control%cpllnd .and. GFS_control%cpllnd2atm) then @@ -2491,7 +2491,7 @@ subroutine assign_importdata(jdat, rc) ! get upward heat flux in soil (if cpllnd=true and cpllnd2atm=true) !------------------------------------------------ - fldname = 'mean_upward_heat_flux_lnd' + fldname = 'inst_upward_heat_flux_lnd' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex) .and. GFS_control%cpllnd .and. GFS_control%cpllnd2atm) then @@ -2511,7 +2511,7 @@ subroutine assign_importdata(jdat, rc) ! get surface runoff in soil (if cpllnd=true and cpllnd2atm=true) !------------------------------------------------ - fldname = 'mean_runoff_rate_lnd' + fldname = 'inst_runoff_rate_lnd' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex) .and. GFS_control%cpllnd .and. GFS_control%cpllnd2atm) then @@ -2531,7 +2531,7 @@ subroutine assign_importdata(jdat, rc) ! get subsurface runoff in soil (if cpllnd=true and cpllnd2atm=true) !------------------------------------------------ - fldname = 'mean_subsurface_runoff_rate_lnd' + fldname = 'inst_subsurface_runoff_rate_lnd' if (trim(impfield_name) == trim(fldname)) then findex = queryImportFields(fldname) if (importFieldsValid(findex) .and. GFS_control%cpllnd .and. GFS_control%cpllnd2atm) then diff --git a/cpl/module_cplfields.F90 b/cpl/module_cplfields.F90 index 7aec1179b..58f31236f 100644 --- a/cpl/module_cplfields.F90 +++ b/cpl/module_cplfields.F90 @@ -191,14 +191,14 @@ module module_cplfields FieldInfo("land_fraction ", "s"), & FieldInfo("inst_snow_area_fraction_lnd ", "s"), & FieldInfo("inst_spec_humid_lnd ", "s"), & - FieldInfo("mean_laten_heat_flx_lnd ", "s"), & - FieldInfo("mean_sensi_heat_flx_lnd ", "s"), & - FieldInfo("mean_potential_laten_heat_flx_lnd ", "s"), & + FieldInfo("inst_laten_heat_flx_lnd ", "s"), & + FieldInfo("inst_sensi_heat_flx_lnd ", "s"), & + FieldInfo("inst_potential_laten_heat_flx_lnd ", "s"), & FieldInfo("inst_temp_height2m_lnd ", "s"), & FieldInfo("inst_spec_humid_height2m_lnd ", "s"), & - FieldInfo("mean_upward_heat_flux_lnd ", "s"), & - FieldInfo("mean_runoff_rate_lnd ", "s"), & - FieldInfo("mean_subsurface_runoff_rate_lnd ", "s"), & + FieldInfo("inst_upward_heat_flux_lnd ", "s"), & + FieldInfo("inst_runoff_rate_lnd ", "s"), & + FieldInfo("inst_subsurface_runoff_rate_lnd ", "s"), & FieldInfo("inst_drag_wind_speed_for_momentum ", "s"), & FieldInfo("inst_drag_mass_flux_for_heat_and_moisture", "s"), & FieldInfo("inst_func_of_roughness_length_and_vfrac ", "s"), &