Skip to content

Commit

Permalink
CLM Lake pressure is not density and GFS Diagnostics: weasdi is not s…
Browse files Browse the repository at this point in the history 
…nodi + ufs-community#2047, ufs-community#2053, and ufs-community#2056 (ufs-community#2044)

FV3 diagnostic fixes, CCPP fixes for model crashes, new PR template

- UFS:
    - commit message in PR template (ufs-community#2053)
    - fix hercules crashes (ufs-community#2015)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes ufs-community#2055, NOAA-EMC/CMEPS#105, NOAA-EMC/fv3atm#741) 
    - unit mismatch (NOAA-EMC/fv3atm#736)
- FV3: correct errors in diagnostic calculations
    - snodi had weasdi data in it (NOAA-EMC/fv3atm#736)
    - revisions to RUC LSM snowfall melting and accumulation (NOAA-EMC/fv3atm#739)
  • Loading branch information
@SamuelTrahanNOAA
SamuelTrahanNOAA authored Dec 21, 2023
1 parent 1d90c04 commit 991d652
Show file tree
Hide file tree
Showing 15 changed files with 16,491 additions and 18,166 deletions.
82 changes: 48 additions & 34 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,56 @@
<!-- THE FOLLOWING IS FOR THE PR AUTHOR TO FILL OUT
PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
## PR Author Checklist:
<!-- Please complete all items in list. -->
- [ ] I have linked PR's from all sub-components involved in section below. <!-- PLEASE DO NOT LINK SUBCOMPONENT ISSUES -->
- [ ] I am confirming reviews are completed in ALL sub-component PR's.
- [ ] I have run the full RT suite on either Hera/Hercules AND have attached the log to this PR below this line:
- LOG:
- [ ] I have added the list of all failed regression tests to "Anticipated changes" section.
- [ ] I have filled out all sections of the template.

## Description
<!-- INSTRUCTIONS:
- Please fill out all sections of this PR and complete the checklist below
- Please be as descriptive as possible, this is really important.
- Please "fill in" checkboxes. Use [X] for a filled in checkbox or leave it [ ] for an empty checkbox
- Please use github markup as much as possible in linking
i.e.:
* Linking to UFSWM PR's and issues add - #<pr/issue number>
* Linking to a subcomponent PR and issues add - <Group>/<Fork>/pull/<number> or - <Group>/<Fork>/issues/<number>
-->
## Commit Queue Requirements:
<!-- Please note: PRs will be scheduled in the Commit Queue in the order received and only after all
pre-requisite testing is complete and all PR requirements (e.g. Issues created and noted, Subcomponent
PRs reviewed and accepted) are met. -->
- [ ] Fill out all sections of this template.
- [ ] All sub component pull requests have been reviewed by their code managers.
- [ ] Run the full RT suite (compared to current baselines) on either Hera/Derecho/Hercules AND have committed the log to my PR branch.
- [ ] Add list of all failed regression tests in "Regression Tests" section.

## PR Information

### Description
<!-- Provide a detailed description of what this PR does in the space provided below-->

### Commit Message
<!--
Please provide the following concise information:
Description of all changes - 1 line
Please list all individual issue titles addressed with github links at the end in parenthesis (using #<number> or <group>/<fork>/issues/<number>).
-->

## Linked Issues and Pull Requests
### Associated UFSWM Issue to close
<!-- Example: "- Closes #1698" -->

### Priority
- [ ] Critical Bugfix (This PR contains a critical bug fix and should be prioritized.)
- [ ] High (This PR contains a feature or fix needed for a time-sensitive project (eg, retrospectives, implementations))
- [ ] Normal

### Subcomponent Pull Requests
<!-- format: - <community>/<repo>/pull/<PR number> i.e.: - NOAA-EMC/fv3atm/pull/33 or "None" -->
### Blocking Dependencies
<!-- If there are any PR's that are needed to be completed before this one, please add links
to them here -->

### Git Issues Fixed By This PR
<!-- Example: - Closes #1698 or - Closes NOAA-EMC/fv3atm/issues/729 -->

### Blocking Dependencies
<!-- Example: "- Depends on #1733" or "None" -->

## Changes

### Subcomponents involved:
### Subcomponent (with links)
<!-- (add links to subcomponent PR's here) -->
<!-- Example:
[X] FV3
- NOAA-EMC/fv3atm/pull/734
- NOAA-EMC/fv3atm/pull/735
-->
- [ ] AQM
- [ ] CDEPS
- [ ] CICE
Expand All @@ -41,7 +65,6 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
- [ ] stochastic_physics
- [ ] none

## Anticipated Changes
### Input data
- [ ] No changes are expected to input data.
- [ ] Changes are expected to input data:
Expand All @@ -51,9 +74,8 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
### Regression Tests:
- [ ] No changes are expected to any regression test.
- [ ] Changes are expected to the following tests:
<!-- Please insert what RT's change and why you expect them to change in the space provided below -->
<details><summary>Tests effected by changes in this PR:</summary>
<!-- ADD ITEMS HERE or add "None" -->
<details><summary>FAILED REGRESSION TESTS</summary>
<!-- List failed regression tests here or add "None" -->

</details>

Expand All @@ -64,14 +86,7 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
- [ ] Create separate issue in [JCSDA/spack-stack](https://github.com/JCSDA/spack-stack) asking for update to library. Include library name, library version.
- [ ] Add issue link from JCSDA/spack-stack following this item <!-- for example: "- JCSDA/spack-stack/issue/1757" -->


<!-- THE FOLLOWING IS FOR CODE MANAGERS ONLY DO NOT FILL OUT -->
<details><summary>Code Managers Log</summary>

- [ ] This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR.
- [ ] Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.
- [ ] N/A

<!-- STOP!!! THE FOLLOWING IS FOR CODE MANAGERS ONLY. PLEASE DO NOT FILL OUT -->
### Testing Log:
- RDHPCS
- [ ] Hera
Expand All @@ -87,5 +102,4 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
- [ ] Completed
- opnReqTest
- [ ] N/A
- [ ] Log attached to comment
</details>
- [ ] Log attached to comment
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 2 files
+4 −0 ufs/ccpp/data/MED_typedefs.F90
+6 −0 ufs/ccpp/data/MED_typedefs.meta
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 4 files
+3 −0 ccpp/data/CCPP_typedefs.F90
+6 −0 ccpp/data/CCPP_typedefs.meta
+2 −2 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
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=20231207
export BL_DATE=20231220
6 changes: 4 additions & 2 deletions tests/fv3_conf/fv3_slurm.IN_hercules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ export OMP_NUM_THREADS=@[THRD]
export ESMF_RUNTIME_PROFILE=ON
export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"

# For mvapich2
if [[ @[RT_COMPILER] == gnu ]]; then
if [[ @[RT_COMPILER] == intel ]]; then
export I_MPI_EXTRA_FILESYSTEM=ON
elif [[ @[RT_COMPILER] == gnu ]]; then
# For mvapich2
export MV2_SHMEM_COLL_NUM_COMM=128
fi

Expand Down
Loading

0 comments on commit 991d652

Please sign in to comment.