Revert "update FD and some nems configs"

This reverts commit 5f38b30.
ufs-community · Oct 13, 2023 · 65eddac · 65eddac
1 parent 5f38b30
commit 65eddac
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 76 deletions.
diff --git a/tests/parm/fd_nems.yaml b/tests/parm/fd_nems.yaml
@@ -72,12 +72,12 @@
      #-----------------------------------
      #
      - standard_name: Faxa_swdn
-       alias: inst_down_sw_flx
+       alias: mean_down_sw_flx
        canonical_units: W m-2
        description: atmosphere export -  mean downward SW heat flux
      #
      - standard_name: Faxa_lwdn
-       alias: inst_down_lw_flx
+       alias: mean_down_lw_flx
        canonical_units: W m-2
        description: atmosphere export - mean downward LW heat flux
      #
@@ -109,27 +109,27 @@
        description: atmosphere export
      #
      - standard_name: Faxa_swnet
-       alias: inst_net_sw_flx
+       alias: mean_net_sw_flx
        canonical_units: W m-2
        description: atmosphere export
      #
      - standard_name: Faxa_swndf
-       alias: inst_down_sw_ir_dif_flx
+       alias: mean_down_sw_ir_dif_flx
        canonical_units: W m-2
        description: atmosphere export - mean surface downward nir diffuse flux
      #
      - standard_name: Faxa_swndr
-       alias: inst_down_sw_ir_dir_flx
+       alias: mean_down_sw_ir_dir_flx
        canonical_units: W m-2
        description: atmosphere export - mean surface downward nir direct flux
      #
      - standard_name: Faxa_swvdf
-       alias: inst_down_sw_vis_dif_flx
+       alias: mean_down_sw_vis_dif_flx
        canonical_units: W m-2
        description: atmosphere export - mean surface downward uv+vis diffuse flux
      #
      - standard_name: Faxa_swvdr
-       alias: inst_down_sw_vis_dir_flx
+       alias: mean_down_sw_vis_dir_flx
        canonical_units: W m-2
        description: atmosphere export - mean surface downward uv+visvdirect flux
      #
@@ -220,40 +220,36 @@
        description: atmosphere export - topographic height
      #
      - standard_name: Faxa_taux
-       alias: inst_zonal_moment_flx
-     - standard_name: Faxa_taux
-       alias: inst_zonal_moment_flx_atm
+       alias: mean_zonal_moment_flx_atm
        canonical_units: N m-2
        description: atmosphere export- zonal component of momentum flux
      #
      - standard_name: Faxa_tauy
-       alias: inst_merid_moment_flx
-     - standard_name: Faxa_tauy
-       alias: inst_merid_moment_flx_atm
+       alias: mean_merid_moment_flx_atm
        canonical_units: N m-2
        description: atmosphere export - meridional component of momentum flux
      #
      - standard_name: Faxa_lwnet
        canonical_units: W m-2
-       alias: inst_net_lw_flx
+       alias: mean_net_lw_flx
        description: atmosphere export - mean net longwave flux from atm
      #
      - standard_name: Faxa_sen
        canonical_units: W m-2
-       alias: inst_sensi_heat_flx
+       alias: mean_sensi_heat_flx
        description: atmosphere export - sensible heat flux
      #
      - standard_name : Faxa_evap
        canonical_units: kg m-2 s-1
-       alias: inst_evap_rate
+       alias: mean_evap_rate
        description: atmosphere export - latent heat flux conversion
      #
      - standard_name: Faxx_evap
        canonical_units: kg m-2 s-1
        description: atmosphere import
      #
      - standard_name: Faxa_lat
-       alias: inst_laten_heat_flx
+       alias: mean_laten_heat_flx
        canonical_units: W m-2
        description: atmosphere export - latent heat flux
      #
@@ -748,13 +744,13 @@
        canonical_units: kg m-2 s-1
      - standard_name: mean_prec_rate_conv
        canonical_units: kg m-2 s-1
-     - standard_name: mean_down_lw_flx
+     - standard_name: inst_down_lw_flx
        canonical_units: W m-2
      - standard_name: inst_net_lw_flx
        canonical_units: W m-2
-     - standard_name: mean_down_sw_flx
+     - standard_name: inst_down_sw_flx
        canonical_units: W m-2
