Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updatetemplate; Fix model slowness when using threading; Update WW3 for porting and threading issues #383

Merged
merged 36 commits into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2e7ba9e
Update pull_request_template.md
DeniseWorthen Jan 18, 2021
d74972e
Update pull_request_template.md
DeniseWorthen Jan 18, 2021
e2f9c1d
Update pull_request_template.md
DeniseWorthen Jan 18, 2021
e3b673b
Update pull_request_template.md
DeniseWorthen Jan 18, 2021
a782215
Update pull_request_template.md
DeniseWorthen Jan 18, 2021
b8e3f3f
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
2a5accd
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
1ed978b
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
7fedf3e
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
75f21e3
Merge branch 'develop' into updatetemplate
DeniseWorthen Feb 15, 2021
3c1f527
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
b5959b4
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
392e15d
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
0f8ce12
Update pull_request_template.md
DeniseWorthen Feb 15, 2021
9548cf1
Update pull_request_template.md
DeniseWorthen Feb 16, 2021
6192c23
Merge branch 'develop' into updatetemplate
DeniseWorthen Feb 16, 2021
5021aff
Merge branch 'develop' into updatetemplate
DeniseWorthen Feb 19, 2021
f260fc3
Merge branch 'develop' into updatetemplate
DeniseWorthen Feb 25, 2021
c18a8c1
Merge branch 'develop' into updatetemplate
DeniseWorthen Mar 4, 2021
9ddfd09
Update pull_request_template.md
DeniseWorthen Mar 4, 2021
c3d7e08
Merge branch 'develop' into updatetemplate; skip-ci
DeniseWorthen Mar 5, 2021
3a57650
Merge branch 'develop' into updatetemplate; skip-ci
DeniseWorthen Mar 12, 2021
8064fff
Update pull_request_template.md
DeniseWorthen Mar 12, 2021
19b5abb
Merge branch 'develop' into updatetemplate; skip-ci
DeniseWorthen Mar 14, 2021
955c6bf
update FV3
DeniseWorthen Mar 15, 2021
aa3b25b
Feature/updateww3thread (#6)
JessicaMeixner-NOAA Mar 15, 2021
464a90e
run-ci
DeniseWorthen Mar 15, 2021
d83cfc2
PASSED: hera.gnu. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 15, 2021
504f8e6
add wcoss_cray log
DeniseWorthen Mar 15, 2021
ca28796
PASSED: gaea.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 15, 2021
b28e121
PASSED: hera.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 15, 2021
e0f2c79
PASSED: jet.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 15, 2021
a86bc45
add dell_p3 log; skip-ci
DeniseWorthen Mar 15, 2021
11c0ba5
PASSED: cheyenne.gnu. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 15, 2021
37f49ca
PASSED: cheyenne.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 15, 2021
052f1b2
revert FV3 submodule
DeniseWorthen Mar 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,46 @@
# PR Checklist

- [ ] Ths 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. Please consult the ufs-weather-model [wiki](https://github.com/ufs-community/ufs-weather-model/wiki/Making-code-changes-in-the-UFS-weather-model-and-its-subcomponents) if you are unsure how to do this.
junwang-noaa marked this conversation as resolved.
Show resolved Hide resolved

- [ ] This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

- [ ] An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
are specified below.

- [ ] If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

## Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.

## Description

(Instructions: this, and all subsequent sections of text should be removed and filled in as appropriate.)
Provide a detailed description of what this PR does.
What bug does it fix, or what feature does it add?
Is a change of answers expected from this PR?
Are any library updates included in this PR (modulefiles etc.)?
Provide a detailed description of what this PR does. What bug does it fix, or what feature does it add? Is a change of answers expected from this PR? Are any library updates included in this PR (modulefiles etc.)?

### Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues should always be created before starting work on a PR branch!)
(Remember, issues must always be created before starting work on a PR branch!)
- fixes #<issue_number>
- fixes noaa-emc/fv3atm/issues/<issue_number>

## Testing

How were these changes tested?
What compilers / HPCs was it tested with?
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)
How were these changes tested? What compilers / HPCs was it tested with? Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)

- [ ] hera.intel
- [ ] hera.gnu
- [ ] orion.intel
- [ ] cheyenne.intel
- [ ] cheyenne.gnu
- [ ] gaea.intel
- [ ] jet.intel
- [ ] wcoss_cray
- [ ] wcoss_dell_p3

## Dependencies

If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)
If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs
Expand Down
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,7 @@ endif()
###############################################################################
if(WW3)
if(CMAKE_Platform)
if(${CMAKE_Platform} STREQUAL "hera.intel")
set(WW3_COMP "hera")
elseif(${CMAKE_Platform} STREQUAL "orion.intel")
set(WW3_COMP "orion")
elseif(${CMAKE_Platform} STREQUAL "cheyenne.intel")
set(WW3_COMP "cheyenne")
elseif(${CMAKE_Platform} STREQUAL "wcoss2")
if(${CMAKE_Platform} STREQUAL "wcoss2")
set(WW3_COMP "wcoss_cray")
elseif(${CMAKE_Platform} MATCHES "linux*" OR ${CMAKE_Platform} MATCHES "macosx*")
if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
Expand Down
2 changes: 1 addition & 1 deletion FV3
2 changes: 1 addition & 1 deletion WW3
Submodule WW3 updated 189 files
Loading