Rename CCPP branches from master to main, several small changes in ccpp-physics #572

climbfuji · 2021-05-12T22:24:36Z

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.
If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

Description

This PR and dependencies below change the name of the ccpp-framework and ccpp-physics branches from "main" to "master" and, in addition, include a few small updates and bugfixes in ccpp-framework and ccpp-physics.

Also included: bug fixes for wcoss_dell_p3 modulefiles to correctly load cmake (from @DusanJovic-NOAA)

Update 2021/05/14

This PR now contains the following two PRs:

Change CI triggering method #570 Change CI triggering method from @MinsukJi-NOAA; no update to input data, no changes to regression test results
Add a new cdeps test #574, Add a new cdeps test from @binli2337; additional files required that can be added to existing input data directory, but no changes to regression test results

Update 2021/05/17

The changes in file GFS_suite_interstitial.F90 (use assumed-size array declarations) in ccpp-physics PR https://github.com/NCAR/ccpp-physics/pull/652/files change the regression test baseline for the following three tests with Intel in PROD mode:

cpld_bmarkfrac_v16
cpld_bmarkfrac_wave
cpld_bmarkfrac_wave_v16

Note that only one file is different, the model run itself completes w/o changes to the final checksums (this is the same for all three tests):

Dom.Heinzeller@hfe06:/scratch1/BMC/gmtb/Dom.Heinzeller/ufs-weather-model/ufs-weather-model-emc-develop-20210512-various-ccpp-changes/intel/tests [intel|gsd-hpcs]> cat log_hera.intel/rt_025_cpld_bmarkfrac_wave.log
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210513/INTEL/cpld_bmarkfrac_wave
working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_265707/cpld_bmarkfrac_wave
Checking test 025 cpld_bmarkfrac_wave results ....
 Comparing phyf024.tile1.nc .........OK
 Comparing phyf024.tile2.nc .........OK
 Comparing phyf024.tile3.nc .........OK
 Comparing phyf024.tile4.nc .........OK
 Comparing phyf024.tile5.nc .........OK
 Comparing phyf024.tile6.nc .........OK
 Comparing dynf024.tile1.nc .........OK
 Comparing dynf024.tile2.nc .........OK
 Comparing dynf024.tile3.nc .........OK
 Comparing dynf024.tile4.nc .........OK
 Comparing dynf024.tile5.nc .........OK
 Comparing dynf024.tile6.nc .........OK
 Comparing 20130402.000000.out_grd.gwes_30m .........OK
 Comparing 20130402.000000.out_pnt.points .........OK
 Comparing 20130402.000000.restart.gwes_30m .........OK
 Comparing RESTART/coupler.res .........OK
 Comparing RESTART/fv_core.res.nc .........OK
 Comparing RESTART/fv_core.res.tile1.nc .........OK
 Comparing RESTART/fv_core.res.tile2.nc .........OK
 Comparing RESTART/fv_core.res.tile3.nc .........OK
 Comparing RESTART/fv_core.res.tile4.nc .........OK
 Comparing RESTART/fv_core.res.tile5.nc .........OK
 Comparing RESTART/fv_core.res.tile6.nc .........OK
 Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
 Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
 Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
 Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
 Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
 Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
 Comparing RESTART/fv_tracer.res.tile1.nc .........OK
 Comparing RESTART/fv_tracer.res.tile2.nc .........OK
 Comparing RESTART/fv_tracer.res.tile3.nc .........OK
 Comparing RESTART/fv_tracer.res.tile4.nc .........OK
 Comparing RESTART/fv_tracer.res.tile5.nc .........OK
 Comparing RESTART/fv_tracer.res.tile6.nc .........OK
 Comparing RESTART/phy_data.tile1.nc .........OK
 Comparing RESTART/phy_data.tile2.nc .........OK
 Comparing RESTART/phy_data.tile3.nc .........OK
 Comparing RESTART/phy_data.tile4.nc .........OK
 Comparing RESTART/phy_data.tile5.nc .........OK
 Comparing RESTART/phy_data.tile6.nc .........OK
 Comparing RESTART/sfc_data.tile1.nc .........OK
 Comparing RESTART/sfc_data.tile2.nc .........OK
 Comparing RESTART/sfc_data.tile3.nc .........OK
 Comparing RESTART/sfc_data.tile4.nc .........OK
 Comparing RESTART/sfc_data.tile5.nc .........OK
 Comparing RESTART/sfc_data.tile6.nc .........OK
 Comparing RESTART/MOM.res.nc .........OK
 Comparing RESTART/MOM.res_1.nc .........OK
 Comparing RESTART/MOM.res_2.nc .........OK
 Comparing RESTART/MOM.res_3.nc .........OK
 Comparing RESTART/iced.2013-04-02-00000.nc .........OK
 Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc ............ALT CHECK......NOT OK
  0: The total amount of wall time                        = 917.045422
Test 025 cpld_bmarkfrac_wave FAIL

This difference is acceptable and due to the Intel compiler optimization. The new regression test baseline date is 20210517.

Issue(s) addressed

See associated PRs listed below.

Testing

Regression tests will be run on all tier-1 platforms prior to committing the chaanges.