-     - standard_name: mean_net_sw_flx
+     - standard_name: inst_net_sw_flx
        canonical_units: W m-2
      - standard_name: inst_net_sw_ir_dir_flx
        canonical_units: W m-2
@@ -764,23 +760,19 @@
        canonical_units: W m-2
      - standard_name: inst_net_sw_vis_dif_flx
        canonical_units: W m-2
-     - standard_name: mean_down_sw_ir_dif_flx
+     - standard_name: inst_down_sw_ir_dif_flx
        canonical_units: W m-2
-     - standard_name: mean_down_sw_ir_dir_flx
+     - standard_name: inst_down_sw_ir_dir_flx
        canonical_units: W m-2
-     - standard_name: mean_down_sw_vis_dif_flx
+     - standard_name: inst_down_sw_vis_dif_flx
        canonical_units: W m-2
-     - standard_name: mean_down_sw_vis_dir_flx
+     - standard_name: inst_down_sw_vis_dir_flx
        canonical_units: W m-2
      - standard_name: inst_surface_height
        canonical_units: m
-     - standard_name: mean_zonal_moment_flx_atm
-       canonical_units: N m-2
-     - standard_name: mean_merid_moment_flx_atm
-       canonical_units: N m-2
-     - standard_name: inst_zonal_moment_flx_atm
+     - standard_name: inst_zonal_moment_flx
        canonical_units: N m-2
-     - standard_name: inst_merid_moment_flx_atm
+     - standard_name: inst_merid_moment_flx
        canonical_units: N m-2
      - standard_name: inst_sensi_heat_flx
        canonical_units: N m-2
@@ -851,6 +843,10 @@
        canonical_units: tbd
      - standard_name: inst_surface_roughness
        canonical_units: tbd
+     - standard_name: inst_zonal_moment_flx
+       canonical_units: N m-2
+     - standard_name: inst_merid_moment_flx
+       canonical_units: N m-2
      - standard_name: inst_laten_heat_flx
        canonical_units: W m-2
      - standard_name: inst_sensi_heat_flx

diff --git a/tests/parm/nems.configure.atm_lnd.IN b/tests/parm/nems.configure.atm_lnd.IN
@@ -30,8 +30,6 @@ MED_attributes::
   history_n_lnd_inst = 6
   history_option_lnd_inst = nhours
   pio_rearranger = @[pio_rearranger]
-  history_n_atm_inst = 1
-  history_option_atm_inst = nhours
 ::
 
 # ATM #

diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
@@ -127,12 +127,6 @@ MED_attributes::
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]
       ocean_albedo_limit = @[ocean_albedo_limit]
-      history_n_atm_inst = 1
-      history_option_atm_inst = nhours
-      history_n_ice_inst = 1
-      history_option_ice_inst = nhours
-      history_n_ocn_inst = 1
-      history_option_ocn_inst = nhours
 ::
 
 ALLCOMP_attributes::

diff --git a/tests/parm/nems.configure.cpld_agrid.IN b/tests/parm/nems.configure.cpld_agrid.IN
@@ -106,12 +106,6 @@ MED_attributes::
       ccpp_ini_read = false
       pio_rearranger = @[pio_rearranger]
       ocean_albedo_limit = @[ocean_albedo_limit]
-      history_n_atm_inst = 1
-      history_option_atm_inst = nhours
-      history_n_ice_inst = 1
-      history_option_ice_inst = nhours
-      history_n_ocn_inst = 1
-      history_option_ocn_inst = nhours
 ::
 
 ALLCOMP_attributes::

diff --git a/tests/parm/nems.configure.hafs_atm_docn.IN b/tests/parm/nems.configure.hafs_atm_docn.IN
@@ -29,8 +29,6 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
-  history_n_atm_inst = 1
-  history_option_atm_inst = nhours
 ::
 
 # ATM #

diff --git a/tests/parm/nems.configure.hafs_atm_ocn.IN b/tests/parm/nems.configure.hafs_atm_ocn.IN
@@ -29,10 +29,6 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
-  history_n_atm_inst = 1
-  history_option_atm_inst = nhours
-  history_n_ocn_inst = 1
-  history_option_ocn_inst = nhours
 ::
 
 # ATM #
