Skip to content

Commit

Permalink
test pull request (#12)
Browse files Browse the repository at this point in the history
* First test

* Change branch name

* github event name...

* change to tests/ci dir

* change repo name

* print out stderr

* try recursive checkout

* checkout myself

* in a hurry

* fetch owner id

* Make setup depend on prcheck

* update with fv3 & ccpp/physics updates in order to turn the NSST model on in the coupled model (Replace PR ufs-community#453) (ufs-community#483)

* point to fv3 branch
* Add one more test cpld_control_nsst to test added ccpp suite (FV3_GFS_v15p2_couplednsst)
* Modify rt.conf to add FV3_GFS_v15p2_couplednsst
* Modify rt.conf to add a new test, cpld_bmarkfrac_v16_nsst,  remove test cpld_control_nsst
* Modify tests/tests/cpld_bmarkfrac_v16_nsst: 1. cpld_bmarkfrac_v16 to cpld_bmarkfrac_v16_nsst. 2. export NSTF_NAME=2,1,0,0,0 to export nstf_name=2,1,0,0,0.
* Modify input.benchmark_v16.nml.IN & cpld_bmarkfrac_v16_nsst for a consistent definition of nstf_name namelist
* Modify cpld_bmarkfrac_v16_nsst by moving the NSTF_NAME to the namelist field updates section
* RegressionTests_orion.intel.log of the rt run and BL_DATE=20210406 in rt.sh
* RT JOBS PASSED: hera.intel. Log file uploaded.
* run-ci, commit 7 RegressionTest log files
* Push RegressionTests_wcoss_dell_p3.log

Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>

* remove develop

* quiet git commands. run-ci

* Update CMEPS for latest ESCOMP/master; Update PIO to 2.5.2; Refactor modules (ufs-community#492)


* update ufs for CMEPS master with PIO changes
* update pio to 2.5.2 across platforms
* replace variable SUITE_NAME with CCPP_SUITE
* Merge remote-tracking branch 'DusanJovic/module_common' into feature/updcmeps
* switch to h-nems area on jet

Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>

* debug this again...

* debug again

* debug continues

* missed repo field

* remove debug related texts

* remove -x flag. run-ci

* reduce sleep time

* diag

* diag2

* Fix pr_uid

* diag again

Co-authored-by: XuLi-NOAA <55100838+XuLi-NOAA@users.noreply.github.com>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
  • Loading branch information
6 people authored Apr 12, 2021
1 parent 1ed0f52 commit 3564475
Show file tree
Hide file tree
Showing 69 changed files with 2,021 additions and 2,598 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/aux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ jobs:
- name: Notify the PR author
run: |
comment=$(cat comment_file)
echo "comment is $comment"
url=$GITHUB_API_URL/repos/$GITHUB_REPOSITORY
echo "url is $url"
head_sha=${{ github.event.workflow_run.head_sha }}
echo "head_sha is $head_sha"
cd $GITHUB_WORKSPACE/tests/ci
pr_number=$(curl -sS -H "$app" $url/pulls | ./json_helper.py get_pr $head_sha)
echo "pr_number is $pr_number"
if [[ -n $comment && -n $pr_number ]]; then
curl -sS -X POST -H "$app" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" $url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
fi
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,18 @@ jobs:
echo "This is a pull_request event. Check."
head_sha=${{ github.event.pull_request.head.sha }}
git clone -q ${{ github.event.pull_request.head.repo.git_url }} .
git checkout -q $head_sha
git submodule -q update --init --recursive
echo "head_sha is $head_sha"
git clone ${{ github.event.pull_request.head.repo.git_url }} .
git checkout $head_sha
git submodule update --init --recursive
cd $GITHUB_WORKSPACE/tests/ci
url=$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/pulls
pr_number=$(curl -sS -H "$app" $url | ./json_helper.py get_pr $head_sha)
pr_uid=${{ github.event.pull_request.head.owner.login }}
comment_body="$(./repo-check.sh $pr_uid 2>/dev/null)"
echo "pr_number is $pr_number"
pr_uid=${{ github.event.pull_request.head.repo.owner.login }}
echo "pr_uid is $pr_uid"
comment_body="$(./repo-check.sh $pr_uid)"
if [[ -n $comment_body ]]; then
echo "Repos are not up to date"
Expand Down
4 changes: 1 addition & 3 deletions CMEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ endif()
list(APPEND _nems_util_files
CMEPS/util/shr_abort_mod.F90
CMEPS/util/shr_log_mod.F90
CMEPS/util/shr_pio_mod.F90
CMEPS/util/shr_sys_mod.F90
CMEPS/util/shr_flux_mod.F90
CMEPS/util/shr_mpi_mod.F90
Expand Down Expand Up @@ -66,8 +65,7 @@ list(APPEND _mediator_files
CMEPS/mediator/med_phases_post_wav_mod.F90)

list(APPEND _mediator_defs ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR}
ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR}
INTERNAL_PIO_INIT)
ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR})