Dependencies

NCAR/ccpp-framework#372
NCAR/ccpp-physics#658
NOAA-EMC/fv3atm#300
#572

* CI runs when run-ci label is created * Old method of specifying run-ci in commit message is obsolete * Push event no longer triggers the CI * Minor fixes in aux.yml

…nd testing

…r-model into ccpp_rename_master_and_small_changes

MinsukJi-NOAA · 2021-05-14T14:24:05Z

@climbfuji, #570 has been updated to the latest develop. However you want to incorporate it into your PR... Thanks!

…-weather-model into ccpp_rename_master_and_small_changes

…fs-weather-model into ccpp_rename_master_and_small_changes

MinsukJi-NOAA · 2021-05-14T16:53:57Z

CI test needs to be skipped because of the CI-related changes in this PR; simply do not add the 'run-ci' label.

on-behalf-of @ufs-community

climbfuji · 2021-05-18T04:14:19Z

Machine: gaea
Compiler: intel
Job: RT
Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/643540985/20210517224508/ufs-weather-model
Please manually delete: /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_36695
Test fv3_wrtGauss_netcdf_parallel 037 failed in check_result failed
Test fv3_wrtGauss_netcdf_parallel 037 failed in run_test failed
Please make changes and add the following label back:
gaea-intel-RT

This was my stupid mistake, running verify step again.

on-behalf-of @ufs-community

DeniseWorthen · 2021-05-18T11:02:24Z

On Dell, I had two errors creating baselines:

disk quota error (fv3_rrfs_v1alpha)
datm_cdeps_multiple_files_cfsr failed with error [0] Abort with message No such file or directory in file /usrx/local/nceplibs/dev/hpc-stack/src/hpc-stack/pkg/pio 2.5.2/src/clib/pioc_support.c at line 2747

I was able to generate the fv3_rrfs_v1apha baseline after deleting the oldest baseline (develop-20210301). The datm failed the second time with the same error.

Run directory: /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_25766/datm_cdeps_multiple_files_cfsr
Build directory: /gpfs/dell2/emc/modeling/noscrub/Denise.Worthen/ufs-weather-model

Other than this datm test, the baseline is ready for verify on dell-p3.

binli2337 · 2021-05-18T12:31:31Z

@DeniseWorthen A few new input files needed by this new cdeps test were not on this wcoss-p3. I have copied the new input files to the input-data-20210518 directory. Please try this test again. Thanks!

….com/climbfuji/ufs-weather-model into ccpp_rename_master_and_small_changes

climbfuji · 2021-05-18T17:06:44Z

Finally, all tests passed. As per @MinsukJi-NOAA 's instruction, we need to skip the CI tests for this commit. I will merge ccpp-framework and ccpp-physics now.

junwang-noaa

Code looks good to me. Need to change the submodules back to official repo.

DeniseWorthen · 2021-05-18T17:36:03Z

We need to revert the cdeps gitmodule.

climbfuji · 2021-05-18T17:37:34Z

We need to revert the cdeps gitmodule.

I am confused, this change is from @binli2337 and has been used for all tests?

DeniseWorthen · 2021-05-18T17:39:25Z

Yes, you merged it to this PR branch at 2bf1c9e, right?

climbfuji · 2021-05-18T17:40:44Z

Yes, you merged it to this PR branch at 2bf1c9e, right?

I pulled in #574 without any further changes to CDEPS.

DeniseWorthen · 2021-05-18T17:45:30Z

The gitmodules in this PR still points to a @binli2337 branch of CDEPS. That was merged to develop I believe.

climbfuji · 2021-05-18T17:51:28Z

The gitmodules in this PR still points to a @binli2337 branch of CDEPS. That was merged to develop I believe.

Got it. Let me try to update the submodule pointer, hopefully the code is still the same.

…DEPS

climbfuji · 2021-05-18T17:55:27Z

The gitmodules in this PR still points to a @binli2337 branch of CDEPS. That was merged to develop I believe.

Got it. Let me try to update the submodule pointer, hopefully the code is still the same.

This should be good now, please check. Code is identical before/after update of submodule pointer.

DeniseWorthen

Looks good to me.

binli2337

Updated files look good.

MinsukJi-NOAA and others added 6 commits May 12, 2021 14:34

Change CI triggering method ufs-community#558

15cd9d4

* CI runs when run-ci label is created * Old method of specifying run-ci in commit message is obsolete * Push event no longer triggers the CI * Minor fixes in aux.yml

Temporarily change no_instances for test purpose

ee2d4c9

Clean up

43c3b00

More testing

e7c057a

Revert back params used for testing

16d3730

Update .gitmodules and submodule pointer for fv3atm for code review a…

74bbe48

…nd testing

This was referenced May 12, 2021

Rename CCPP branches from master to main, several small changes in ccpp-physics NOAA-EMC/fv3atm#300

Merged

Wrapper PR for #648 and #652 NCAR/ccpp-physics#658

Merged

MinsukJi-NOAA and others added 3 commits May 12, 2021 21:14

Delete unncessary echo's

31c42f4

Add a new cdeps test.

b5e2207

Update submodule pointer for fv3atm

