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.

Sign up for GitHub

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

Jump to bottom

Add soil color data and change the way to read in Noah-MP parameter table #1697

Merged
merged 18 commits into from
Jul 28, 2023
Merged

Add soil color data and change the way to read in Noah-MP parameter table #1697

merged 18 commits into from
Jul 28, 2023

Conversation

HelinWei-NOAA
Copy link
Contributor

@HelinWei-NOAA HelinWei-NOAA commented Jun 15, 2023 •
edited
Loading

Description

  • A new soil color dataset is introduced to Noah MP to reflect the right soil albedo to reduce the large warm bias found in the Sahel desert. The more-recent and higher resolution BNU soil texture data will be used to replace the old data.

  • Noah MP parameter table is part of the source code in the current version. The UFS model has to be recompiled whenever there is any parameter change in the table. Therefore we propose to change this structure and the table will become one of the input file to the model.

Closes #1614
Closes #1617

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes need updates to the documentation. I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • New and existing tests pass with my changes
  • Any dependent changes have been merged and published

@WalterKolczynski-NOAA WalterKolczynski-NOAA changed the title adding soil color data and change the way to read in Noah-MP parameter table Add soil color data and change the way to read in Noah-MP parameter table Jun 15, 2023
@WalterKolczynski-NOAA
Copy link
Contributor

WalterKolczynski-NOAA commented Jun 20, 2023 •
edited
Loading

Since this PR does not include the NoahMP table stuff yet, I propose we make this PR just for the soil color data so we can push it through quickly, and then have a separate PR for the NoahMP table. (Single subject PRs are greatly preferred anyway.)

@WalterKolczynski-NOAA
Copy link
Contributor

@HelinWei-NOAA this has been sitting idle for two weeks. Is there more to add for the soil color data, or can we reduce the scope of this PR to get just that part in and use a separate PR for the Noah-MP parameter table?

@HelinWei-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA I am working to get this into ufs repository first then I can start to work on global workflow

github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 17, 2023
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

shellcheck found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

@HelinWei-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA As you suggested I will split this PR to two. This one is just for soil color and the other one will be the NoahMP table. Can I open this PR for review?

@WalterKolczynski-NOAA
Copy link
Contributor

@HelinWei-NOAA Please fix the conflicts you now have with develop first, then open it up for review.

@HelinWei-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA I just synced my branch to the develop. What conflicts do you refer to? failing shellnorms/lint-shell check?

@HelinWei-NOAA HelinWei-NOAA marked this pull request as ready for review July 17, 2023 18:46
@WalterKolczynski-NOAA
Copy link
Contributor

Merging in develop fixed the conflicts. The shellcheck issues do need to be addressed though.

@WalterKolczynski-NOAA
Copy link
Contributor

This PR is undoing a lot of the changes in forecast_postdet.sh that we made to develop. Please review your changes and make sure only your intended changes are included.

@HelinWei-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA Thanks for pointing this out. I solved this issue but the commit seems too messy. Do you want me to start over with the develop branch? My modification is very minor.

This PR is undoing a lot of the changes in forecast_postdet.sh that we made to develop. Please review your changes and make sure only your intended changes are included.

@WalterKolczynski-NOAA
Copy link
Contributor

It's fine as-is. We squash PRs into develop, so the history of the branch doesn't matter as long as the changes themselves are clean (which they appear to be now).

@WalterKolczynski-NOAA WalterKolczynski-NOAA self-assigned this Jul 17, 2023
@WalterKolczynski-NOAA WalterKolczynski-NOAA added CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Orion-Ready **CM use only** PR is ready for CI testing on Orion labels Jul 17, 2023
@emcbot emcbot added CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera and removed CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera labels Jul 17, 2023
aerorahul
aerorahul approved these changes Jul 17, 2023
View reviewed changes
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

Just noting that this change won't be backward compatible due to the change in forecast_postdet.sh

Otherwise changes look good to me.

@emcbot emcbot added CI-Orion-Building **Bot use only** CI testing is cloning/building on Orion and removed CI-Orion-Ready **CM use only** PR is ready for CI testing on Orion labels Jul 17, 2023
@WalterKolczynski-NOAA
Copy link
Contributor

Just noting that this change won't be backward compatible due to the change in forecast_postdet.sh

Otherwise changes look good to me.

This was due to a change by me to remove fix_ from the directory name in the new fix file set. You are correct though that the orog version can't be reverted without also undoing the postdet changes, but that is often true for fix file updates.

