rename exchange fields to follow inst convention

NOAA-EMC · Jan 9, 2024 · f4cbc07 · f4cbc07
1 parent 2d9e08f
commit f4cbc07
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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"), &