-
Notifications
You must be signed in to change notification settings - Fork 159
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
Sm may182021 #303
Sm may182021 #303
Conversation
cplwav2atm flag for coupling wave to atm
…from the suites as this is included in GFS_surface_composites_inter_run
… reading fractional grid orography file and run as no fractional grid, and minor bug fix in physics driver related to the fractional grid - FV3GFS_io.F90 is modified to use lake fraction if it exists to distinguish lake from ocean
Update long names of hydrometeors to match the ccpp-physics change
…rve the option used in current s2s benchmarks
…ed to the mediator set to large values and over 100% sea ice set to values imported from icemodel. The mask identifying the ocean points to the mediator is correted based on ocean fraction. Updates also include name changes for the ice fields as changed by Denise Worthen. Also added an ignore_lake option to the namelist
I'd recommend removing v17 from suite definition file names to avoid
confusion since v17 has not been finalized. Users outside of the circle
may mistakenly treat suites with a v17 tag as the official GFS.v17
configuration.
Fanglin
…On Mon, Jul 12, 2021 at 4:45 PM Jun Wang ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In ccpp/suites/suite_FV3_GFS_v17_cpldnsstras.xml
<#303 (comment)>:
> @@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_v17_cpldnsstras" version="1">
Since the code will be committed to develop branch and used by broad
community, @yangfanglin <https://github.com/yangfanglin> can we get
physics group to give an official name for those suites files? I am worried
that developers will be surprised/confused with those suite files when they
come into the official repository.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AKY5N2KLYFKAH3WQITM4JMDTXNH5XANCNFSM45HBOOQQ>
.
--
*Fanglin Yang, Ph.D.*
*Chief, Model Physics Group*
*Modeling and Data Assimilation Branch*
*NOAA/NWS/NCEP Environmental Modeling Center*
*https://www.emc.ncep.noaa.gov/gmb/wx24fy/fyang/
<https://www.emc.ncep.noaa.gov/gmb/wx24fy/fyang/>*
|
SDF names with GFS_v17 has been changed GFSv17alpha. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for making these changes.
ccpp-physics was merged, new hash is 5cf963e40f31a7be0a0ac84267f21401a78934e4 |
What should I do next? I modified ".gitmodules" in my fv3atm branch to
point to ccpp-physics/main.
Moorthi
…On Tue, Jul 13, 2021 at 7:20 PM Dom Heinzeller ***@***.***> wrote:
ccpp-physics was merged, new hash is
5cf963e40f31a7be0a0ac84267f21401a78934e4
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALLVRYSQRLWCYEPGRFPDQ7LTXTC3NANCNFSM45HBOOQQ>
.
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
The ccpp-physics hash is not yet correct. go to ccpp-physics, do "git remote update", then check out ncar main (git checkout WHATEVER_REMOTE_POINTS_TO_NCAR main), then go back to fv3atm and commit ccpp/physics as "Update submodule pointer for ccpp-physics" and push to github. You should have hash 5cf963e40f31a7be0a0ac84267f21401a78934e4 in ccpp/physics. |
Now it is I think.
…On Tue, Jul 13, 2021 at 7:55 PM Dom Heinzeller ***@***.***> wrote:
The ccpp-physics hash is not yet correct. go to ccpp-physics, do "git
remote update", then check out ncar main (git checkout
WHATEVER_REMOTE_POINTS_TO_NCAR main), then go back to fv3atm and commit
ccpp/physics as "Update submodule pointer for ccpp-physics" and push to
github. You should have hash 5cf963e40f31a7be0a0ac84267f21401a78934e4 in
ccpp/physics.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALLVRYQWT4UIVVATCK3T45DTXTG6HANCNFSM45HBOOQQ>
.
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
I guess I did not give the exact message you had. Is it ok?
On Tue, Jul 13, 2021 at 7:58 PM Shrinivas Moorthi - NOAA Federal <
***@***.***> wrote:
… Now it is I think.
On Tue, Jul 13, 2021 at 7:55 PM Dom Heinzeller ***@***.***>
wrote:
> The ccpp-physics hash is not yet correct. go to ccpp-physics, do "git
> remote update", then check out ncar main (git checkout
> WHATEVER_REMOTE_POINTS_TO_NCAR main), then go back to fv3atm and commit
> ccpp/physics as "Update submodule pointer for ccpp-physics" and push to
> github. You should have hash 5cf963e40f31a7be0a0ac84267f21401a78934e4 in
> ccpp/physics.
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <#303 (comment)>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/ALLVRYQWT4UIVVATCK3T45DTXTG6HANCNFSM45HBOOQQ>
> .
>
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
Well ... yes. But that update shows that your ccpp-physics branch wasn't up to date with main - it was missing the updates from the previous commit. Click on commit 5536416 to see those differences. If your code had been up to date, it would show zero updated files, just an update of the hash. This means that the current baselines are not valid, because the previous commit changed baselines. @junwang-noaa @DusanJovic-NOAA @DeniseWorthen |
I am not sure which of my branch you are comparing to. It should have been
"SM_May182021b".
Remember I had trouble reverting?
Moorthi
…On Tue, Jul 13, 2021 at 8:03 PM Dom Heinzeller ***@***.***> wrote:
Now it is I think.
… <#m_-2510276545107070554_>
Well ... yes. But that update shows that your ccpp-physics branch wasn't
up to date with main - it was missing the updates from the previous commit.
Click on commit 5536416
<5536416>
to see those differences. If your code had been up to date, it would show
zero updated files, just an update of the hash. This means that the current
baselines are not valid, because the previous commit changed baselines.
@junwang-noaa <https://github.com/junwang-noaa> @DusanJovic-NOAA
<https://github.com/DusanJovic-NOAA> @DeniseWorthen
<https://github.com/DeniseWorthen>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALLVRYVWXW5YYUXVBI3O4MTTXTH4HANCNFSM45HBOOQQ>
.
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
I do. But in any case, the baselines were created with a ccpp-physics code that is not what is in main - means that any attempt to verify against those baselines will result in regression test failures. |
The gitmodules in fv3atm before I change just a few minutes ago had
"[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
branch = dev/emc
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/SMoorthi-emc/ccpp-physics
branch =* SM_May182021b*"
So why do you think it is wrong?
Moorthi
…On Tue, Jul 13, 2021 at 8:10 PM Dom Heinzeller ***@***.***> wrote:
I am not sure which of my branch you are comparing to. It should have been
"SM_May182021b". Remember I had trouble reverting? Moorthi
… <#m_-8284055829207829600_>
I do. But in any case, the baselines were created with a ccpp-physics code
that is not what is in main - means that any attempt to verify against
those baselines will result in regression test failures.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALLVRYW3L56ZZ6NZZ7FW3NTTXTIXVANCNFSM45HBOOQQ>
.
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
Because the latest commit to point to ncar main shows 6 files with differences. This means these updates where not included in your branch that was used in the PR NCAR/ccpp-physics#662
… On Jul 13, 2021, at 6:13 PM, SMoorthi-emc ***@***.***> wrote:
The gitmodules in fv3atm before I change just a few minutes ago had
"[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
branch = dev/emc
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/SMoorthi-emc/ccpp-physics
branch =* SM_May182021b*"
So why do you think it is wrong?
Moorthi
On Tue, Jul 13, 2021 at 8:10 PM Dom Heinzeller ***@***.***>
wrote:
> I am not sure which of my branch you are comparing to. It should have been
> "SM_May182021b". Remember I had trouble reverting? Moorthi
> … <#m_-8284055829207829600_>
>
> I do. But in any case, the baselines were created with a ccpp-physics code
> that is not what is in main - means that any attempt to verify against
> those baselines will result in regression test failures.
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <#303 (comment)>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/ALLVRYW3L56ZZ6NZZ7FW3NTTXTIXVANCNFSM45HBOOQQ>
> .
>
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub <#303 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB5C2RKH6GXP44QHEKVUUATTXTJBNANCNFSM45HBOOQQ>.
|
I checked Jun's source directory on Dell and it has the correct version!
Moorthi
On Tue, Jul 13, 2021 at 8:12 PM Shrinivas Moorthi - NOAA Federal <
***@***.***> wrote:
… The gitmodules in fv3atm before I change just a few minutes ago had
"[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
branch = dev/emc
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/SMoorthi-emc/ccpp-physics
branch =* SM_May182021b*"
So why do you think it is wrong?
Moorthi
On Tue, Jul 13, 2021 at 8:10 PM Dom Heinzeller ***@***.***>
wrote:
> I am not sure which of my branch you are comparing to. It should have
> been "SM_May182021b". Remember I had trouble reverting? Moorthi
> … <#m_-2433408706998351125_m_-8284055829207829600_>
>
> I do. But in any case, the baselines were created with a ccpp-physics
> code that is not what is in main - means that any attempt to verify against
> those baselines will result in regression test failures.
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <#303 (comment)>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/ALLVRYW3L56ZZ6NZZ7FW3NTTXTIXVANCNFSM45HBOOQQ>
> .
>
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
Hmm .. maybe you just didn't push the latest ccpp-physics merge from main to your ccpp-physics branch? Hang on, I am in a meeting now and will check thoroughly in an hour |
I think you merge the wrong one to ccpp-physics/main☺
Moorthi
On Tue, Jul 13, 2021 at 8:15 PM Shrinivas Moorthi - NOAA Federal <
***@***.***> wrote:
… I checked Jun's source directory on Dell and it has the correct version!
Moorthi
On Tue, Jul 13, 2021 at 8:12 PM Shrinivas Moorthi - NOAA Federal <
***@***.***> wrote:
> The gitmodules in fv3atm before I change just a few minutes ago had
> "[submodule "atmos_cubed_sphere"]
> path = atmos_cubed_sphere
> url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
> branch = dev/emc
> [submodule "ccpp/framework"]
> path = ccpp/framework
> url = https://github.com/NCAR/ccpp-framework
> branch = main
> [submodule "ccpp/physics"]
> path = ccpp/physics
> url = https://github.com/SMoorthi-emc/ccpp-physics
> branch =* SM_May182021b*"
>
> So why do you think it is wrong?
> Moorthi
>
> On Tue, Jul 13, 2021 at 8:10 PM Dom Heinzeller ***@***.***>
> wrote:
>
>> I am not sure which of my branch you are comparing to. It should have
>> been "SM_May182021b". Remember I had trouble reverting? Moorthi
>> …
>> <#m_-1642961868573640358_m_-2433408706998351125_m_-8284055829207829600_>
>>
>> I do. But in any case, the baselines were created with a ccpp-physics
>> code that is not what is in main - means that any attempt to verify against
>> those baselines will result in regression test failures.
>>
>> —
>> You are receiving this because you were mentioned.
>> Reply to this email directly, view it on GitHub
>> <#303 (comment)>,
>> or unsubscribe
>> <https://github.com/notifications/unsubscribe-auth/ALLVRYW3L56ZZ6NZZ7FW3NTTXTIXVANCNFSM45HBOOQQ>
>> .
>>
>
>
> --
> Dr. Shrinivas Moorthi
> Research Meteorologist
> Modeling and Data Assimilation Branch
> Environmental Modeling Center / National Centers for Environmental
> Prediction
> 5830 University Research Court - (W/NP23), College Park MD 20740 USA
> Tel: (301)683-3718
>
> e-mail: ***@***.***
> Phone: (301) 683-3718 Fax: (301) 683-3718
>
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
I merged your PR - I cannot merge branches. But chances are that your updated branch and the PR plus what is in main are identical. I will check that in an hour, if it is the case then we are good. |
I think I know what happened.
When I first opened PR, the branch name was "SM_May182021".
But since I had a problem with "revert" I had to create a second branch
"SM_May182021b" just pointing to two commits earlier. I guess I did not
think of changing it in PR.
Can you undo the merge in ccpp-physics and then merge my branch
SM_May182021b"?
Sorry for the confusion. I hope the runs you made had correct code as my
fv3 branch was pointing to the right code.
Moorthi
On Tue, Jul 13, 2021 at 8:18 PM Dom Heinzeller ***@***.***>
wrote:
… I checked Jun's source directory on Dell and it has the correct version!
Moorthi On Tue, Jul 13, 2021 at 8:12 PM Shrinivas Moorthi - NOAA Federal <
*@*.***> wrote:
… <#m_3275526237840658630_>
Hmm .. maybe you just didn't push the latest ccpp-physics merge from main
to your ccpp-physics branch? Hang on, I am in a meeting now and will check
thoroughly in an hour
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALLVRYQ4GOKROJUUBKGLPLLTXTJWLANCNFSM45HBOOQQ>
.
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
We need to use the branch SM_May182021b |
Just wait for a moment, please, until I get out of my meeting. |
@SMoorthi-emc I finally got this fixed. The new hash for ccpp-physics is 719c162. This code is identical to your branch SM_May182021b. I can you confirm that SM_May182021b was used in the regression testing, i.e. your submodule pointer for ccpp-physics pointed to the head of SM_May182021b (bc38771) before you updated it in commit 5536416. Therefore, if you now update ccpp-physics again by checking out ncar main and then committing the submodule pointer update in fv3atm, everything will be ok and we are good to merge this PR. |
It is done.
Thanks
Moorthi
…On Tue, Jul 13, 2021 at 9:14 PM Dom Heinzeller ***@***.***> wrote:
@SMoorthi-emc <https://github.com/SMoorthi-emc> I finally got this fixed.
The new hash for ccpp-physics is 719c162. This code is identical to your
branch SM_May182021b.
I can you confirm that SM_May182021b was used in the regression testing,
i.e. your submodule pointer for ccpp-physics pointed to the head of
SM_May182021b (bc38771) before you updated
it in commit 5536416
<5536416>
.
Therefore, if you now update ccpp-physics again by checking out ncar main
and then committing the submodule pointer update in fv3atm, everything will
be ok and we are good to merge this PR.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#303 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALLVRYQ7ZVDGAKOHN5NQB3DTXTQHHANCNFSM45HBOOQQ>
.
--
Dr. Shrinivas Moorthi
Research Meteorologist
Modeling and Data Assimilation Branch
Environmental Modeling Center / National Centers for Environmental
Prediction
5830 University Research Court - (W/NP23), College Park MD 20740 USA
Tel: (301)683-3718
e-mail: ***@***.***
Phone: (301) 683-3718 Fax: (301) 683-3718
|
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?
This PR removes "ncld" from the namelist, removes Interstitial variable "nncl", defines Model%ncnd via "nwat".
It also normalizes the snow over sea-ice by ice fraction both imported from the ice model.
It also updates some logic in FV3GFS_io.F90. It replaces "ncld" used in IO to "imp_physics"
Yes, this version does change the results, partly because of the above changes, and partly because of the changes in ccpp-physics.
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!)
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 the ufs-weather-model regression test been run? On what platform?
Tested in the coupled mode at C384127 with 2 threads on Hera with intel compiler.
No regression tests have been run
Dependencies
If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)
https://github.com/SMoorthi-emc/ccpp-physics/tree/SM_May182021
Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs
No