@@ -145,12 +141,12 @@ ocn_export_fields::
 ::
 
 ocn_import_fields::
-  'taux10'      'inst_zonal_moment_flx_atm' 'N_m-2'
-  'tauy10'      'inst_merid_moment_flx_atm' 'N_m-2'
+  'taux10'      'mean_zonal_moment_flx_atm' 'N_m-2'
+  'tauy10'      'mean_merid_moment_flx_atm' 'N_m-2'
   'prcp'        'inst_prec_rate'            'kg_m-2_s-1'
-  'swflxd'      'inst_net_sw_flx'           'W_m-2'
-  'lwflxd'      'inst_net_lw_flx'           'W_m-2'
+  'swflxd'      'mean_net_sw_flx'           'W_m-2'
+  'lwflxd'      'mean_net_lw_flx'           'W_m-2'
   'mslprs'      'inst_pres_height_surface'  'Pa'
-  'sensflx'     'inst_sensi_heat_flx'       'W_m-2'
-  'latflx'      'inst_laten_heat_flx'       'W_m-2'
+  'sensflx'     'mean_sensi_heat_flx'       'W_m-2'
+  'latflx'      'mean_laten_heat_flx'       'W_m-2'
 ::
diff --git a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
@@ -30,10 +30,6 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
-  history_n_atm_inst = 1
-  history_option_atm_inst = nhours
-  history_n_ocn_inst = 1
-  history_option_ocn_inst = nhours
 ::
 
 # ATM #
@@ -159,12 +155,12 @@ ocn_export_fields::
 ::
 
 ocn_import_fields::
-  'taux10'      'inst_zonal_moment_flx_atm' 'N_m-2'
-  'tauy10'      'inst_merid_moment_flx_atm' 'N_m-2'
+  'taux10'      'mean_zonal_moment_flx_atm' 'N_m-2'
+  'tauy10'      'mean_merid_moment_flx_atm' 'N_m-2'
   'prcp'        'inst_prec_rate'            'kg_m-2_s-1'
-  'swflxd'      'inst_net_sw_flx'           'W_m-2'
-  'lwflxd'      'inst_net_lw_flx'           'W_m-2'
+  'swflxd'      'mean_net_sw_flx'           'W_m-2'
+  'lwflxd'      'mean_net_lw_flx'           'W_m-2'
   'mslprs'      'inst_pres_height_surface'  'Pa'
-  'sensflx'     'inst_sensi_heat_flx'       'W_m-2'
-  'latflx'      'inst_laten_heat_flx'       'W_m-2'
+  'sensflx'     'mean_sensi_heat_flx'       'W_m-2'
+  'latflx'      'mean_laten_heat_flx'       'W_m-2'
 ::
diff --git a/tests/parm/nems.configure.hafs_atm_wav.IN b/tests/parm/nems.configure.hafs_atm_wav.IN
@@ -29,10 +29,6 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
-  history_n_atm_inst = 1
-  history_option_atm_inst = nhours
-  history_n_ocn_inst = 1
-  history_option_ocn_inst = nhours
 ::
 
 # ATM #
@@ -121,12 +117,12 @@ ocn_export_fields::
 ::
 
 ocn_import_fields::
-  'taux10'      'inst_zonal_moment_flx_atm' 'N_m-2'
-  'tauy10'      'inst_merid_moment_flx_atm' 'N_m-2'
+  'taux10'      'mean_zonal_moment_flx_atm' 'N_m-2'
+  'tauy10'      'mean_merid_moment_flx_atm' 'N_m-2'
   'prcp'        'inst_prec_rate'            'kg_m-2_s-1'
-  'swflxd'      'inst_net_sw_flx'           'W_m-2'
-  'lwflxd'      'inst_net_lw_flx'           'W_m-2'
+  'swflxd'      'mean_net_sw_flx'           'W_m-2'
+  'lwflxd'      'mean_net_lw_flx'           'W_m-2'
   'mslprs'      'inst_pres_height_surface'  'Pa'
-  'sensflx'     'inst_sensi_heat_flx'       'W_m-2'
-  'latflx'      'inst_laten_heat_flx'       'W_m-2'
+  'sensflx'     'mean_sensi_heat_flx'       'W_m-2'
+  'latflx'      'mean_laten_heat_flx'       'W_m-2'
 ::