Skip to content

Sync develop->dev/ufs-weather-model: Oct 07th#817

Merged
JessicaMeixner-NOAA merged 28 commits into
NOAA-EMC:dev/ufs-weather-modelfrom
MatthewMasarik-NOAA:syncdevufs
Oct 26, 2022
Merged

Sync develop->dev/ufs-weather-model: Oct 07th#817
JessicaMeixner-NOAA merged 28 commits into
NOAA-EMC:dev/ufs-weather-modelfrom
MatthewMasarik-NOAA:syncdevufs

Conversation

@MatthewMasarik-NOAA
Copy link
Copy Markdown
Contributor

@MatthewMasarik-NOAA MatthewMasarik-NOAA commented Oct 7, 2022

Pull Request Summary

Sync dev/ufs-weather-model with develop.

Description

Sync to develop as of Oct 05th, 2022.

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
mww3_test_01/./work_PR2_UNO                     (1 files differ)
mww3_test_01/./work_PR2_UQ                     (1 files differ)
mww3_test_01/./work_PR2_UNO_MPI                     (1 files differ)
mww3_test_01/./work_PR1                     (1 files differ)
mww3_test_01/./work_PR2_UQ_MPI                     (1 files differ)
mww3_test_01/./work_PR3_UQ                     (1 files differ)
mww3_test_01/./work_PR3_UNO                     (1 files differ)
mww3_test_01/./work_PR1_MPI                     (1 files differ)
mww3_test_01/./work_PR3_UQ_MPI                     (1 files differ)
mww3_test_01/./work_PR3_UNO_MPI                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2                     (16 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR1_MPI_d2                     (21 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (16 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (12 files differ)
mww3_test_03/./work_PR2_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (12 files differ)
mww3_test_05/./work_ST6_PR1_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR3_UNO_MPI                     (2 files differ)
mww3_test_05/./work_ST6_PR2_UQ_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST1_PR2_UNO_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR1_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST6_PR1_OMP                     (2 files differ)
mww3_test_05/./work_ST1_PR1_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR2_UQ_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR3_UQ_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST1_PR3_UNO_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR2_UNO_OMP                     (2 files differ)
mww3_test_05/./work_ST1_PR3_UNO_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST6_PR3_UQ_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST6_PR3_UNO_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR1_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR2_UQ_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR2_UNO_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST6_PR3_UNO_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR2_UQ_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR3_UQ_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR2_UNO_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR2_UQ_OMP                     (2 files differ)
mww3_test_05/./work_ST1_PR3_UQ_MPI                     (2 files differ)
mww3_test_05/./work_ST1_PR2_UNO_MPI                     (2 files differ)
mww3_test_05/./work_ST6_PR3_UNO_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST6_PR2_UNO_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST1_PR1_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST1_PR2_UQ_MPI_OMPH                     (2 files differ)
mww3_test_05/./work_ST1_PR3_UQ_OMP                     (2 files differ)
mww3_test_05/./work_ST6_PR3_UQ_MPI                     (2 files differ)
mww3_test_07/./work_PR3_UQ                     (12 files differ)
ww3_ta1/./work_UPD0F_U                     (0 files differ)
ww3_tic1.4/./work_IC0IS2_1000                     (3 files differ)
ww3_tic1.4/./work_IC1IS2_1000                     (2 files differ)
ww3_tic1.4/./work_IC2IS2_IC2d                     (3 files differ)
ww3_tic1.4/./work_IC2IS2_IC2b                     (3 files differ)
ww3_tic2.3/./work_IC2IS2creep                     (1 files differ)
ww3_tic2.3/./work_IC2IS2dissip                     (1 files differ)
ww3_tic2.3/./work_IC2IS2scat                     (1 files differ)
ww3_tp1.6/./work_PR1                     (1 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (7 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.17/./work_mb                     (1 files differ)
ww3_tp2.17/./work_b                     (1 files differ)
ww3_tp2.17/./work_mc                     (1 files differ)
ww3_tp2.17/./work_a                     (1 files differ)
ww3_tp2.17/./work_c                     (1 files differ)
ww3_tp2.17/./work_ma                     (1 files differ)
ww3_tp2.17/./work_mc1                     (1 files differ)
ww3_tp2.17/./work_ma1                     (1 files differ)
ww3_tp2.2/./work_PR2_UNO                     (1 files differ)
ww3_tp2.2/./work_PR2_UQ                     (1 files differ)
ww3_tp2.2/./work_PR2_UNO_MPI                     (1 files differ)
ww3_tp2.2/./work_PR2_UQ_MPI                     (1 files differ)
ww3_tp2.2/./work_PR3_UQ                     (1 files differ)
ww3_tp2.2/./work_PR3_UNO                     (1 files differ)
ww3_tp2.2/./work_PR3_UQ_MPI                     (1 files differ)
ww3_tp2.2/./work_PR3_UNO_MPI                     (1 files differ)
ww3_tp2.21/./work_a                     (2 files differ)
ww3_tp2.21/./work_ma                     (2 files differ)
ww3_tp2.3/./work_PR3_UNO                     (5 files differ)
ww3_tp2.3/./work_PR1_MPI                     (5 files differ)
ww3_tp2.3/./work_PR3_UQ_MPI                     (5 files differ)
ww3_tp2.3/./work_PR3_UNO_MPI                     (5 files differ)
ww3_tp2.4/./work_PR2_UNO                     (1 files differ)
ww3_tp2.4/./work_PR2_UQ                     (1 files differ)
ww3_tp2.4/./work_PR1_curv                     (1 files differ)
ww3_tp2.4/./work_PR3_UNO_curv_MPI                     (1 files differ)
ww3_tp2.4/./work_PR2_UQ_curv_MPI                     (1 files differ)
ww3_tp2.4/./work_PR1_curv_MPI                     (1 files differ)
ww3_tp2.4/./work_PR2_UNO_MPI                     (1 files differ)
ww3_tp2.4/./work_PR3_UQ_curv_MPI                     (1 files differ)
ww3_tp2.4/./work_PR1                     (1 files differ)
ww3_tp2.4/./work_PR2_UQ_MPI                     (1 files differ)
ww3_tp2.4/./work_PR3_UQ                     (1 files differ)
ww3_tp2.4/./work_PR3_UNO                     (1 files differ)
ww3_tp2.4/./work_PR3_UNO_curv                     (1 files differ)
ww3_tp2.4/./work_PR1_MPI                     (1 files differ)
ww3_tp2.4/./work_PR2_UNO_curv_MPI                     (1 files differ)
ww3_tp2.4/./work_PR2_UNO_curv                     (1 files differ)
ww3_tp2.4/./work_PR3_UQ_MPI                     (1 files differ)
ww3_tp2.4/./work_PR3_UQ_curv                     (1 files differ)
ww3_tp2.4/./work_PR2_UQ_curv                     (1 files differ)
ww3_tp2.4/./work_PR3_UNO_MPI                     (1 files differ)
ww3_tp2.5/./work_PR2_UNO                     (14 files differ)
ww3_tp2.5/./work_PR2_UQ                     (14 files differ)
ww3_tp2.5/./work_REF_PR2_UNO_MPI                     (38 files differ)
ww3_tp2.5/./work_REF_PR1_MPI                     (38 files differ)
ww3_tp2.5/./work_REF_PR3_UNO                     (38 files differ)
ww3_tp2.5/./work_REF_PR1                     (38 files differ)
ww3_tp2.5/./work_PR2_UNO_MPI                     (14 files differ)
ww3_tp2.5/./work_REF_PR2_UQ                     (38 files differ)
ww3_tp2.5/./work_PR1                     (14 files differ)
ww3_tp2.5/./work_PR2_UQ_MPI                     (14 files differ)
ww3_tp2.5/./work_PR3_UQ                     (14 files differ)
ww3_tp2.5/./work_PR3_UNO                     (14 files differ)
ww3_tp2.5/./work_PR1_MPI                     (14 files differ)
ww3_tp2.5/./work_REF_PR2_UNO                     (38 files differ)
ww3_tp2.5/./work_REF_PR3_UQ                     (38 files differ)
ww3_tp2.5/./work_REF_PR3_UNO_MPI                     (38 files differ)
ww3_tp2.5/./work_REF_PR3_UQ_MPI                     (38 files differ)
ww3_tp2.5/./work_PR3_UQ_MPI                     (14 files differ)
ww3_tp2.5/./work_PR3_UNO_MPI                     (14 files differ)
ww3_tp2.5/./work_REF_PR2_UQ_MPI                     (38 files differ)
ww3_tp2.8/./work_PR3_UQ                     (7 files differ)
ww3_ts1/./work_NL5                     (3 files differ)
ww3_ufs1.3/./work_a                     (1 files differ)

Issue(s) addressed

Commit Message

sync dev/ufs-weather-model with develop
co-author: @JessicaMeixner-NOAA

Check list

(*) branch is one commit below up-to-date. This was done to allow the developer of the most recent commit to PR that work.

Testing

  • How were these changes tested?
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)?
  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):

ukmo-ccbunney and others added 27 commits August 3, 2022 10:02
Set default ENDIANNESS="native" in constants.F90
…NOAA-EMC#752)

Use the hash of the spack.yaml as part of the Github Action cache key
Cancel in-progress workflows when pushing to a branch to avoid duplicate workflow runs.
Doxygen documentation - marked source PR 3
Correct typo in ww3_ounf.nml for ww3_tp2.16 regtest
that are currently used in the cell (IJKCel) and face 
arrays (IJKUFc, IJKVFc) of the SMC propagation module.
Simplifying and correcting debugging statements
update version numbers in manual for ww3_uprstr
Co-authored-by: Mathieu Dutour Sikiric <mathieu.dutour@gmail.com>
Conflicts:
	.github/workflows/gnu.yml
	.github/workflows/intel.yml
	model/src/w3adatmd.F90
	model/src/w3initmd.F90
	model/src/w3iogomd.F90
	model/src/w3updtmd.F90
	model/src/w3wavemd.F90
Co-authored-by: Benoit Pouliot <benoit.pouliot@canada.ca>
Co-authored-by: ukmo-chris.bunney <christopher.bunney@metoffice.gov.uk>
Comment thread model/src/w3initmd.F90
J = LEN_TRIM(FNMPRE)
!

#ifndef W3_CESMCOUPLED
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please retain this #ifndef W3_CESMCOUPLED.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DeniseWorthen , this correction has been made.

@JessicaMeixner-NOAA JessicaMeixner-NOAA merged commit d1df516 into NOAA-EMC:dev/ufs-weather-model Oct 26, 2022
@MatthewMasarik-NOAA MatthewMasarik-NOAA deleted the syncdevufs branch November 1, 2022 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.