@HelinWei-NOAA
Merge pull request #4 from WalterKolczynski-NOAA/hr2_land1
9dd8f87 
Add mask resolution to sfc fix file names
@HelinWei-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA Merged and ran a successful prototype test.

@WalterKolczynski-NOAA WalterKolczynski-NOAA added CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Orion-Ready **CM use only** PR is ready for CI testing on Orion labels Jul 27, 2023
@emcbot emcbot added CI-Orion-Building **Bot use only** CI testing is cloning/building on Orion CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress and removed CI-Orion-Ready **CM use only** PR is ready for CI testing on Orion CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera labels Jul 27, 2023
@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Hera
Start: Thu Jul 27 19:05:13 UTC 2023 on hfe05
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 19:08:26 UTC 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 19:32:35 UTC 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:38 UTC 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:41 UTC 2023 for experiment C96C48_hybatmDA_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:44 UTC 2023 for experiment C96_atm3DVar_9dd8f873

@emcbot emcbot added CI-Orion-Running **Bot use only** CI testing on Orion for this PR is in-progress and removed CI-Orion-Building **Bot use only** CI testing is cloning/building on Orion labels Jul 27, 2023
@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Orion
Start: Thu Jul 27 14:04:32 CDT 2023 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 14:06:39 CDT 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 14:38:36 CDT 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:48 CDT 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:53 CDT 2023 for experiment C96_atm3DVar_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:39:00 CDT 2023 for experiment C96C48_hybatmDA_9dd8f873

@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Orion
Start: Thu Jul 27 14:04:32 CDT 2023 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 14:06:39 CDT 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 14:38:36 CDT 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:48 CDT 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:53 CDT 2023 for experiment C96_atm3DVar_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:39:00 CDT 2023 for experiment C96C48_hybatmDA_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 15:22:10 CDT 2023
with 18 successfully completed jobs

@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Hera
Start: Thu Jul 27 19:05:13 UTC 2023 on hfe05
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 19:08:26 UTC 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 19:32:35 UTC 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:38 UTC 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:41 UTC 2023 for experiment C96C48_hybatmDA_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:44 UTC 2023 for experiment C96_atm3DVar_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 20:27:14 UTC 2023
with 18 successfully completed jobs

@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Orion
Start: Thu Jul 27 14:04:32 CDT 2023 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 14:06:39 CDT 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 14:38:36 CDT 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:48 CDT 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:53 CDT 2023 for experiment C96_atm3DVar_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:39:00 CDT 2023 for experiment C96C48_hybatmDA_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 15:22:10 CDT 2023
with 18 successfully completed jobs
Experiment C96_atm3DVar_9dd8f873 completed: *SUCCESS*
Experiment C96_atm3DVar_9dd8f873 Completed at Thu Jul 27 16:52:09 CDT 2023
with 89 successfully completed jobs

@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Orion
Start: Thu Jul 27 14:04:32 CDT 2023 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 14:06:39 CDT 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 14:38:36 CDT 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:48 CDT 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:53 CDT 2023 for experiment C96_atm3DVar_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:39:00 CDT 2023 for experiment C96C48_hybatmDA_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 15:22:10 CDT 2023
with 18 successfully completed jobs
Experiment C96_atm3DVar_9dd8f873 completed: *SUCCESS*
Experiment C96_atm3DVar_9dd8f873 Completed at Thu Jul 27 16:52:09 CDT 2023
with 89 successfully completed jobs
Experiment C96C48_hybatmDA_9dd8f873 completed: *SUCCESS*
Experiment C96C48_hybatmDA_9dd8f873 Completed at Thu Jul 27 17:46:10 CDT 2023
with 151 successfully completed jobs

@emcbot emcbot added CI-Orion-Passed **Bot use only** CI testing on Orion for this PR has completed successfully and removed CI-Orion-Running **Bot use only** CI testing on Orion for this PR is in-progress labels Jul 27, 2023
@emcbot
Copy link

emcbot commented Jul 27, 2023

Automated global-workflow Testing Results:

