Skip to content

Commit

Permalink
Merge ufs-community#1942
Browse files Browse the repository at this point in the history
  • Loading branch information
@SamuelTrahanNOAA
SamuelTrahanNOAA committed Nov 7, 2023
2 parents b07174c + 6342303 commit 2885600
Show file tree
Hide file tree
Showing 9 changed files with 3,162 additions and 3,183 deletions.
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20231102
export BL_DATE=20231106
1,784 changes: 882 additions & 902 deletions tests/logs/RegressionTests_acorn.log
View file

Large diffs are not rendered by default.

1,436 changes: 718 additions & 718 deletions tests/logs/RegressionTests_gaea.log
View file

Large diffs are not rendered by default.

1,677 changes: 836 additions & 841 deletions tests/logs/RegressionTests_orion.log
View file

Large diffs are not rendered by default.

1,354 changes: 677 additions & 677 deletions tests/logs/RegressionTests_wcoss2.log
View file

Large diffs are not rendered by default.

56 changes: 30 additions & 26 deletions tests/parm/fd_ufs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
#-----------------------------------
#
- standard_name: Faxa_swdn
alias: mean_down_sw_flx
alias: inst_down_sw_flx
canonical_units: W m-2
description: atmosphere export - mean downward SW heat flux
#
- standard_name: Faxa_lwdn
alias: mean_down_lw_flx
alias: inst_down_lw_flx
canonical_units: W m-2
description: atmosphere export - mean downward LW heat flux
#
Expand Down Expand Up @@ -109,27 +109,27 @@
description: atmosphere export
#
- standard_name: Faxa_swnet
alias: mean_net_sw_flx
alias: inst_net_sw_flx
canonical_units: W m-2
description: atmosphere export
#
- standard_name: Faxa_swndf
alias: mean_down_sw_ir_dif_flx
alias: inst_down_sw_ir_dif_flx
canonical_units: W m-2
description: atmosphere export - mean surface downward nir diffuse flux
#
- standard_name: Faxa_swndr
alias: mean_down_sw_ir_dir_flx
alias: inst_down_sw_ir_dir_flx
canonical_units: W m-2
description: atmosphere export - mean surface downward nir direct flux
#
- standard_name: Faxa_swvdf
alias: mean_down_sw_vis_dif_flx
alias: inst_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: mean_down_sw_vis_dir_flx
alias: inst_down_sw_vis_dir_flx
canonical_units: W m-2
description: atmosphere export - mean surface downward uv+visvdirect flux
#
Expand Down Expand Up @@ -220,36 +220,40 @@
description: atmosphere export - topographic height
#
- standard_name: Faxa_taux
alias: mean_zonal_moment_flx_atm
alias: inst_zonal_moment_flx
- standard_name: Faxa_taux
alias: inst_zonal_moment_flx_atm
canonical_units: N m-2
description: atmosphere export- zonal component of momentum flux
#
- standard_name: Faxa_tauy
alias: mean_merid_moment_flx_atm
alias: inst_merid_moment_flx
- standard_name: Faxa_tauy
alias: inst_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: mean_net_lw_flx
alias: inst_net_lw_flx
description: atmosphere export - mean net longwave flux from atm
#
- standard_name: Faxa_sen
canonical_units: W m-2
alias: mean_sensi_heat_flx
alias: inst_sensi_heat_flx
description: atmosphere export - sensible heat flux
#
- standard_name : Faxa_evap
canonical_units: kg m-2 s-1
alias: mean_evap_rate
alias: inst_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: mean_laten_heat_flx
alias: inst_laten_heat_flx
canonical_units: W m-2
description: atmosphere export - latent heat flux
#
Expand Down Expand Up @@ -744,13 +748,13 @@
canonical_units: kg m-2 s-1
- standard_name: mean_prec_rate_conv
canonical_units: kg m-2 s-1
- standard_name: inst_down_lw_flx
- standard_name: mean_down_lw_flx
canonical_units: W m-2
- standard_name: inst_net_lw_flx
canonical_units: W m-2
- standard_name: inst_down_sw_flx
- standard_name: mean_down_sw_flx
canonical_units: W m-2
- standard_name: inst_net_sw_flx
- standard_name: mean_net_sw_flx
canonical_units: W m-2
- standard_name: inst_net_sw_ir_dir_flx
canonical_units: W m-2
Expand All @@ -760,19 +764,23 @@
canonical_units: W m-2
- standard_name: inst_net_sw_vis_dif_flx
canonical_units: W m-2
- standard_name: inst_down_sw_ir_dif_flx
- standard_name: mean_down_sw_ir_dif_flx
canonical_units: W m-2
- standard_name: inst_down_sw_ir_dir_flx
- standard_name: mean_down_sw_ir_dir_flx
canonical_units: W m-2
- standard_name: inst_down_sw_vis_dif_flx
- standard_name: mean_down_sw_vis_dif_flx
canonical_units: W m-2
- standard_name: inst_down_sw_vis_dir_flx
- standard_name: mean_down_sw_vis_dir_flx
canonical_units: W m-2
- standard_name: inst_surface_height
canonical_units: m
- standard_name: inst_zonal_moment_flx
- 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
canonical_units: N m-2
- standard_name: inst_merid_moment_flx
- standard_name: inst_merid_moment_flx_atm
canonical_units: N m-2
- standard_name: inst_sensi_heat_flx
canonical_units: N m-2
Expand Down Expand Up @@ -843,10 +851,6 @@
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
Expand Down
12 changes: 6 additions & 6 deletions tests/parm/ufs.configure.hafs_atm_ocn.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ ocn_export_fields::
::

