Skip to content

Noah MP updates for Prototype 8 (GFSv17)#927

Merged
junwang-noaa merged 33 commits into
ufs-community:developfrom
HelinWei-NOAA:develop
Dec 2, 2021
Merged

Noah MP updates for Prototype 8 (GFSv17)#927
junwang-noaa merged 33 commits into
ufs-community:developfrom
HelinWei-NOAA:develop

Conversation

@HelinWei-NOAA
Copy link
Copy Markdown
Collaborator

@HelinWei-NOAA HelinWei-NOAA commented Nov 19, 2021

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 if you are unsure how to do this.

  • 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.

fv3atm PR 387
ccpp-physics PR 729
UPP PR 378

  • Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.

All results will be changed because of the modified physics and extra fields in the model output

  • New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

New diag_table is needed for those extra land ouputs

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

  1. Add some extra surface fields required to close the offline energy/water budget computation. These fields are listed below:

LAND FRACTION
INST PREC ADVEC HEAT
WATER IN AQUIFER
ACM EIWATER(CANOPY WATER EVAPORATION)
ACM PLANTTR( PLANT TRANSPIRATION)
ACM SOILSE (BARE SOIL EVAPORATION)
AVE PREC ADVEC HEAT

  1. The surface loop control/iteration removal when Noah MP is used
  • Surface skin temperature is determined inside the Noah MP LSM with its own surface scheme/iteration.
  • 'guess_run'/iteration (for determination of skin temperature with weak winds) in surface loop control is set to 'false' when Noah MP LSM (lsm=2) is used.
  1. New coupling interface
  • The land model provides feedback to the atmospheric boundary layer. The required bulk Richard number input to the boundary layer scheme is computed using grid-aggregated momentum (from the roughness lengths over the tiles and vegetation fraction) and thermal roughness (from interpolation of kB^-1 from the tiles) lengths.
  1. The addition of GFS surface scheme in Noah MP surface layer call
  • To be consistent with the surface layer treatment for the other part of the surface in the model, the original
    GFS surface layer scheme is added to the Noah MP surface layer option.
  1. Fix the inout issue of smc in Noah LSM (sflx.f)

Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(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)

Dependencies

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?

No.

If so add the "waiting for other repos" label and list the upstream PRs

  • waiting on noaa-emc/nems/pull/<pr_number>
  • waiting on noaa-emc/fv3atm/pull/<pr_number>

@junwang-noaa junwang-noaa added the Baseline Updates Current baselines will be updated. label Nov 29, 2021
@BrianCurtis-NOAA
Copy link
Copy Markdown
Collaborator

Automated RT Failure Notification
Machine: hera
Compiler: gnu
Job: BL
Repo location: /scratch1/NCEPDEV/nems/emc.nemspara/autort/pr/784997109/20211129193014/ufs-weather-model
/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20211119/GNU
Exists already. It should not yet. Please delete.
Please make changes and add the following label back:
hera-gnu-BL

@BrianCurtis-NOAA
Copy link
Copy Markdown
Collaborator

Automated RT Failure Notification
Machine: hera
Compiler: intel
Job: BL
Repo location: /scratch1/NCEPDEV/nems/emc.nemspara/autort/pr/784997109/20211129193202/ufs-weather-model
/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20211119/INTEL
Exists already. It should not yet. Please delete.
Please make changes and add the following label back:
hera-intel-BL

@DusanJovic-NOAA
Copy link
Copy Markdown
Collaborator

Please update BL_DATE in rt.sh.

@DusanJovic-NOAA
Copy link
Copy Markdown
Collaborator

Compilation fails with this error message:

+ make -j 8 VERBOSE=1
/gpfs/hps3/emc/meso/save/Dusan.Jovic/ufs/pr927/ufs-weather-model/FV3/ccpp/physics/physics/GFS_surface_generic.F90(294): error #6451: A dummy argument name is required in this context.   [DTF]
        real(kind=kind_phys),                   intent(in) :: dtf
--------------------------------------------------------------^                                                                                                                                                      
compilation aborted for /gpfs/hps3/emc/meso/save/Dusan.Jovic/ufs/pr927/ufs-weather-model/FV3/ccpp/physics/physics/GFS_surface_generic.F90 (code 1)
make[2]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/physics/GFS_surface_generic.F90.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [all] Error 2

@climbfuji
Copy link
Copy Markdown
Collaborator

Compilation fails with this error message:

+ make -j 8 VERBOSE=1
/gpfs/hps3/emc/meso/save/Dusan.Jovic/ufs/pr927/ufs-weather-model/FV3/ccpp/physics/physics/GFS_surface_generic.F90(294): error #6451: A dummy argument name is required in this context.   [DTF]
        real(kind=kind_phys),                   intent(in) :: dtf
--------------------------------------------------------------^                                                                                                                                                      
compilation aborted for /gpfs/hps3/emc/meso/save/Dusan.Jovic/ufs/pr927/ufs-weather-model/FV3/ccpp/physics/physics/GFS_surface_generic.F90 (code 1)
make[2]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/physics/GFS_surface_generic.F90.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [all] Error 2

I was expecting something like this, and I have more questions on that variable - dtf was removed from the argument list, but neither the declaration that Dusan pointed out nor the entry in the CCPP metadata was removed. This shouldn't compile (and it doesn't). @grantfirl FYI

@HelinWei-NOAA
Copy link
Copy Markdown
Collaborator Author

HelinWei-NOAA commented Nov 29, 2021 via email

@DusanJovic-NOAA
Copy link
Copy Markdown
Collaborator

@HelinWei-NOAA Please update your fv3atm branch and then your ufs-weather-model branch.

@MinsukJi-NOAA
Copy link
Copy Markdown
Contributor

I will make a PR to @HelinWei-NOAA's branch for the regional CI fix.

@HelinWei-NOAA
Copy link
Copy Markdown
Collaborator Author

I will make a PR to @HelinWei-NOAA's branch for the regional CI fix.

I just merged this PR to my branch.

@DusanJovic-NOAA
Copy link
Copy Markdown
Collaborator

WCOSS RT log files:
/scratch1/NCEPDEV/stmp2/Dusan.Jovic/pr927/RegressionTests_wcoss_cray.log
/scratch1/NCEPDEV/stmp2/Dusan.Jovic/pr927/RegressionTests_wcoss_dell_p3.log

@HelinWei-NOAA please commit these two log files

@HelinWei-NOAA
Copy link
Copy Markdown
Collaborator Author

WCOSS RT log files: /scratch1/NCEPDEV/stmp2/Dusan.Jovic/pr927/RegressionTests_wcoss_cray.log /scratch1/NCEPDEV/stmp2/Dusan.Jovic/pr927/RegressionTests_wcoss_dell_p3.log

@HelinWei-NOAA please commit these two log files

done

@junwang-noaa junwang-noaa merged commit 5a461c1 into ufs-community:develop Dec 2, 2021
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.

7 participants