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

update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model #453

Closed
wants to merge 5 commits into from

Conversation

XuLi-NOAA
Copy link
Contributor

@XuLi-NOAA XuLi-NOAA commented Mar 8, 2021

Description

Incorporation the changes in fv3atm and ccpp/physics for the NSST model in the coupled system .
See issue #350

fv3atm changes: see NOAA-EMC/fv3atm#219

Reduce the initialized warm layer thickness to be 20 m when the NSST model is cold start in FV3 io.
Add one ccpp suite: suite_FV3_GFS_v15p2_couplednsst.xml
Include the change in ccpp/physics submodule (see NCAR/ccpp-physics#537).

ccpp/physics changes: see NCAR/ccpp-physics#537

Three changes in this issue and a bug fix

(1) Scheme-A to Scheme-A.1 in ccpp/physics
The cooling effect is removed from the formula to determine Tf
(2) Apply a safeguard to tref in sfc_nst_pre_run
(3) Reduce z_w_max from 30 m to 20 in ccpp/physics and FV3/io

A bug fix in ccpp physics related to NSST model in the coupled mode

The new baseline results are at: /scratch1/NCEPDEV/stmp4/Xu.Li/FV3_RT/REGRESSION_TEST_INTEL, the new baseline has been generated since the changes alter the results related to the NSST model.
There is no library update.

The results are as expected.

Issue(s) addressed

Testing

A new test, cpld_control_nsst has been generated and included in the regression tests, the added ccpp suite, suite_FV3_GFS_v15p2_couplednsst.xml, has been added in rt.conf

The regression tests have been done on Hera by:

  1. ./rt.sh -ce >baseline_new
  2. ./rt.sh -me

Dependencies

The update of ufs-weather-model depends on the update in FV3, which depends on the updates in ccpp/physics.

@junwang-noaa
Copy link
Collaborator

Please update your title to be more specific, e,g, what feature/updates are in the PR. Also please answer the questions in the PR template, do not delete them.

@XuLi-NOAA
Copy link
Contributor Author

Please update your title to be more specific, e,g, what feature/updates are in the PR. Also please answer the questions in the PR template, do not delete them.

I modified the PR by following the template but not sure how deal with the dependency part. How to find which PRs are before me?

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Mar 8, 2021 via email

@BrianCurtis-NOAA
Copy link
Collaborator

Does this PR link with any ufs-weather-model issues that have been created?

@XuLi-NOAA
Copy link
Contributor Author

XuLi-NOAA commented Mar 10, 2021 via email

@BrianCurtis-NOAA
Copy link
Collaborator

Yes, see the description.

On Tue, Mar 9, 2021 at 4:33 PM BrianCurtis-NOAA @.***> wrote: Does this PR link with any ufs-weather-model issues that have been created? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#453 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANEMLJWKNZ646ADR6YX26YLTC2A3DANCNFSM4YZXATHQ .

Thanks! I did miss it. I edited it to say "Closes #" so that the merge of this pull request closes that issue.

@XuLi-NOAA
Copy link
Contributor Author

Yes, see the description.

On Tue, Mar 9, 2021 at 4:33 PM BrianCurtis-NOAA @.***> wrote: Does this PR link with any ufs-weather-model issues that have been created? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#453 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANEMLJWKNZ646ADR6YX26YLTC2A3DANCNFSM4YZXATHQ .

Thanks! I did miss it. I edited it to say "Closes #" so that the merge of this pull request closes that issue.

Thanks! I just modified the description to make it clearer.

@XuLi-NOAA
Copy link
Contributor Author

Anybody can tell me what do the failures of the Build mean showing above?

@MinsukJi-NOAA
Copy link
Contributor

@XuLi-NOAA , could you try updating the ufs-weather-model to the latest?

@XuLi-NOAA
Copy link
Contributor Author

@XuLi-NOAA , could you try updating the ufs-weather-model to the latest?

I have updated to the newest version in my regression tests, which went through smoothly (on hera).
No idea what these failures came from (or who did it).

@MinsukJi-NOAA
Copy link
Contributor

@XuLi-NOAA , could you try updating the ufs-weather-model to the latest?

I have updated to the newest version in my regression tests, which went through smoothly (on hera).
No idea what these failures came from (or who did it).

If you referring to the Pull Request Tests, they are automatic tests run by GitHub Actions CI in the ufs-weather-model repository.

@DeniseWorthen DeniseWorthen added the Baseline Updates Current baselines will be updated. label Mar 14, 2021
@XuLi-NOAA XuLi-NOAA changed the title update with fv3 merge update with fv3 & ccpp/physics updates Mar 15, 2021
@XuLi-NOAA
Copy link
Contributor Author

@XuLi-NOAA , could you try updating the ufs-weather-model to the latest?

I have updated to the newest version in my regression tests, which went through smoothly (on hera).
No idea what these failures came from (or who did it).

If you referring to the Pull Request Tests, they are automatic tests run by GitHub Actions CI in the ufs-weather-model repository.

@XuLi-NOAA XuLi-NOAA closed this Mar 15, 2021
@XuLi-NOAA
Copy link
Contributor Author

@XuLi-NOAA , could you try updating the ufs-weather-model to the latest?

I have updated to the newest version in my regression tests, which went through smoothly (on hera).
No idea what these failures came from (or who did it).

If you referring to the Pull Request Tests, they are automatic tests run by GitHub Actions CI in the ufs-weather-model repository.

The automatic tests run failure needs to be fixed or not at this stage?

@MinsukJi-NOAA
Copy link
Contributor

@XuLi-NOAA , could you try updating the ufs-weather-model to the latest?

I have updated to the newest version in my regression tests, which went through smoothly (on hera).
No idea what these failures came from (or who did it).

If you referring to the Pull Request Tests, they are automatic tests run by GitHub Actions CI in the ufs-weather-model repository.

The automatic tests run failure needs to be fixed or not at this stage?

My understanding is that, if automatic tests fails, it needs to be fixed before going to the next stage.

@DeniseWorthen
Copy link
Collaborator

@XuLi-NOAA Could you please edit the title of this PR to describe what you are implementing? Perhaps "implement the NSST model in the coupled system"

Also, there is no associated test file for ufs-weather-model included. You mention that cpld_control_nsst has been added and suite_FV3_GFS_v15p2_couplednsst.xml added to rt.conf but neither changes are in your PR.

@SMoorthi-emc
Copy link
Contributor

NSST model is already in both uncoupled and coupled system. This is supposed to fix some issues, specifically related to coupling.

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Mar 16, 2021

If I did not suggest a good title, that is fine. But something more descriptive than update with fv3 & ccpp/physics updates

…_nsst, to test an added ccpp suite, suite_FV3_GFS_v15p2_couplednsst.xml
@XuLi-NOAA XuLi-NOAA changed the title update with fv3 & ccpp/physics updates update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model Mar 16, 2021
@XuLi-NOAA
Copy link
Contributor Author

If I did not suggest a good title, that is fine. But something more descriptive than update with fv3 & ccpp/physics updates

@DeniseWorthen @SMoorthi-emc: I just push the branch to dial with the add of a new regression test, cpld_control_nsst. I planned to do it latter since a new rt will be run any way after merging with the updated master.

@@ -242,7 +242,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
QUEUE=batch
COMPILE_QUEUE=batch

#ACCNR=fv3-cpu
ACCNR=da-cpu
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please revert these two changes to ACCNR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please revert these two changes to ACCNR.

Will do in the final push, and that's why I didn't push it earlier. Thanks!

@binli2337
Copy link
Contributor

@XuLi-NOAA Please update your branch with the latest changes in the develop branch.

@binli2337
Copy link
Contributor

@XuLi-NOAA , Please revise tests/rt.conf (between line 136 and line 149).

@binli2337
Copy link
Contributor

@XuLi-NOAA ,Please resolve the conflict in rt.conf (starting from line 136).

@XuLi-NOAA
Copy link
Contributor Author

@XuLi-NOAA ,Please resolve the conflict in rt.conf (starting from line 136).

@binli2337 : Done and thanks!

@XuLi-NOAA XuLi-NOAA closed this Mar 26, 2021
junwang-noaa pushed a commit that referenced this pull request Apr 9, 2021
…l on in the coupled model (Replace PR #453) (#483)

* point to fv3 branch
* Add one more test cpld_control_nsst to test added ccpp suite (FV3_GFS_v15p2_couplednsst)
* Modify rt.conf to add FV3_GFS_v15p2_couplednsst
* Modify rt.conf to add a new test, cpld_bmarkfrac_v16_nsst,  remove test cpld_control_nsst
* Modify tests/tests/cpld_bmarkfrac_v16_nsst: 1. cpld_bmarkfrac_v16 to cpld_bmarkfrac_v16_nsst. 2. export NSTF_NAME=2,1,0,0,0 to export nstf_name=2,1,0,0,0.
* Modify input.benchmark_v16.nml.IN & cpld_bmarkfrac_v16_nsst for a consistent definition of nstf_name namelist
* Modify cpld_bmarkfrac_v16_nsst by moving the NSTF_NAME to the namelist field updates section
* RegressionTests_orion.intel.log of the rt run and BL_DATE=20210406 in rt.sh
* RT JOBS PASSED: hera.intel. Log file uploaded.
* run-ci, commit 7 RegressionTest log files
* Push RegressionTests_wcoss_dell_p3.log

Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
MinsukJi-NOAA pushed a commit to MinsukJi-NOAA/ufs-weather-model that referenced this pull request Apr 12, 2021
* First test

* Change branch name

* github event name...

* change to tests/ci dir

* change repo name

* print out stderr

* try recursive checkout

* checkout myself

* in a hurry

* fetch owner id

* Make setup depend on prcheck

* update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model (Replace PR ufs-community#453) (ufs-community#483)

* point to fv3 branch
* Add one more test cpld_control_nsst to test added ccpp suite (FV3_GFS_v15p2_couplednsst)
* Modify rt.conf to add FV3_GFS_v15p2_couplednsst
* Modify rt.conf to add a new test, cpld_bmarkfrac_v16_nsst,  remove test cpld_control_nsst
* Modify tests/tests/cpld_bmarkfrac_v16_nsst: 1. cpld_bmarkfrac_v16 to cpld_bmarkfrac_v16_nsst. 2. export NSTF_NAME=2,1,0,0,0 to export nstf_name=2,1,0,0,0.
* Modify input.benchmark_v16.nml.IN & cpld_bmarkfrac_v16_nsst for a consistent definition of nstf_name namelist
* Modify cpld_bmarkfrac_v16_nsst by moving the NSTF_NAME to the namelist field updates section
* RegressionTests_orion.intel.log of the rt run and BL_DATE=20210406 in rt.sh
* RT JOBS PASSED: hera.intel. Log file uploaded.
* run-ci, commit 7 RegressionTest log files
* Push RegressionTests_wcoss_dell_p3.log

Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>

* remove develop

* quiet git commands. run-ci

* Update CMEPS for latest ESCOMP/master; Update PIO to 2.5.2; Refactor modules (ufs-community#492)


* update ufs for CMEPS master with PIO changes
* update pio to 2.5.2 across platforms
* replace variable SUITE_NAME with CCPP_SUITE
* Merge remote-tracking branch 'DusanJovic/module_common' into feature/updcmeps
* switch to h-nems area on jet

Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>

* debug this again...

* debug again

* debug continues

* missed repo field

* remove debug related texts

* remove -x flag. run-ci

* reduce sleep time

* diag

* diag2

* Fix pr_uid

* diag again

Co-authored-by: XuLi-NOAA <55100838+XuLi-NOAA@users.noreply.github.com>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
MinsukJi-NOAA pushed a commit to MinsukJi-NOAA/ufs-weather-model that referenced this pull request Apr 12, 2021
* First test

* Change branch name

* github event name...

* change to tests/ci dir

* change repo name

* print out stderr

* try recursive checkout

* checkout myself

* in a hurry

* fetch owner id

* Make setup depend on prcheck

* update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model (Replace PR ufs-community#453) (ufs-community#483)

* point to fv3 branch
* Add one more test cpld_control_nsst to test added ccpp suite (FV3_GFS_v15p2_couplednsst)
* Modify rt.conf to add FV3_GFS_v15p2_couplednsst
* Modify rt.conf to add a new test, cpld_bmarkfrac_v16_nsst,  remove test cpld_control_nsst
* Modify tests/tests/cpld_bmarkfrac_v16_nsst: 1. cpld_bmarkfrac_v16 to cpld_bmarkfrac_v16_nsst. 2. export NSTF_NAME=2,1,0,0,0 to export nstf_name=2,1,0,0,0.
* Modify input.benchmark_v16.nml.IN & cpld_bmarkfrac_v16_nsst for a consistent definition of nstf_name namelist
* Modify cpld_bmarkfrac_v16_nsst by moving the NSTF_NAME to the namelist field updates section
* RegressionTests_orion.intel.log of the rt run and BL_DATE=20210406 in rt.sh
* RT JOBS PASSED: hera.intel. Log file uploaded.
* run-ci, commit 7 RegressionTest log files
* Push RegressionTests_wcoss_dell_p3.log

Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>

* remove develop

* quiet git commands. run-ci

* Update CMEPS for latest ESCOMP/master; Update PIO to 2.5.2; Refactor modules (ufs-community#492)


* update ufs for CMEPS master with PIO changes
* update pio to 2.5.2 across platforms
* replace variable SUITE_NAME with CCPP_SUITE
* Merge remote-tracking branch 'DusanJovic/module_common' into feature/updcmeps
* switch to h-nems area on jet

Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>

* debug this again...

* debug again

* debug continues

* missed repo field

* remove debug related texts

* remove -x flag. run-ci

* reduce sleep time

* diag

* diag2

* Fix pr_uid

* diag again

* still debugging

* lets see if this works

* use context as main yml key

Co-authored-by: XuLi-NOAA <55100838+XuLi-NOAA@users.noreply.github.com>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
MinsukJi-NOAA pushed a commit to MinsukJi-NOAA/ufs-weather-model that referenced this pull request Apr 14, 2021
* First test

* Change branch name

* github event name...

* change to tests/ci dir

* change repo name

* print out stderr

* try recursive checkout

* checkout myself

* in a hurry

* fetch owner id

* Make setup depend on prcheck

* update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model (Replace PR ufs-community#453) (ufs-community#483)

* point to fv3 branch
* Add one more test cpld_control_nsst to test added ccpp suite (FV3_GFS_v15p2_couplednsst)
* Modify rt.conf to add FV3_GFS_v15p2_couplednsst
* Modify rt.conf to add a new test, cpld_bmarkfrac_v16_nsst,  remove test cpld_control_nsst
* Modify tests/tests/cpld_bmarkfrac_v16_nsst: 1. cpld_bmarkfrac_v16 to cpld_bmarkfrac_v16_nsst. 2. export NSTF_NAME=2,1,0,0,0 to export nstf_name=2,1,0,0,0.
* Modify input.benchmark_v16.nml.IN & cpld_bmarkfrac_v16_nsst for a consistent definition of nstf_name namelist
* Modify cpld_bmarkfrac_v16_nsst by moving the NSTF_NAME to the namelist field updates section
* RegressionTests_orion.intel.log of the rt run and BL_DATE=20210406 in rt.sh
* RT JOBS PASSED: hera.intel. Log file uploaded.
* run-ci, commit 7 RegressionTest log files
* Push RegressionTests_wcoss_dell_p3.log

Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>

* remove develop

* quiet git commands. run-ci

* Update CMEPS for latest ESCOMP/master; Update PIO to 2.5.2; Refactor modules (ufs-community#492)


* update ufs for CMEPS master with PIO changes
* update pio to 2.5.2 across platforms
* replace variable SUITE_NAME with CCPP_SUITE
* Merge remote-tracking branch 'DusanJovic/module_common' into feature/updcmeps
* switch to h-nems area on jet

Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>

* debug this again...

* debug again

* debug continues

* missed repo field

* remove debug related texts

* remove -x flag. run-ci

* reduce sleep time

* diag

* diag2

* Fix pr_uid

* diag again

* still debugging

* lets see if this works

* use context as main yml key

* Try pull request now. run-ci

* minor change. run-ci

* typo fix

* debug 1

* debug2

* minor mods. run-ci

* check another dir

* sleep

* sigh

* sigh2

* increase time again

* test again

Co-authored-by: XuLi-NOAA <55100838+XuLi-NOAA@users.noreply.github.com>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
@XuLi-NOAA XuLi-NOAA deleted the feature/ufs-nst branch April 16, 2021 03:20
pjpegion pushed a commit to NOAA-PSL/ufs-weather-model that referenced this pull request Apr 4, 2023
* update submodule pointer for regression testing of ccpp-physics#812
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorporation the changes in fv3atm and ccpp/physics for the NSST model in the coupled system
7 participants