ocn_import_fields::
'taux10' 'mean_zonal_moment_flx_atm' 'N_m-2'
'tauy10' 'mean_merid_moment_flx_atm' 'N_m-2'
'taux10' 'inst_zonal_moment_flx_atm' 'N_m-2'
'tauy10' 'inst_merid_moment_flx_atm' 'N_m-2'
'prcp' 'inst_prec_rate' 'kg_m-2_s-1'
'swflxd' 'mean_net_sw_flx' 'W_m-2'
'lwflxd' 'mean_net_lw_flx' 'W_m-2'
'swflxd' 'inst_net_sw_flx' 'W_m-2'
'lwflxd' 'inst_net_lw_flx' 'W_m-2'
'mslprs' 'inst_pres_height_surface' 'Pa'
'sensflx' 'mean_sensi_heat_flx' 'W_m-2'
'latflx' 'mean_laten_heat_flx' 'W_m-2'
'sensflx' 'inst_sensi_heat_flx' 'W_m-2'
'latflx' 'inst_laten_heat_flx' 'W_m-2'
::
12 changes: 6 additions & 6 deletions tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@ ocn_export_fields::
::

ocn_import_fields::
'taux10' 'mean_zonal_moment_flx_atm' 'N_m-2'
'tauy10' 'mean_merid_moment_flx_atm' 'N_m-2'
'taux10' 'inst_zonal_moment_flx_atm' 'N_m-2'
'tauy10' 'inst_merid_moment_flx_atm' 'N_m-2'
'prcp' 'inst_prec_rate' 'kg_m-2_s-1'
'swflxd' 'mean_net_sw_flx' 'W_m-2'
'lwflxd' 'mean_net_lw_flx' 'W_m-2'
'swflxd' 'inst_net_sw_flx' 'W_m-2'
'lwflxd' 'inst_net_lw_flx' 'W_m-2'
'mslprs' 'inst_pres_height_surface' 'Pa'
'sensflx' 'mean_sensi_heat_flx' 'W_m-2'
'latflx' 'mean_laten_heat_flx' 'W_m-2'
'sensflx' 'inst_sensi_heat_flx' 'W_m-2'
'latflx' 'inst_laten_heat_flx' 'W_m-2'
::
12 changes: 6 additions & 6 deletions tests/parm/ufs.configure.hafs_atm_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ ocn_export_fields::
::

ocn_import_fields::
'taux10' 'mean_zonal_moment_flx_atm' 'N_m-2'
'tauy10' 'mean_merid_moment_flx_atm' 'N_m-2'
'taux10' 'inst_zonal_moment_flx_atm' 'N_m-2'
'tauy10' 'inst_merid_moment_flx_atm' 'N_m-2'
'prcp' 'inst_prec_rate' 'kg_m-2_s-1'
'swflxd' 'mean_net_sw_flx' 'W_m-2'
'lwflxd' 'mean_net_lw_flx' 'W_m-2'
'swflxd' 'inst_net_sw_flx' 'W_m-2'
'lwflxd' 'inst_net_lw_flx' 'W_m-2'
'mslprs' 'inst_pres_height_surface' 'Pa'
'sensflx' 'mean_sensi_heat_flx' 'W_m-2'
'latflx' 'mean_laten_heat_flx' 'W_m-2'
'sensflx' 'inst_sensi_heat_flx' 'W_m-2'
'latflx' 'inst_laten_heat_flx' 'W_m-2'
::

0 comments on commit 2885600

Please sign in to comment.