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

Clean up the input data directory, move diag_table to ufs-weather-model and set up C768 atm-only test #921

Merged
merged 43 commits into from
Dec 6, 2021

Conversation

junwang-noaa
Copy link
Collaborator

@junwang-noaa junwang-noaa commented Nov 17, 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.

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

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

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 responsibility to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

Several code changes are made in this PR:

  1. the input data directory was cleaned up.
    a) One sets of CO2 data are now located in FV3_fix/fix_co2_proj directory, all other CO2 data located under FV3_input are removed.
    b) The common fix files are moved to FV3_fix directory. Only the resolution/scheme dependent fix files are in the FV3_input directories.
    c) The solarconstant_noaa_an.txt used in global and coupled tests was updated to the latest version HAFS/regional tests use.
    d) Since all the tests in rt.conf are using the 2015 ozone scheme, the ozone data global_o3prdlos.f77 was now copied from ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77. H2o fix file global_h2oprdlos.f77 are now in FV3_fix directory,
    e)The data directories that are not used in RT, e.g. FV3_hafs_regional_input_data, FV3_input_data_hafs, FV3_nest_input_data are removed.
    f) The old ww3 data directories, WW3_input_data_20210621,WW3_input_data_20210908 and WW3_input_data_20211101 are also removed.
  2. The diag_tables used by the RT tests are moved to tests/parm/diag_table. The diag_tables and field_tables under the input data directory are removed. The date in several diag_tables used by global control and related tests are corrected from 2016100300 to the new IC 2021032206. The diag_table for regional_qulit related tests are updated to be consistent with regional_control.
  3. A high resolution C768 atmosphere only test was created.

A new input data directory was created on hera: /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/input-data-20211015 (may change to the commit date when it is available).

The following test results are changed due to input data and source code changes:

  1. cpld tests
  2. global tests including atm-wave and atm-aerosol tests
  3. regional related tests
  4. HAFS tests

The following test results do not change:

  1. datm-cdeps tests

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!)

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)

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss_cray
  • wcoss_dell_p3
  • opnReqTest for newly added/changed feature
  • CI

Dependencies

FV3atm: #PR434
ccpp-physics: #PR787

@junwang-noaa junwang-noaa marked this pull request as ready for review November 17, 2021 21:04
@junwang-noaa junwang-noaa added Baseline Updates Current baselines will be updated. input data change Input data change labels Nov 18, 2021
@DeniseWorthen
Copy link
Collaborator

I've checked the lwnet exported by the ATM in this PR and using the hash (5a20ea4) which is one prior to Moorthi's sfc emissivity PR. I checked both the initial field being passed by the ATM at startup as well as at the end of the first fast coupling loop. In both cases, the values are extremely similar. This is the value across the mid-point of the Tile1 (approx the equator) after about 1 hour. The dots are from 5a20ea4; the solid line is from this PR.

Screen Shot 2021-12-01 at 11 18 25 AM

):

@climbfuji
Copy link
Collaborator

I've checked the lwnet exported by the ATM in this PR and using the hash (5a20ea4) which is one prior to Moorthi's sfc emissivity PR. I checked both the initial field being passed by the ATM at startup as well as at the end of the first fast coupling loop. In both cases, the values are extremely similar. This is the value across the mid-point of the Tile1 (approx the equator) after about 1 hour. The dots are from 5a20ea4; the solid line is from this PR.

Screen Shot 2021-12-01 at 11 18 25 AM

):

Thanks, Denise! Did you also check for restart reproducibility?

@junwang-noaa
Copy link
Collaborator Author

@MinsukJi-NOAA CI test still failed, can you take a look?

@MinsukJi-NOAA
Copy link
Contributor

@MinsukJi-NOAA CI test still failed, can you take a look?

New input data image is required on the cloud. Will post a comment when ready.

@MinsukJi-NOAA
Copy link
Contributor

@junwang-noaa please make the following changes for CI:

diff --git a/tests/ci/ci.sh b/tests/ci/ci.sh
index b4bd89f..4f1052a 100755
--- a/tests/ci/ci.sh
+++ b/tests/ci/ci.sh
@@ -75,7 +75,7 @@ if [ $BUILD = "true" ]; then
 elif [ $RUN == "true" ]; then
 
   docker volume rm -f DataVolume >/dev/null &&
-    docker run -d --rm -v DataVolume:/tmp minsukjinoaa/input-data:20210930
+    docker run -d --rm -v DataVolume:/tmp minsukjinoaa/input-data:20211203
 
   docker create -u builder -e "CI_TEST=true" -e "USER=builder" \
                 -e "RT_MACHINE=linux.gnu" -e "RT_COMPILER=gnu" \

Since all RT's passed already, maybe we should skip the CI to not delay the PR.

@junwang-noaa junwang-noaa merged commit b52f83c into ufs-community:develop Dec 6, 2021
@junwang-noaa junwang-noaa deleted the diagtable_co2 branch December 6, 2021 15:20
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. input data change Input data change
Projects
None yet
6 participants