Skip to content

Commit

Permalink
brings in changes needed for FMS 2021.03 (#762)
Browse files Browse the repository at this point in the history
* updated fv3atm
* updated fv3_conf/compile_slurm.IN_gaea to use proper queue with ecflow
* updated ufs_common modulefiles to use newly installed FMS 2021.03 library
  • Loading branch information
bensonr authored Aug 25, 2021
1 parent b26a896 commit 3f3c253
Show file tree
Hide file tree
Showing 15 changed files with 5,489 additions and 5,473 deletions.
2 changes: 1 addition & 1 deletion FV3
2 changes: 1 addition & 1 deletion modulefiles/ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8_1_1
module load fms/2020.04.03
module load fms/2021.03

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_common_debug
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8_1_1-debug
module load fms/2020.04.03
module load fms/2021.03

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss_cray
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module load udreg
module load ugni

module load esmf/811
module load fms/2020.04.03
module load fms/2021.03

module swap pmi pmi/5.0.11

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss_cray_debug
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module load udreg
module load ugni

module load esmf/811-debug
module load fms/2020.04.03
module load fms/2021.03

module swap pmi pmi/5.0.11

Expand Down
536 changes: 268 additions & 268 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

1,491 changes: 752 additions & 739 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

1,500 changes: 750 additions & 750 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

598 changes: 299 additions & 299 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

1,538 changes: 769 additions & 769 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

1,448 changes: 724 additions & 724 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

1,506 changes: 753 additions & 753 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

814 changes: 407 additions & 407 deletions tests/RegressionTests_wcoss_cray.log

Large diffs are not rendered by default.

1,516 changes: 759 additions & 757 deletions tests/RegressionTests_wcoss_dell_p3.log

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions tests/fv3_conf/compile_slurm.IN_gaea
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#SBATCH -e err
#SBATCH -o out
#SBATCH --account=@[ACCNR]
#SBATCH --qos=@[QUEUE]
#SBATCH --clusters=@[PARTITION]
##SBATCH --qos=@[QUEUE]
#SBATCH --clusters=es
#SBATCH --partition=eslogin
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=8
#SBATCH --time=30
Expand Down

0 comments on commit 3f3c253

Please sign in to comment.