Skip to content

Commit

Permalink
update CMEPS for refactor of esmFldsExchange_nems (#1894)
Browse files Browse the repository at this point in the history
* update CMEPS

* update CMEPS w/ fix for error condition

* turning off regional_atmaq_debug: time-out issue on cheyenne.intel

*update cmeps build to implement check4nans feature using module stored in cdeps repo

* initial sw fix branch

* make pio rearranger=box the default for all tests

* update configurations for ocnalb changes
  • Loading branch information
DeniseWorthen committed Oct 5, 2023
1 parent 41811b8 commit c2d7026
Show file tree
Hide file tree
Showing 10 changed files with 5,530 additions and 5,521 deletions.
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20231002
export BL_DATE=20231003
1,422 changes: 711 additions & 711 deletions tests/logs/RegressionTests_acorn.log

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2,030 changes: 1,015 additions & 1,015 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

1,982 changes: 991 additions & 991 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

1,280 changes: 640 additions & 640 deletions tests/logs/RegressionTests_jet.log

Large diffs are not rendered by default.

1,516 changes: 758 additions & 758 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

1,284 changes: 642 additions & 642 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

97 changes: 53 additions & 44 deletions tests/parm/fd_nems.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,24 @@
canonical_units: N m-2
description: mediator calculation
#
- standard_name: Foxx_lwnet
alias: mean_net_lw_flx
canonical_units: W m-2
description: mediator calculation - atm/ocn net longwave flux
#
- standard_name: Foxx_sen
canonical_units: W m-2
alias: mean_sensi_heat_flx
description: mediator calculation - atm/ocn surface sensible heat flux
#
- standard_name: Foxx_evap
canonical_units: kg m-2 s-1
alias: mean_evap_rate
description: mediator calculation - atm/ocn specific humidity flux
#
- standard_name: Faox_evap
canonical_units: kg m-2 s-1
description: mediator calculation - atm/ocn specific humidity flux
#-----------------------------------
# section: atmosphere export
#-----------------------------------
Expand Down Expand Up @@ -211,6 +229,21 @@
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
description: atmosphere export - mean net longwave flux from atm
#
- standard_name: Faxa_sen
canonical_units: W m-2
alias: mean_sensi_heat_flx
description: atmosphere export - sensible heat flux
#
- standard_name : Faxa_evap
canonical_units: kg m-2 s-1
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
Expand Down Expand Up @@ -583,28 +616,35 @@
# section: ocean import
#-----------------------------------
#
- standard_name: mean_runoff_rate
canonical_units: kg m-2 s-1
description: ocean import - total runoff to ocean
- standard_name: Foxx_hrain
canonical_units: W m-2
description: to ocn heat content of rain
#
- standard_name: mean_runoff_heat_flux
canonical_units: kg m-2 s-1
description: ocean import - heat content of runoff
- standard_name: Foxx_hsnow
canonical_units: W m-2
description: to ocn heat content of snow
#
- standard_name: mean_calving_rate
canonical_units: kg m-2 s-1
description: ocean import - total calving to ocean
- standard_name: Foxx_hevap
canonical_units: W m-2
description: to ocn heat content of evaporation
#
- standard_name: mean_calving_heat_flux
canonical_units: kg m-2 s-1
description: ocean import - heat content of calving
- standard_name: Foxx_hcond
canonical_units: W m-2
description: to ocn heat content of condensation
#
- standard_name: Foxx_hrofl
canonical_units: W m-2
description: to ocn heat content of liquid runoff
#
- standard_name: Foxx_hrofi
canonical_units: W m-2
description: to ocn heat content of ice runoff
#
- standard_name: Foxx_rofi
canonical_units: kg m-2 s-1
description: ocean import - water flux due to runoff (frozen)
#
- standard_name: Foxx_rofl
alias: mean_runoff_rate
canonical_units: kg m-2 s-1
description: ocean import - water flux due to runoff (liquid)
#
Expand Down Expand Up @@ -666,37 +706,6 @@
canonical_units: 1
#
#-----------------------------------
# aliased fields for active and datm
#-----------------------------------
#
- standard_name: mean_net_lw_flx
canonical_units: W m-2
- alias: Faxa_lwnet
standard_name : mean_net_lw_flx
description: atmosphere export - mean net longwave flux from atm
- alias: Foxx_lwnet
standard_name : mean_net_lw_flx
description: mediator calculation - atm/ocn net longwave flux
#
- standard_name: mean_sensi_heat_flx
canonical_units: W m-2
- alias: Faxa_sen
standard_name : mean_sensi_heat_flx
description: atmosphere export - sensible heat flux
- alias: Faox_sen
standard_name : mean_sensi_heat_flx
description: mediator calculation - atm/ocn surface sensible heat flux
#
- standard_name: mean_evap_rate
canonical_units: kg m-2 s-1
- alias: Faxa_evap
standard_name : mean_evap_rate
description: atmosphere export - latent heat flux conversion
- alias: Faox_evap
standard_name : mean_evap_rate
description: mediator calculation - atm/ocn specific humidity flux
#
#-----------------------------------
# fields to use fluxes from mediator
#-----------------------------------
#
Expand Down

0 comments on commit c2d7026

Please sign in to comment.