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

Rename Fortran variables and CCPP standard names / long names of surface composites from ocean to water #508

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Apr 5, 2021

PR Checklist

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

  • If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

Description

This PR updates the submodule pointers for the changes described in the associated PRs below.

Note that this PR contains all the changes in #479. #479 can be merged independently before this PR, or as part of this PR.

No baseline changes from this set of PRs (but potentially from #479 as described in that PR).

Issue(s) addressed

Fixes NCAR/ccpp-physics#455.

Testing

Regression tests were run against the existing baselines on hera with Intel and GNU. All tests pass if commit NCAR/ccpp-physics@edc9194 is retained, otherwise the two coupled model runs (fractional and binary mask) using high-res. ocean have slightly different results (see discussion in NCAR/ccpp-physics#596; all other tests still pass).

rt_hera_gnu_against_existing.log
rt_hera_intel_against_existing.log

Final regression testing will be done when it is time for these PRs to go in.

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss_cray
  • wcoss_dell_p3

Dependencies

NCAR/ccpp-physics#609
NOAA-EMC/fv3atm#271
#508

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Apr 6, 2021

@climbfuji Please coordinate with physics/wave group on the sfc file output field name changes to check the impact on downstream jobs.

@climbfuji
Copy link
Collaborator Author

climbfuji commented Apr 6, 2021 via email

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Apr 6, 2021 via email

@climbfuji
Copy link
Collaborator Author

@yangfanglin @SMoorthi-emc I am supposed to find out from the physics and wave groups if changing the name of variables Sfcprop%zorlw to Sfcprop%zorlwav and consecutively Sfcprop%zorlo to Sfcprop%zorlw has any effect on downstream applications. I have no idea whom to ask except the two of you. These changes are in restart files only. Do restart files get used by other applications than the UFS itself? I sincerely hope not, but I would like to get confirmation. If you don't know, can you point me to the right people, please? Thanks very much in advance.

@yangfanglin
Copy link
Collaborator

yangfanglin commented Apr 6, 2021 via email

@SMoorthi-emc
Copy link
Contributor

I added zorlw in the latest model because the wave and atmosphere interact.
It should not have any impact on any other model at this time as I don't think restart surface files are not used outside of the model.

@SMoorthi-emc
Copy link
Contributor

SMoorthi-emc commented Apr 6, 2021 via email

@climbfuji
Copy link
Collaborator Author

climbfuji commented Apr 6, 2021 via email

junwang-noaa pushed a commit that referenced this pull request Apr 15, 2021
…2 threading (#520)

* changed .gitmodules to point to merra2  fv3atm
* Update .gitmodules and submodule pointer for fv3atm for code review and testing
* update submodule pointer for fv3atm
* Update regression test baseline date in tests/rt.sh; run-ci
* RT JOBS PASSED: hera.gnu. Log file uploaded.
* RT JOBS PASSED: gaea.intel. Log file uploaded.
* RT JOBS PASSED: hera.intel. Log file uploaded.
* RT JOBS PASSED: orion.intel. Log file uploaded.
* Regression test logs for wcoss_dell_p3 and wcoss_cray
* Regression test logs for cheyenne.gnu
* Regression test logs for cheyenne.intel
* Regression test log for jet.intel
* Revert change to .gitmodules and update submodule pointer for fv3atm
Co-authored-by: anning.cheng <anning.cheng@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
@climbfuji
Copy link
Collaborator Author

This was merged as part of #520, but didn't get flagged as merged automatically because we do squashed merges in the ufs-weather-model.

@climbfuji climbfuji closed this Apr 15, 2021
pjpegion pushed a commit to NOAA-PSL/ufs-weather-model that referenced this pull request Apr 4, 2023
…ccpp_types (ufs-community#508)

* Split GFS_typedefs.F90: move GFS_interstitial_type to CCPP_typedefs.F90; Rename CCPP_interstitial to GFDL_interstitial; Import ccpp_t from ccpp_types instead of ccpp_api
* Add bugfix in ccpp/data/GFS_typedefs.meta: mark input_nml_file as active only if the number of lines in the file is greater than zero
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
… rocoto. (#508)

* Increase precision of degs_per_radian to 15 digits.

* Use generic date util.

* Add fake slurm commands for rocoto usage on linux.

* Modify machine files for linux and mac.

* Modify linux and macos wflow modules.

* Fix unittest.

* Remove openmpi module loading in linux/mac build modulefile.

* Fix sacct.

* Fix crontab unspecified USER issue.

* Add EXTRN_MDL_DATA_STORES to macos.

* Add more states to squeue/sacct.

* Add a taskthrottle=1 option for linux/mac.

* Don't specifiy number of processes for mpirun.

* Get exit code directly instead of from log file.

* Set taskthrottle to 1000 by default.

* Fix linux lmod path bug.

* Set stack size to unlimited for linux/mac.

* Fix unittest.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update metadata for composite variables from ocean to water
4 participants