fb86e7f

climbfuji mentioned this pull request May 13, 2021

Add pull request and issue templates NCAR/ccpp-framework#372

Merged

climbfuji marked this pull request as ready for review May 13, 2021 19:06

climbfuji and others added 4 commits May 13, 2021 15:41

Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…

934db36

…r-model into ccpp_rename_master_and_small_changes

Merge branch 'develop' into feature/data_files

43afea3

Merge remote-tracking branch 'upstream/develop' into feature/ci-label

cda9e15

Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…

23fbfd0

…r-model into ccpp_rename_master_and_small_changes

climbfuji mentioned this pull request May 14, 2021

Add a new cdeps test #574

Closed

13 tasks

climbfuji added 3 commits May 14, 2021 10:03

Update submodule pointer for fv3atm

f9562e6

Merge branch 'feature/data_files' of https://github.com/binli2337/ufs…

2bf1c9e

…-weather-model into ccpp_rename_master_and_small_changes

Merge branch 'feature/ci-label' of https://github.com/MinsukJi-NOAA/u…

e172bc0

…fs-weather-model into ccpp_rename_master_and_small_changes

climbfuji added New Input Data Req'd This PR requires new data to be sync across platforms Waiting for Reviews The PR is waiting for reviews from associated component PR's. labels May 14, 2021

climbfuji mentioned this pull request May 14, 2021

Change CI triggering method #570

Closed

13 tasks

climbfuji added the hera-gnu-RT label May 14, 2021

BrianCurtis-NOAA removed the hera-gnu-RT label May 14, 2021

RT JOBS PASSED: hera.gnu. Log file uploaded.

8fc15f8

on-behalf-of @ufs-community

climbfuji added the cheyenne-gnu-RT label May 14, 2021

BrianCurtis-NOAA removed the gaea-intel-RT label May 18, 2021

RT JOBS PASSED: gaea.intel. Log file uploaded.

fa6e674

on-behalf-of @ufs-community

DeniseWorthen and others added 3 commits May 18, 2021 14:30

add wcoss_dell_p3 log

3bf80ea

Regression test logs for orion.intel

022357e

Merge branch 'ccpp_rename_master_and_small_changes' of https://github…

46490a9

….com/climbfuji/ufs-weather-model into ccpp_rename_master_and_small_changes

junwang-noaa approved these changes May 18, 2021

View reviewed changes

climbfuji requested review from DusanJovic-NOAA, MinsukJi-NOAA, binli2337 and DeniseWorthen May 18, 2021 17:26

Revert change to .gitmodules and update submodule pointer for fv3atm

7f3b35a

MinsukJi-NOAA approved these changes May 18, 2021

View reviewed changes

climbfuji added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label May 18, 2021

Revert CDEPS change to .gitmodules and update submodule pointer for C…

1b022b0

…DEPS

DeniseWorthen approved these changes May 18, 2021

View reviewed changes

binli2337 approved these changes May 18, 2021

View reviewed changes

DusanJovic-NOAA approved these changes May 18, 2021

View reviewed changes

climbfuji merged commit 19e49ec into ufs-community:develop May 18, 2021

MinsukJi-NOAA mentioned this pull request May 18, 2021

Change CI triggering method #558

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename CCPP branches from master to main, several small changes in ccpp-physics #572

Rename CCPP branches from master to main, several small changes in ccpp-physics #572

climbfuji commented May 12, 2021 •

edited

Loading

MinsukJi-NOAA commented May 14, 2021

MinsukJi-NOAA commented May 14, 2021

climbfuji commented May 18, 2021

DeniseWorthen commented May 18, 2021

binli2337 commented May 18, 2021

climbfuji commented May 18, 2021

junwang-noaa left a comment

DeniseWorthen commented May 18, 2021

climbfuji commented May 18, 2021

DeniseWorthen commented May 18, 2021

climbfuji commented May 18, 2021

DeniseWorthen commented May 18, 2021

climbfuji commented May 18, 2021

climbfuji commented May 18, 2021

DeniseWorthen left a comment

binli2337 left a comment

Rename CCPP branches from master to main, several small changes in ccpp-physics #572

Rename CCPP branches from master to main, several small changes in ccpp-physics #572

Conversation

climbfuji commented May 12, 2021 • edited Loading

PR Checklist

Description

Issue(s) addressed

Testing

Dependencies

MinsukJi-NOAA commented May 14, 2021

MinsukJi-NOAA commented May 14, 2021

climbfuji commented May 18, 2021

DeniseWorthen commented May 18, 2021

binli2337 commented May 18, 2021

climbfuji commented May 18, 2021

junwang-noaa left a comment

Choose a reason for hiding this comment

DeniseWorthen commented May 18, 2021

climbfuji commented May 18, 2021

DeniseWorthen commented May 18, 2021

climbfuji commented May 18, 2021

DeniseWorthen commented May 18, 2021

climbfuji commented May 18, 2021

climbfuji commented May 18, 2021

DeniseWorthen left a comment

Choose a reason for hiding this comment

binli2337 left a comment

Choose a reason for hiding this comment

climbfuji commented May 12, 2021 •

edited

Loading