Machine: Orion
Start: Thu Jul 27 14:04:32 CDT 2023 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 14:06:39 CDT 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 14:38:36 CDT 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:48 CDT 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:38:53 CDT 2023 for experiment C96_atm3DVar_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 14:39:00 CDT 2023 for experiment C96C48_hybatmDA_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 15:22:10 CDT 2023
with 18 successfully completed jobs
Experiment C96_atm3DVar_9dd8f873 completed: *SUCCESS*
Experiment C96_atm3DVar_9dd8f873 Completed at Thu Jul 27 16:52:09 CDT 2023
with 89 successfully completed jobs
Experiment C96C48_hybatmDA_9dd8f873 completed: *SUCCESS*
Experiment C96C48_hybatmDA_9dd8f873 Completed at Thu Jul 27 17:46:10 CDT 2023
with 151 successfully completed jobs

@emcbot
Copy link

emcbot commented Jul 28, 2023

Automated global-workflow Testing Results:

Machine: Hera
Start: Thu Jul 27 19:05:13 UTC 2023 on hfe05
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 19:08:26 UTC 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 19:32:35 UTC 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:38 UTC 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:41 UTC 2023 for experiment C96C48_hybatmDA_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:44 UTC 2023 for experiment C96_atm3DVar_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 20:27:14 UTC 2023
with 18 successfully completed jobs
Experiment C96C48_hybatmDA_9dd8f873 completed: *SUCCESS*
Experiment C96C48_hybatmDA_9dd8f873 Completed at Fri Jul 28 00:27:12 UTC 2023
with 151 successfully completed jobs

@emcbot
Copy link

emcbot commented Jul 28, 2023

Automated global-workflow Testing Results:

Machine: Hera
Start: Thu Jul 27 19:05:13 UTC 2023 on hfe05
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 19:08:26 UTC 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 19:32:35 UTC 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:38 UTC 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:41 UTC 2023 for experiment C96C48_hybatmDA_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:44 UTC 2023 for experiment C96_atm3DVar_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 20:27:14 UTC 2023
with 18 successfully completed jobs
Experiment C96C48_hybatmDA_9dd8f873 completed: *SUCCESS*
Experiment C96C48_hybatmDA_9dd8f873 Completed at Fri Jul 28 00:27:12 UTC 2023
with 151 successfully completed jobs
Experiment C96_atm3DVar_9dd8f873 completed: *SUCCESS*
Experiment C96_atm3DVar_9dd8f873 Completed at Fri Jul 28 01:27:15 UTC 2023
with 89 successfully completed jobs

@emcbot emcbot added CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully and removed CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress labels Jul 28, 2023
@emcbot
Copy link

emcbot commented Jul 28, 2023

Automated global-workflow Testing Results:

Machine: Hera
Start: Thu Jul 27 19:05:13 UTC 2023 on hfe05
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Thu Jul 27 19:08:26 UTC 2023
Build:                         *SUCCESS*
Build: Completed at Thu Jul 27 19:32:35 UTC 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:38 UTC 2023 for experiment C48_S2S_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:41 UTC 2023 for experiment C96C48_hybatmDA_9dd8f873
Created experiment:            *SUCCESS*
Case setup: Completed at Thu Jul 27 19:32:44 UTC 2023 for experiment C96_atm3DVar_9dd8f873
Experiment C48_S2S_9dd8f873 completed: *SUCCESS*
Experiment C48_S2S_9dd8f873 Completed at Thu Jul 27 20:27:14 UTC 2023
with 18 successfully completed jobs
Experiment C96C48_hybatmDA_9dd8f873 completed: *SUCCESS*
Experiment C96C48_hybatmDA_9dd8f873 Completed at Fri Jul 28 00:27:12 UTC 2023
with 151 successfully completed jobs
Experiment C96_atm3DVar_9dd8f873 completed: *SUCCESS*
Experiment C96_atm3DVar_9dd8f873 Completed at Fri Jul 28 01:27:15 UTC 2023
with 89 successfully completed jobs

aerorahul
aerorahul approved these changes Jul 28, 2023
View reviewed changes
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

Looks good.
Thanks for the work @HelinWei-NOAA and team.

@WalterKolczynski-NOAA WalterKolczynski-NOAA merged commit e8fa708 into NOAA-EMC:develop Jul 28, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aerorahul aerorahul aerorahul approved these changes

@WalterKolczynski-NOAA WalterKolczynski-NOAA WalterKolczynski-NOAA approved these changes

Assignees

@WalterKolczynski-NOAA WalterKolczynski-NOAA

Labels
CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully CI-Orion-Passed **Bot use only** CI testing on Orion for this PR has completed successfully
Projects
None yet
Milestone
No milestone
6 participants
@HelinWei-NOAA @WalterKolczynski-NOAA @emcbot @aerorahul @barlage @sanatcumar