Skip to content

New NoahMP submodule instructions (unary operator bug fix)#1660

Merged
davegill merged 1 commit intowrf-model:release-v4.4from
davegill:noahmp_unary_op_bf
Jan 28, 2022
Merged

New NoahMP submodule instructions (unary operator bug fix)#1660
davegill merged 1 commit intowrf-model:release-v4.4from
davegill:noahmp_unary_op_bf

Conversation

@davegill
Copy link
Contributor

@davegill davegill commented Jan 28, 2022 •
edited by weiwangncar
Loading

TYPE: bug fix

KEYWORDS: unary operator, NoahMP

SOURCE: Davide Del Vento (CISL/NCAR), internal

DESCRIPTION OF CHANGES:
Problem:
Several occurrences of a * -b were caught by the Cray compiler during routine
pre-derecho testing of WRF.

Solution:
The standard requires parentheses: a * (-b).

How to get a different (probably new) NoahMP version in the WRF repository

  1. Get the WRF source code, and the right branch (let's assume develop
    is the WRF branch).
git clone https://github.com/wrf-model/WRF
cd WRF 
git checkout develop
git checkout -b new_noahmp_for_some_reason
  1. Get the NoahMP repo available and in the WRF source code. You must be in the
    top-most level of the WRF directory structure to issue this command on some OS.
git submodule update --init --recursive
  1. Get the correct NoahMP branch. Usually the NoahMP group tells us what to pick up.
    Here, let us assume it is the release-v4.4-WRF branch from NoahMP.
cd phys/noahmp
git checkout release-v4.4-WRF
cd ..
  1. Stage this modification.
git add noahmp

ISSUE:
Fixes #1659

ASSOCIATED REPOSITORY CHANGE:
NCAR/noahmp#30

LIST OF MODIFIED FILES:
modified: phys/noahmp

TESTS CONDUCTED:

  1. All non-standard syntax of above form was modified.
  2. All jenkins tests are PASS.

@davegill
New NoahMP submodule instructions for unary operator bugfix
a32cbe5 
TYPE: bug fix

KEYWORDS: unary operator, NoahMP

SOURCE: Davide del Vento (CISL/NCAR), internal

DESCRIPTION OF CHANGES:
Problem:
Several occurences of `a * -b` were caught by the Cray compiler during routine
pre-derecho testing of WRF.

Solution:
The standard requires parentheses: `a * (-b)`.

How to fix the NoahMP version:
1. Get the WRF source code, and the right branch (let's assume `develop`
is the WRF branch).
```
git clone https://github.com/wrf-model/WRF
cd WRF
git checkout develop
git checkout -b new_noahmp_for_some_reason
```
2. Get the NoahMP repo available and in the WRF source code. Must be in the
top level of the WRF directory structure to issue this command.
```
git submodule update --init --recursive
```
3. Get the correct NoahM branch. Usually the NoahMP group tells us what to pick up.
Here, let us assume it is the `release-v4.4-WRF` branch from NoahMP.
```
cd phys/noahmp
git checkout release-v4.4-WRF
cd ..
```
4. Stage this modification.
```
git add noahmp
```

ISSUE:
Fixes wrf-model#1659

ASSOCIATED REPOSITORY CHANGE:
NCAR/noahmp#30

LIST OF MODIFIED FILES:
modified:   phys/noahmp

TESTS CONDUCTED:
1. All non-standard syntax of above form was modified.
2. All jenkins tests are PASS.
@davegill davegill requested review from a team as code owners January 28, 2022 02:50
@davegill
Copy link
Contributor Author

davegill commented Jan 28, 2022

@weiwangncar @dudhia @cenlinhe @davidedelvento
Wei and Jimy,
This PR has the recipe for bringing in a new version of the NoahMP repository. Please approve so that we can start the testing back up.

Davide,
PLEASE fix your name in this commit message. Also, once you see that this PR is merged, would you check the dm+sm build again?

@davegill davegill changed the base branch from develop to release-v4.4 January 28, 2022 02:58
@davidedelvento
Copy link

davidedelvento commented Jan 28, 2022 •
edited
Loading

Davide,
PLEASE fix your name in this commit message.

Not sure what do you mean @davegill ? Is is something related to issue #1659 ? Or to commit a32cbe5 ? If the latter, I don't have permissions to change anything

Also, once you see that this PR is merged, would you check the dm+sm build again?

Absolutely! It'll remain in my todo list until it builds and runs correctly.

Thanks for fixing it so quickly.

@davegill
Copy link
Contributor Author

davegill commented Jan 28, 2022

@davidedelvento
Davide DelVento
Davide delVento
Davide Del Vento
Davide del Vento

dudhia
dudhia approved these changes Jan 28, 2022
View reviewed changes
Copy link
Collaborator

@dudhia dudhia left a comment

Choose a reason for hiding this comment

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

Works neatly to show the actual changes by clicking on the submodule file. But this approval is effectively just for the new link.

@cenlinhe
Copy link
Contributor

cenlinhe commented Jan 28, 2022

@davegill the second "unary operator bug fix" PR in Noah-MP has been merged into the "develop" and "release-v4.4-WRF" branches

@davidedelvento
Copy link

davidedelvento commented Jan 28, 2022

Davide DelVento Davide delVento Davide Del Vento Davide del Vento

Thanks @davegill -- the correct spelling is Davide Del Vento with "Del Vento" being last name with a space and fully capitalized. But that is uncommon, so depending on the database this goes in all the other options are ok too.

@davegill davegill merged commit dde5052 into wrf-model:release-v4.4 Jan 28, 2022
@cenlinhe cenlinhe mentioned this pull request Mar 24, 2022
Merged
vlakshmanan-scala pushed a commit to scala-computing/WRF that referenced this pull request Apr 4, 2024
@davegill @vlakshmanan-scala
New NoahMP submodule instructions for unary operator bugfix (wrf-mode…
84dc3a8 
…l#1660)

TYPE: bug fix

KEYWORDS: unary operator, NoahMP

SOURCE: Davide Del Vento (CISL/NCAR), internal

DESCRIPTION OF CHANGES:
Problem:
Several occurrences of `a * -b` were caught by the Cray compiler during routine
pre-derecho testing of WRF.

Solution:
The standard requires parentheses: `a * (-b)`.

### How to get a different (probably new) NoahMP version in the WRF repository
1. Get the WRF source code, and the right branch (let's assume `develop`
is the WRF branch).
```
git clone https://github.com/wrf-model/WRF
cd WRF 
git checkout develop
git checkout -b new_noahmp_for_some_reason
```
2. Get the NoahMP repo available and in the WRF source code. You must be in the
top-most level of the WRF directory structure to issue this command on some OS.
```
git submodule update --init --recursive
```
3. Get the correct NoahMP branch. Usually the NoahMP group tells us what to pick up.
Here, let us assume it is the `release-v4.4-WRF` branch from NoahMP.
```
cd phys/noahmp
git checkout release-v4.4-WRF
cd ..
```
4. Stage this modification.
```
git add noahmp
```

ISSUE:
Fixes wrf-model#1659

ASSOCIATED REPOSITORY CHANGE:
NCAR/noahmp#30

LIST OF MODIFIED FILES:
modified:   phys/noahmp

TESTS CONDUCTED:
1. All non-standard syntax of above form was modified.
2. All jenkins tests are PASS.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dudhia dudhia dudhia approved these changes

@kkeene44 kkeene44 kkeene44 approved these changes

Assignees

No one assigned

Labels

bug PHYSICS release-v4.4

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@davegill @davidedelvento @cenlinhe @dudhia @kkeene44