### Create target library and set PUBLIC interfaces on the library
add_library(cmeps STATIC ${_nems_util_files} ${_mediator_files})
Expand Down
20 changes: 1 addition & 19 deletions modulefiles/cheyenne.gnu/fv3 → modulefiles/ufs_cheyenne.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,4 @@ module load hpc/1.1.0
module load hpc-gnu/9.1.0
module load hpc-mpt/2.22

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,4 @@ module load hpc/1.1.0
module load hpc-gnu/9.1.0
module load hpc-mpt/2.22

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common_debug
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,4 @@ module load hpc/1.1.0
module load hpc-intel/19.1.1
module load hpc-mpt/2.22

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,4 @@ module load hpc/1.1.0
module load hpc-intel/19.1.1
module load hpc-mpt/2.22

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common_debug
21 changes: 21 additions & 0 deletions modulefiles/ufs_common
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#%Module

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
21 changes: 21 additions & 0 deletions modulefiles/ufs_common_debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#%Module

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
25 changes: 3 additions & 22 deletions modulefiles/gaea.intel/fv3 → modulefiles/ufs_gaea.intel
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ module rm netcdf
module load intel/18.0.6.288
module load cray-mpich/7.7.11
module load cray-python/3.7.3.2
# Needed at runtime:
module load alps

module load cmake/3.17.0
setenv CMAKE_C_COMPILER cc
Expand All @@ -26,25 +28,4 @@ module load hpc/1.1.0
module load hpc-intel/18.0.6.288
module load hpc-cray-mpich/7.7.11

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4

# Needed at runtime:
module load alps
module load ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ module rm netcdf
module load intel/18.0.6.288
module load cray-mpich/7.7.11
module load cray-python/3.7.3.2
# Needed at runtime:
module load alps

module load cmake/3.17.0
setenv CMAKE_C_COMPILER cc
Expand All @@ -26,25 +28,4 @@ module load hpc/1.1.0
module load hpc-intel/18.0.6.288
module load hpc-cray-mpich/7.7.11

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4

# Needed at runtime:
module load alps
module load ufs_common_debug
21 changes: 1 addition & 20 deletions modulefiles/hera.gnu/fv3 → modulefiles/ufs_hera.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,5 @@ module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
module load hpc/1.1.0
module load hpc-gnu/9.2.0
module load hpc-mpich/3.3.2
module load mpich/3.3.2

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common
20 changes: 1 addition & 19 deletions modulefiles/hera.intel/fv3 → modulefiles/ufs_hera.intel
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,4 @@ module load hpc/1.1.0
module load hpc-intel/18.0.5.274
module load hpc-impi/2018.0.4

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,4 @@ module load hpc/1.1.0
module load hpc-intel/18.0.5.274
module load hpc-impi/2018.0.4

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common_debug
20 changes: 1 addition & 19 deletions modulefiles/jet.intel/fv3 → modulefiles/ufs_jet.intel
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,4 @@ module load hpc/1.1.0
module load hpc-intel/18.0.5.274
module load hpc-impi/2018.4.274

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,4 @@ module load hpc/1.1.0
module load hpc-intel/18.0.5.274
module load hpc-impi/2018.4.274

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4
module load ufs_common_debug
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 3564475

Please sign in to comment.