From c8b8ffb858cd31657c1c2a8eb826415440ba32fa Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 28 Sep 2022 15:48:10 -0600 Subject: [PATCH 01/59] Add in RRTMGP changes. --- physics/GFS_rrtmgp_cloud_mp.F90 | 37 +++++++++++++++++++++----------- physics/GFS_rrtmgp_cloud_mp.meta | 7 ++++++ physics/radiation_clouds.f | 10 +++++---- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/physics/GFS_rrtmgp_cloud_mp.F90 b/physics/GFS_rrtmgp_cloud_mp.F90 index ca9457b4c..bc8c2172f 100644 --- a/physics/GFS_rrtmgp_cloud_mp.F90 +++ b/physics/GFS_rrtmgp_cloud_mp.F90 @@ -50,7 +50,8 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic relhum, lsmask, xlon, xlat, dx, tv_lay, effrin_cldliq, effrin_cldice, & effrin_cldrain, effrin_cldsnow, tracer, cnv_mixratio, cld_cnv_frac, qci_conv, & deltaZ, deltaZc, deltaP, qc_mynn, qi_mynn, cld_pbl_frac, con_g, con_rd, con_eps, & - con_ttp, doGP_cldoptics_PADE, doGP_cldoptics_LUT, cld_frac, cld_lwp, cld_reliq, & + con_ttp, doGP_cldoptics_PADE, doGP_cldoptics_LUT, doGP_smearclds, & + cld_frac, cld_lwp, cld_reliq, & cld_iwp, cld_reice, cld_swp, cld_resnow, cld_rwp, cld_rerain, precip_frac, & cld_cnv_lwp, cld_cnv_reliq, cld_cnv_iwp, cld_cnv_reice, cld_pbl_lwp, & cld_pbl_reliq, cld_pbl_iwp, cld_pbl_reice, lwp_ex, iwp_ex, lwp_fc, iwp_fc, & @@ -91,7 +92,8 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic uni_cld, & ! Flag for unified cloud scheme lmfdeep2, & ! Flag for mass flux deep convection doGP_cldoptics_LUT, & ! Flag to do GP cloud-optics (LUTs) - doGP_cldoptics_PADE ! (PADE approximation) + doGP_cldoptics_PADE, & ! (PADE approximation) + doGP_smearclds ! If true, add sgs clouds to gridmean clouds real(kind_phys), intent(in) :: & con_g, & ! Physical constant: gravitational constant con_rd, & ! Physical constant: gas-constant for dry air @@ -266,8 +268,9 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic endif call cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_cldrain,& i_cldsnow, i_cldgrpl, p_lev, p_lay, tv_lay, t_lay, tracer, qs_lay, q_lay, & - relhum, con_g, con_rd, con_eps, alpha0, lwp_ex, iwp_ex, lwp_fc, iwp_fc, & - cld_frac, cld_lwp, cld_iwp, cld_swp, cld_rwp, cond_cfrac_onRH = .true.) + relhum, con_ttp, con_g, con_rd, con_eps, alpha0, cnv_mixratio, lwp_ex, & + iwp_ex, lwp_fc, iwp_fc, cld_frac, cld_lwp, cld_iwp, cld_swp, cld_rwp, & + cond_cfrac_onRH = .true., doGP_smearclds = doGP_smearclds) endif ! Bound effective radii for RRTMGP, LUT's for cloud-optics go from @@ -658,13 +661,14 @@ end subroutine cloud_mp_uni !! \section cloud_mp_thompson_gen General Algorithm subroutine cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_cldrain,& i_cldsnow, i_cldgrpl, p_lev, p_lay, tv_lay, t_lay, tracer, qs_lay, q_lay, relhum, & - con_g, con_rd, con_eps, alpha0, lwp_ex, iwp_ex, lwp_fc, iwp_fc, cld_frac, cld_lwp,& - cld_iwp, cld_swp, cld_rwp, cond_cfrac_onRH) + con_ttp, con_g, con_rd, con_eps, alpha0, cnv_mixratio, lwp_ex, iwp_ex, lwp_fc, & + iwp_fc, cld_frac, cld_lwp, cld_iwp, cld_swp, cld_rwp, cond_cfrac_onRH, doGP_smearclds) implicit none ! Inputs logical, intent(in), optional :: & - cond_cfrac_onRH + cond_cfrac_onRH, & ! If true, cloud-fracion set to unity when rh>99% + doGP_smearclds ! If true, add sgs clouds to gridmean clouds integer, intent(in) :: & nCol, & ! Number of horizontal grid points nLev, & ! Number of vertical layers @@ -676,6 +680,7 @@ subroutine cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_c i_cldsnow, & ! cloud snow amount. i_cldgrpl ! cloud groupel amount. real(kind_phys), intent(in) :: & + con_ttp, & ! Triple point temperature of water (K) con_g, & ! Physical constant: gravitational constant con_rd, & ! Physical constant: gas-constant for dry air con_eps, & ! Physical constant: gas constant air / gas constant H2O @@ -686,7 +691,8 @@ subroutine cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_c qs_lay, & ! Saturation vapor pressure (Pa) q_lay, & ! water-vapor mixing ratio (kg/kg) relhum, & ! Relative humidity - p_lay ! Pressure at model-layers (Pa) + p_lay, & ! Pressure at model-layers (Pa) + cnv_mixratio ! Convective cloud mixing-ratio (kg/kg) real(kind_phys), dimension(:,:), intent(in) :: & p_lev ! Pressure at model-level interfaces (Pa) real(kind_phys), dimension(:,:,:),intent(in) :: & @@ -706,16 +712,15 @@ subroutine cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_c cld_rwp ! Cloud rain water path ! Local variables - real(kind_phys) :: tem1, pfac, cld_mr, deltaP + real(kind_phys) :: tem1, pfac, cld_mr, deltaP, tem2 real(kind_phys), dimension(nCol, nLev, min(4,ncnd)) :: cld_condensate integer :: iCol,iLay,l ! Cloud condensate cld_condensate(1:nCol,1:nLev,1) = tracer(1:nCol,1:nLev,i_cldliq) ! -liquid water cld_condensate(1:nCol,1:nLev,2) = tracer(1:nCol,1:nLev,i_cldice) ! -ice water - cld_condensate(1:nCol,1:nLev,3) = tracer(1:nCol,1:nLev,i_cldrain) ! -rain water - cld_condensate(1:nCol,1:nLev,4) = tracer(1:nCol,1:nLev,i_cldsnow) + &! -snow + grapuel - tracer(1:nCol,1:nLev,i_cldgrpl) + cld_condensate(1:nCol,1:nLev,3) = tracer(1:nCol,1:nLev,i_cldrain) ! -rain hydrometeors + cld_condensate(1:nCol,1:nLev,4) = tracer(1:nCol,1:nLev,i_cldsnow) ! -snow hydrometeors cld_lwp(:,:) = 0.0 cld_iwp(:,:) = 0.0 @@ -725,6 +730,12 @@ subroutine cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_c tem1 = 1.0e5/con_g do iLay = 1, nLev-1 do iCol = 1, nCol + ! Add convective cloud to gridmean cloud? + if (doGP_smearclds) then + tem2 = min(1.0, max(0.0, (con_ttp-t_lay(iCol,iLay))*0.05)) + cld_condensate(iCol,iLay,1) = cld_condensate(iCol,iLay,1) + cnv_mixratio(iCol,iLay)*(1._kind_phys - tem2) + cld_condensate(iCol,iLay,2) = cld_condensate(iCol,iLay,2) + cnv_mixratio(iCol,iLay)*tem2 + endif ! Compute liquid/ice condensate path from mixing ratios (kg/kg)->(g/m2) deltaP = abs(p_lev(iCol,iLay+1)-p_lev(iCol,iLay))*0.01 cld_lwp(iCol,iLay) = max(0., cld_condensate(iCol,iLay,1) * tem1 * deltaP) @@ -737,7 +748,7 @@ subroutine cloud_mp_thompson(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldice, i_c cld_frac(iCol,iLay) = 1._kind_phys else cld_mr = cld_condensate(iCol,iLay,1) + cld_condensate(iCol,iLay,2) + & - cld_condensate(iCol,iLay,4) + cld_condensate(iCol,iLay,3) + cld_condensate(iCol,iLay,4) cld_frac(iCol,iLay) = cld_frac_XuRandall(p_lay(iCol,iLay), & qs_lay(iCol,iLay), relhum(iCol,iLay), cld_mr, alpha0) endif diff --git a/physics/GFS_rrtmgp_cloud_mp.meta b/physics/GFS_rrtmgp_cloud_mp.meta index 88530d84c..c142fe9f4 100644 --- a/physics/GFS_rrtmgp_cloud_mp.meta +++ b/physics/GFS_rrtmgp_cloud_mp.meta @@ -455,6 +455,13 @@ dimensions = () type = logical intent = in +[doGP_smearclds] + standard_name = flag_for_implicit_sgs_cloud_in_RRTMGP + long_name = logical flag to impicit SGS cloud in RRTMGP + units = flag + dimensions = () + type = logical + intent = in [cld_frac] standard_name = total_cloud_fraction long_name = layer total cloud fraction diff --git a/physics/radiation_clouds.f b/physics/radiation_clouds.f index edfa94439..e588a7c39 100644 --- a/physics/radiation_clouds.f +++ b/physics/radiation_clouds.f @@ -2164,7 +2164,7 @@ subroutine progcld_thompson_wsm6 & integer :: i, k, id, nf ! --- constant values - real (kind=kind_phys), parameter :: xrc3 = 200. + real (kind=kind_phys), parameter :: xrc3 = 100. ! !===> ... begin here @@ -2181,7 +2181,7 @@ subroutine progcld_thompson_wsm6 & rei (i,k) = re_ice(i,k) rer (i,k) = rrain_def ! default rain radius to 1000 micron res (i,k) = re_snow(i,K) -! tem2d (i,k) = min( 1.0, max( 0.0, (con_ttp-tlyr(i,k))*0.05 ) ) + tem2d (i,k) = min( 1.0, max( 0.0, (con_ttp-tlyr(i,k))*0.05 ) ) clwf(i,k) = 0.0 enddo enddo @@ -2216,8 +2216,10 @@ subroutine progcld_thompson_wsm6 & do k = 1, NLAY-1 do i = 1, IX - cwp(i,k) = max(0.0, clw(i,k,ntcw) * gfac * delp(i,k)) - cip(i,k) = max(0.0, clw(i,k,ntiw) * gfac * delp(i,k)) + cwp(i,k) = max(0.0, (clw(i,k,ntcw)+cnvw(i,k)* + & (1.-tem2d(i,k))) * gfac * delp(i,k)) + cip(i,k) = max(0.0, (clw(i,k,ntiw) + cnvw(i,k)* + & tem2d(i,k)) *gfac * delp(i,k)) crp(i,k) = max(0.0, clw(i,k,ntrw) * gfac * delp(i,k)) csp(i,k) = max(0.0, clw(i,k,ntsw) * gfac * delp(i,k)) enddo From dea43c27075e1f8b571b2196cfaed49f210554d9 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Thu, 29 Sep 2022 13:26:27 -0600 Subject: [PATCH 02/59] Add scientific documentation. --- physics/radiation_clouds.f | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/physics/radiation_clouds.f b/physics/radiation_clouds.f index e588a7c39..e071b48b1 100644 --- a/physics/radiation_clouds.f +++ b/physics/radiation_clouds.f @@ -2212,8 +2212,8 @@ subroutine progcld_thompson_wsm6 & enddo enddo -!> - Compute cloud liquid/ice condensate path in \f$ g/m^2 \f$ . - +!> - Compute total-cloud liquid/ice condensate path in \f$ g/m^2 \f$. +!> The total condensate includes convective condensate. do k = 1, NLAY-1 do i = 1, IX cwp(i,k) = max(0.0, (clw(i,k,ntcw)+cnvw(i,k)* From c635c0503e3909eb9e0ccfd08f4e7a275ec8679d Mon Sep 17 00:00:00 2001 From: dustinswales Date: Fri, 7 Oct 2022 11:18:18 -0600 Subject: [PATCH 03/59] NCAR/ccpp-physics issue 957. --- physics/GFS_rrtmgp_cloud_mp.F90 | 12 +++++++++++- physics/GFS_rrtmgp_cloud_mp.meta | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/physics/GFS_rrtmgp_cloud_mp.F90 b/physics/GFS_rrtmgp_cloud_mp.F90 index bc8c2172f..0d39432f9 100644 --- a/physics/GFS_rrtmgp_cloud_mp.F90 +++ b/physics/GFS_rrtmgp_cloud_mp.F90 @@ -55,7 +55,7 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic cld_iwp, cld_reice, cld_swp, cld_resnow, cld_rwp, cld_rerain, precip_frac, & cld_cnv_lwp, cld_cnv_reliq, cld_cnv_iwp, cld_cnv_reice, cld_pbl_lwp, & cld_pbl_reliq, cld_pbl_iwp, cld_pbl_reice, lwp_ex, iwp_ex, lwp_fc, iwp_fc, & - errmsg, errflg) + cldfra2d, errmsg, errflg) implicit none ! Inputs @@ -136,6 +136,8 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic iwp_ex, & ! Total ice water path from explicit microphysics lwp_fc, & ! Total liquid water path from cloud fraction scheme iwp_fc ! Total ice water path from cloud fraction scheme + real(kind_phys), dimension(:), intent(out) :: & + cldfra2d ! Instantaneous 2D (max-in-column) cloud fraction real(kind_phys), dimension(:,:),intent(inout) :: & cld_frac, & ! Cloud-fraction for stratiform clouds cld_lwp, & ! Water path for stratiform liquid cloud-particles @@ -295,6 +297,14 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic endif endif + ! Instantaneous 2D (max-in-column) cloud fraction + do iCol = 1, nCol + cldfra2d(iCol) = 0._kind_phys + do iLay = 1, nLev-1 + cldfra2d(iCol) = max(cldfra2d(iCol), cld_frac(iCol,iLay)) + enddo + enddo + precip_frac(1:nCol,1:nLev) = cld_frac(1:nCol,1:nLev) end subroutine GFS_rrtmgp_cloud_mp_run diff --git a/physics/GFS_rrtmgp_cloud_mp.meta b/physics/GFS_rrtmgp_cloud_mp.meta index c142fe9f4..12407204a 100644 --- a/physics/GFS_rrtmgp_cloud_mp.meta +++ b/physics/GFS_rrtmgp_cloud_mp.meta @@ -646,6 +646,14 @@ type = real kind = kind_phys intent = inout +[cldfra2d] + standard_name = max_in_column_cloud_fraction + long_name = instantaneous 2D (max-in-column) cloud fraction + units = frac + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + intent = out [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP From 6a726ba200877b3b72bfbd17103bafca163e1993 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 19:43:07 -0600 Subject: [PATCH 04/59] Initial commit --- .github/workflows/ci_scm_ccpp_prebuild.yml | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/ci_scm_ccpp_prebuild.yml diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml new file mode 100644 index 000000000..b83bf70a3 --- /dev/null +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -0,0 +1,35 @@ +name: CI test to run SCM ccpp_prebuild script + +on: [push, pull_request] + +jobs: + build-linux: + + # The type of runner that the job will run on + runs-on: ubuntu-latest + strategy: + max-parallel: 5 + + steps: + + - name: Checkout code + run: | + git clone https://github.com/NCAR/ccpp-scm.git + cd ccpp-scm/ + + - name: Initialize submodules + run: git submodule update --init --recursive + + - name: Set up Python 3.8.5 + uses: actions/setup-python@v3 + with: + python-version: 3.8.5 + + - name: Add conda to system path + run: | + # $CONDA is an environment variable pointing to the root of the miniconda directory + echo $CONDA/bin >> $GITHUB_PATH + - name: Run ccpp_prebuild.py + run: | + mkdir -p /home/runner/work/ccpp-scm/ccpp-scm/scm/bin/ccpp/physics/physics/ + ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From 2437545efd68c039bf1e5cb1aabf21ffe45e9577 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 19:58:50 -0600 Subject: [PATCH 05/59] update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index b83bf70a3..549e37410 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout code run: | git clone https://github.com/NCAR/ccpp-scm.git - cd ccpp-scm/ + cd /home/runner/work/ccpp-scm/ccpp-scm/ - name: Initialize submodules run: git submodule update --init --recursive From a3a049e31d42d0fd8d53bab5beb61120dfc11e47 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:00:10 -0600 Subject: [PATCH 06/59] update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 549e37410..e5d8c2ac7 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -14,6 +14,7 @@ jobs: - name: Checkout code run: | + pwd git clone https://github.com/NCAR/ccpp-scm.git cd /home/runner/work/ccpp-scm/ccpp-scm/ From b26eca1323158e9c13429a658260820b99432a44 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:02:00 -0600 Subject: [PATCH 07/59] update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index e5d8c2ac7..971a9e0c1 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -16,7 +16,7 @@ jobs: run: | pwd git clone https://github.com/NCAR/ccpp-scm.git - cd /home/runner/work/ccpp-scm/ccpp-scm/ + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ - name: Initialize submodules run: git submodule update --init --recursive From 8cec93b7164351365167b038c33d5f47a1af841e Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:05:04 -0600 Subject: [PATCH 08/59] update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 971a9e0c1..062e975ce 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -14,12 +14,12 @@ jobs: - name: Checkout code run: | - pwd git clone https://github.com/NCAR/ccpp-scm.git - cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ - name: Initialize submodules - run: git submodule update --init --recursive + run: | + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ + git submodule update --init --recursive - name: Set up Python 3.8.5 uses: actions/setup-python@v3 From aa2664d64dbe768ea590507c7d8cb68191602e65 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:08:11 -0600 Subject: [PATCH 09/59] update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 062e975ce..6009c96b9 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -30,7 +30,9 @@ jobs: run: | # $CONDA is an environment variable pointing to the root of the miniconda directory echo $CONDA/bin >> $GITHUB_PATH + - name: Run ccpp_prebuild.py run: | - mkdir -p /home/runner/work/ccpp-scm/ccpp-scm/scm/bin/ccpp/physics/physics/ + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ + mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/scm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From 6a69e7cfbf715c980ea0a53f32e6f7095c199794 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:15:30 -0600 Subject: [PATCH 10/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/ci_fv3_ccpp_prebuild.yml diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml new file mode 100644 index 000000000..985b1140c --- /dev/null +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -0,0 +1,38 @@ +name: CI test to run FV3 ccpp_prebuild script + +on: [push, pull_request] + +jobs: + build-linux: + + # The type of runner that the job will run on + runs-on: ubuntu-latest + strategy: + max-parallel: 5 + + steps: + + - name: Checkout code + run: | + git clone https://github.com/NOAA-EMC/fv3atm.git + + - name: Initialize submodules + run: | + cd /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm + git submodule update --init --recursive + + - name: Set up Python 3.8.5 + uses: actions/setup-python@v3 + with: + python-version: 3.8.5 + + - name: Add conda to system path + run: | + # $CONDA is an environment variable pointing to the root of the miniconda directory + echo $CONDA/bin >> $GITHUB_PATH + + - name: Run ccpp_prebuild.py + run: | + cd /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm/ + mkdir -p /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm/bin/ccpp/physics/physics/ + ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From 3db6215adfb538da381ef2dee28ff5517053e93c Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:18:14 -0600 Subject: [PATCH 11/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 985b1140c..80ada6055 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -14,6 +14,7 @@ jobs: - name: Checkout code run: | + pwd git clone https://github.com/NOAA-EMC/fv3atm.git - name: Initialize submodules From 7aa47f948e6cd8590e6009092da813ba03a33e92 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:20:13 -0600 Subject: [PATCH 12/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 80ada6055..715fdac57 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -19,7 +19,7 @@ jobs: - name: Initialize submodules run: | - cd /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm + cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm git submodule update --init --recursive - name: Set up Python 3.8.5 @@ -35,5 +35,5 @@ jobs: - name: Run ccpp_prebuild.py run: | cd /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm/ - mkdir -p /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm/bin/ccpp/physics/physics/ + mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From bb140fc1e8f3f67da22b874f46fdc34cca01ce6f Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:22:04 -0600 Subject: [PATCH 13/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 715fdac57..84a9124e8 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -34,6 +34,6 @@ jobs: - name: Run ccpp_prebuild.py run: | - cd /home/runner/work/NOAA-EMC/NOAA-EMC/fv3atm/ + cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From 401122b12db87855003b58e30fa059a058697af4 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:31:13 -0600 Subject: [PATCH 14/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 84a9124e8..d4e283394 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -34,6 +34,7 @@ jobs: - name: Run ccpp_prebuild.py run: | + setenv suites_dir /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/ccpp/suites/ cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From ef273f5f2b434365d50a28234558a41089c49cf3 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:33:06 -0600 Subject: [PATCH 15/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index d4e283394..84a9124e8 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -34,7 +34,6 @@ jobs: - name: Run ccpp_prebuild.py run: | - setenv suites_dir /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/ccpp/suites/ cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From b71284a0019a687cc9c45c846aee9baf9f1515c9 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 11 Oct 2022 20:35:38 -0600 Subject: [PATCH 16/59] update CI for fv3 --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 84a9124e8..8b6633e76 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -34,6 +34,6 @@ jobs: - name: Run ccpp_prebuild.py run: | - cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm + cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/ccpp/ mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/bin/ccpp/physics/physics/ - ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file + ./framework/scripts/ccpp_prebuild.py --config config/ccpp_prebuild_config.py \ No newline at end of file From cd3d206c0abf4916bfa1fc1f39a7673d5a1c39e8 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 10:45:12 -0600 Subject: [PATCH 17/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 6009c96b9..4387f41ce 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -12,7 +12,18 @@ jobs: steps: - - name: Checkout code + - name: Checkout current ccpp-physics code + uses: actions/checkout@v2 + run: | + pwd + ls + cd ccpp-physics + pwd + ls + git status + git remote -v + + - name: Checkout latest ccpp-scm code run: | git clone https://github.com/NCAR/ccpp-scm.git From ded8ce9216c4c1c106f58cfa2aa948942c4c3c67 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 10:48:37 -0600 Subject: [PATCH 18/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 4387f41ce..036a93edb 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -14,6 +14,8 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 + + - name: Update checkout run: | pwd ls From b5767caf05d20433deb1ae0b233a0cffce256afc Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 10:50:42 -0600 Subject: [PATCH 19/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 036a93edb..a20e1c486 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -17,9 +17,6 @@ jobs: - name: Update checkout run: | - pwd - ls - cd ccpp-physics pwd ls git status From 0385133a13ccab83da161bdf33da79a832f6090b Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 10:59:10 -0600 Subject: [PATCH 20/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index a20e1c486..6c222ff87 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -21,6 +21,7 @@ jobs: ls git status git remote -v + GIT_REMOTE=`git remote get-url origin` && export GIT_REMOTE - name: Checkout latest ccpp-scm code run: | From f21feecf71ee8fd38aa861487a3a69912ae8c29d Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:01:18 -0600 Subject: [PATCH 21/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 6c222ff87..74d80a5cd 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -26,6 +26,12 @@ jobs: - name: Checkout latest ccpp-scm code run: | git clone https://github.com/NCAR/ccpp-scm.git + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics + pwd + ls + git status + git remote -v + echo $GIT_REMOTE - name: Initialize submodules run: | From a3e74bf80b4fceb2adcc99986cda902b0627ae1e Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:04:20 -0600 Subject: [PATCH 22/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 74d80a5cd..52fac91b3 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -31,7 +31,7 @@ jobs: ls git status git remote -v - echo $GIT_REMOTE + $GIT_REMOTE - name: Initialize submodules run: | From b2f5c4dd3dac01b1781044c5b9e7cb652749cb6b Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:13:35 -0600 Subject: [PATCH 23/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 52fac91b3..ace3dcfb1 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -1,4 +1,4 @@ -name: CI test to run SCM ccpp_prebuild script +B1;95;0cname: CI test to run SCM ccpp_prebuild script on: [push, pull_request] @@ -15,13 +15,11 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 - - name: Update checkout + - name: Get repository information from current ccpp-physics code run: | - pwd - ls - git status - git remote -v GIT_REMOTE=`git remote get-url origin` && export GIT_REMOTE + GIT_REMOTE_HASH=`git rev-parse HEAD` && export GIT_REMOTE_HASH + GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD` && export GIT_REMOTE_BRANCH - name: Checkout latest ccpp-scm code run: | @@ -29,7 +27,7 @@ jobs: cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics pwd ls - git status + git remote git remote -v $GIT_REMOTE From cdbf2f577d50484a9b13e0d19cdad0501d3331cd Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:14:59 -0600 Subject: [PATCH 24/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index ace3dcfb1..b5cdd6c61 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -1,4 +1,4 @@ -B1;95;0cname: CI test to run SCM ccpp_prebuild script +name: CI test to run SCM ccpp_prebuild script on: [push, pull_request] From 1aff1b7f73bdbfb86f4eb4934644922c16120c92 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:28:58 -0600 Subject: [PATCH 25/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index b5cdd6c61..ad57fecb0 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -29,12 +29,16 @@ jobs: ls git remote git remote -v - $GIT_REMOTE - name: Initialize submodules run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ git submodule update --init --recursive + cd ccpp/physics + git remote add remote_local $GIT_REMOTE + git fetch $GIT_REMOTE + git checkout $GIT_REMOTE/$GIT_BRANCH + git remote -v - name: Set up Python 3.8.5 uses: actions/setup-python@v3 From 6120509c24e7aec7096b2ffae238883f302800d7 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:33:52 -0600 Subject: [PATCH 26/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index ad57fecb0..150ef7c66 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -32,12 +32,12 @@ jobs: - name: Initialize submodules run: | - cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ - git submodule update --init --recursive - cd ccpp/physics + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics git remote add remote_local $GIT_REMOTE git fetch $GIT_REMOTE git checkout $GIT_REMOTE/$GIT_BRANCH + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm + git submodule update --init --recursive git remote -v - name: Set up Python 3.8.5 From ecfe481c94477eab7541178af7d88fab129433a4 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 11:38:34 -0600 Subject: [PATCH 27/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 150ef7c66..6ee4496c4 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -15,11 +15,9 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 - - name: Get repository information from current ccpp-physics code - run: | - GIT_REMOTE=`git remote get-url origin` && export GIT_REMOTE - GIT_REMOTE_HASH=`git rev-parse HEAD` && export GIT_REMOTE_HASH - GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD` && export GIT_REMOTE_BRANCH + - run: GIT_REMOTE=`git remote get-url origin` && export GIT_REMOTE + - run: GIT_REMOTE_HASH=`git rev-parse HEAD` && export GIT_REMOTE_HASH + - run: GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD` && export GIT_REMOTE_BRANCH - name: Checkout latest ccpp-scm code run: | From 142c799ccda8fccd4744f2036257d297f1fa6554 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 12:02:26 -0600 Subject: [PATCH 28/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 6ee4496c4..08e2aa507 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -2,6 +2,12 @@ name: CI test to run SCM ccpp_prebuild script on: [push, pull_request] +env: + GIT_REMOTE_URL: https://github.com/NCAR/ccpp-physics.git + GIT_REMOTE_HASH: 255035269760c1a6560317c400727d962cdc57f0 + GIT_REMOTE_NAME: origin + GIT_REMOTE_BRANCH: main + jobs: build-linux: @@ -15,25 +21,16 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 - - run: GIT_REMOTE=`git remote get-url origin` && export GIT_REMOTE - - run: GIT_REMOTE_HASH=`git rev-parse HEAD` && export GIT_REMOTE_HASH - - run: GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD` && export GIT_REMOTE_BRANCH - - name: Checkout latest ccpp-scm code run: | git clone https://github.com/NCAR/ccpp-scm.git - cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics - pwd - ls - git remote - git remote -v - name: Initialize submodules run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics - git remote add remote_local $GIT_REMOTE - git fetch $GIT_REMOTE - git checkout $GIT_REMOTE/$GIT_BRANCH + git remote add remote_local $GIT_REMOTE_NAME + git fetch $GIT_REMOTE_NAME + git checkout $GIT_REMOTE_NAME/$GIT_REMOTE_BRANCH cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm git submodule update --init --recursive git remote -v From 3a0641e2008453d7fd4777ad7744553ff95e6069 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 12:08:19 -0600 Subject: [PATCH 29/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 08e2aa507..8f0e4b6c9 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -18,6 +18,12 @@ jobs: steps: + env: + GIT_REMOTE_URL_local: https://github.com/NCAR/ccpp-physics.git + GIT_REMOTE_HASH_local: 255035269760c1a6560317c400727d962cdc57f0 + GIT_REMOTE_NAME_local: origin + GIT_REMOTE_BRANCH_local: main + - name: Checkout current ccpp-physics code uses: actions/checkout@v2 From 716900fe71f1a1b02892c0bc9891238dd7c023cb Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 12:12:04 -0600 Subject: [PATCH 30/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 8f0e4b6c9..08e2aa507 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -18,12 +18,6 @@ jobs: steps: - env: - GIT_REMOTE_URL_local: https://github.com/NCAR/ccpp-physics.git - GIT_REMOTE_HASH_local: 255035269760c1a6560317c400727d962cdc57f0 - GIT_REMOTE_NAME_local: origin - GIT_REMOTE_BRANCH_local: main - - name: Checkout current ccpp-physics code uses: actions/checkout@v2 From a11d566e44bb4a1343771a309dbd2c3113c432a7 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 13:47:12 -0600 Subject: [PATCH 31/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 08e2aa507..68f6b09aa 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -20,6 +20,7 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 + run: echo "GIT_REMOTE=`git remote get-url origin` >> $GIT_REMOTE_URL - name: Checkout latest ccpp-scm code run: | From 9d93c0c02e96236941b36b05589bf9939912a959 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 13:52:03 -0600 Subject: [PATCH 32/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 68f6b09aa..dafd1c0d5 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -20,11 +20,13 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 - run: echo "GIT_REMOTE=`git remote get-url origin` >> $GIT_REMOTE_URL + run: echo "GIT_REMOTE_URL=`git remote get-url origin` >> $GITHUB_ENV - name: Checkout latest ccpp-scm code - run: | - git clone https://github.com/NCAR/ccpp-scm.git + run: git clone https://github.com/NCAR/ccpp-scm.git + + - name: Test + run: echo $GIT_REMOTE_URL - name: Initialize submodules run: | From 071cb33769710fa0d15921a332183b1d9409ede8 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 13:54:44 -0600 Subject: [PATCH 33/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index dafd1c0d5..5a47db377 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -20,6 +20,8 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 + + - name: Get remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin` >> $GITHUB_ENV - name: Checkout latest ccpp-scm code From 8855fd5dfb9af46a3d16a2759f5faf5276218aa3 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 13:55:51 -0600 Subject: [PATCH 34/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 5a47db377..497f27d60 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v2 - name: Get remote-URL for current ccpp-physics code - run: echo "GIT_REMOTE_URL=`git remote get-url origin` >> $GITHUB_ENV + run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV - name: Checkout latest ccpp-scm code run: git clone https://github.com/NCAR/ccpp-scm.git From 6e0ee28f7bca8cfeb1221dda140bc19f38967d97 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:00:50 -0600 Subject: [PATCH 35/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 497f27d60..74ffe3de8 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -24,11 +24,19 @@ jobs: - name: Get remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV + - name: Get branch name for current ccpp-physics code + run: echo "GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD`" >> $GITHUB_ENV + + - name: Get hash for HEAD of current ccpp-physics code + run: echo "GIT_REMOTE_HASH=`git rev-parse HEAD`" >> $GITHUB_ENV + - name: Checkout latest ccpp-scm code run: git clone https://github.com/NCAR/ccpp-scm.git - name: Test run: echo $GIT_REMOTE_URL + run: echo $GIT_REMOTE_BRANCH + run: echo $GIT_REMOTE_HASH - name: Initialize submodules run: | From 1eb1740a8b08c9144f4de04ff703567f8be0f6ea Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:02:39 -0600 Subject: [PATCH 36/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 74ffe3de8..cd847b8dd 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -33,9 +33,11 @@ jobs: - name: Checkout latest ccpp-scm code run: git clone https://github.com/NCAR/ccpp-scm.git - - name: Test + - name: Test GIT_REMOTE_URL run: echo $GIT_REMOTE_URL + - name: Test GIT_REMOTE_BRANCH run: echo $GIT_REMOTE_BRANCH + - name: Test GIT_REMOTE_HASH run: echo $GIT_REMOTE_HASH - name: Initialize submodules From 8a4ea15489adbd1c890a91c2aae6d720ece0dad8 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:05:35 -0600 Subject: [PATCH 37/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index cd847b8dd..46f491344 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -45,7 +45,7 @@ jobs: cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics git remote add remote_local $GIT_REMOTE_NAME git fetch $GIT_REMOTE_NAME - git checkout $GIT_REMOTE_NAME/$GIT_REMOTE_BRANCH + git checkout $GIT_REMOTE_NAME $GIT_REMOTE_BRANCH cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm git submodule update --init --recursive git remote -v From defc2681b05054561002f86435d31497014d540a Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:07:20 -0600 Subject: [PATCH 38/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 46f491344..ccd7d501a 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -44,7 +44,7 @@ jobs: run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics git remote add remote_local $GIT_REMOTE_NAME - git fetch $GIT_REMOTE_NAME + git fetch remote_local git checkout $GIT_REMOTE_NAME $GIT_REMOTE_BRANCH cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm git submodule update --init --recursive From 6358b564d05c7993ab6b1e562a28be0688904a05 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:09:04 -0600 Subject: [PATCH 39/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index ccd7d501a..3c8cdaa99 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -43,9 +43,9 @@ jobs: - name: Initialize submodules run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics - git remote add remote_local $GIT_REMOTE_NAME + git remote add remote_local $GIT_REMOTE_URL git fetch remote_local - git checkout $GIT_REMOTE_NAME $GIT_REMOTE_BRANCH + git checkout remote_local/$GIT_REMOTE_BRANCH cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm git submodule update --init --recursive git remote -v From c2d6febe556ed617a4ee370232c3c870e48484df Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:13:35 -0600 Subject: [PATCH 40/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 3c8cdaa99..e2bf75340 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -40,15 +40,19 @@ jobs: - name: Test GIT_REMOTE_HASH run: echo $GIT_REMOTE_HASH - - name: Initialize submodules + - name: Update ccpp-physics hash in ccpp-scm run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics git remote add remote_local $GIT_REMOTE_URL - git fetch remote_local + git fetch remote_local $GIT_REMOTE_BRANCH git checkout remote_local/$GIT_REMOTE_BRANCH + + - name: Initialize submodules + run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm git submodule update --init --recursive git remote -v + git log - name: Set up Python 3.8.5 uses: actions/setup-python@v3 From bb3cbd9cd4bda4997873116d9916f227a4fea7db Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:16:41 -0600 Subject: [PATCH 41/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index e2bf75340..efd5033d6 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -31,7 +31,9 @@ jobs: run: echo "GIT_REMOTE_HASH=`git rev-parse HEAD`" >> $GITHUB_ENV - name: Checkout latest ccpp-scm code - run: git clone https://github.com/NCAR/ccpp-scm.git + run: | + git clone https://github.com/NCAR/ccpp-scm.git + pwd - name: Test GIT_REMOTE_URL run: echo $GIT_REMOTE_URL @@ -51,8 +53,6 @@ jobs: run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm git submodule update --init --recursive - git remote -v - git log - name: Set up Python 3.8.5 uses: actions/setup-python@v3 @@ -67,5 +67,6 @@ jobs: - name: Run ccpp_prebuild.py run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ + git status mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/scm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From ed869401eab576d71ab9fa4d55f9f37e70725822 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:19:34 -0600 Subject: [PATCH 42/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index efd5033d6..1b5288203 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -68,5 +68,6 @@ jobs: run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ git status + ls mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/scm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From e66d159b5a751ae440706513df4161a37122e44b Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:22:09 -0600 Subject: [PATCH 43/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 1b5288203..525a04783 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -42,17 +42,17 @@ jobs: - name: Test GIT_REMOTE_HASH run: echo $GIT_REMOTE_HASH + - name: Initialize submodules + run: | + cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm + git submodule update --init --recursive + - name: Update ccpp-physics hash in ccpp-scm run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics git remote add remote_local $GIT_REMOTE_URL git fetch remote_local $GIT_REMOTE_BRANCH git checkout remote_local/$GIT_REMOTE_BRANCH - - - name: Initialize submodules - run: | - cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm - git submodule update --init --recursive - name: Set up Python 3.8.5 uses: actions/setup-python@v3 From b2cd9aa8abe9b21ae096697be8ac20b00ea9f65a Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:23:43 -0600 Subject: [PATCH 44/59] update to CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 525a04783..d9f95360e 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -2,12 +2,6 @@ name: CI test to run SCM ccpp_prebuild script on: [push, pull_request] -env: - GIT_REMOTE_URL: https://github.com/NCAR/ccpp-physics.git - GIT_REMOTE_HASH: 255035269760c1a6560317c400727d962cdc57f0 - GIT_REMOTE_NAME: origin - GIT_REMOTE_BRANCH: main - jobs: build-linux: From 8ba4760955d672f901051e812e3c0cf15b4057a6 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 12 Oct 2022 14:28:09 -0600 Subject: [PATCH 45/59] update to CI --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 24 ++++++++++++++++++---- .github/workflows/ci_scm_ccpp_prebuild.yml | 18 ++++------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 8b6633e76..8a12869d9 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -11,16 +11,32 @@ jobs: max-parallel: 5 steps: + - name: Checkout current ccpp-physics code + uses: actions/checkout@v2 - - name: Checkout code - run: | - pwd - git clone https://github.com/NOAA-EMC/fv3atm.git + - name: Store remote-URL for current ccpp-physics code + run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV + + - name: Store branch name for current ccpp-physics code + run: echo "GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD`" >> $GITHUB_ENV + + - name: Store hash for HEAD of current ccpp-physics code + run: echo "GIT_REMOTE_HASH=`git rev-parse HEAD`" >> $GITHUB_ENV + + - name: Checkout latest fv3atm + run: git clone https://github.com/NOAA-EMC/fv3atm.git - name: Initialize submodules run: | cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm git submodule update --init --recursive + + - name: Update ccpp-physics hash in fv3atm + run: | + cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/ccpp/physics + git remote add remote_local $GIT_REMOTE_URL + git fetch remote_local $GIT_REMOTE_BRANCH + git checkout remote_local/$GIT_REMOTE_BRANCH - name: Set up Python 3.8.5 uses: actions/setup-python@v3 diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index d9f95360e..1ac0e09a4 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -15,26 +15,17 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v2 - - name: Get remote-URL for current ccpp-physics code + - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV - - name: Get branch name for current ccpp-physics code + - name: Store branch name for current ccpp-physics code run: echo "GIT_REMOTE_BRANCH=`git rev-parse --abbrev-ref HEAD`" >> $GITHUB_ENV - - name: Get hash for HEAD of current ccpp-physics code + - name: Store hash for HEAD of current ccpp-physics code run: echo "GIT_REMOTE_HASH=`git rev-parse HEAD`" >> $GITHUB_ENV - name: Checkout latest ccpp-scm code - run: | - git clone https://github.com/NCAR/ccpp-scm.git - pwd - - - name: Test GIT_REMOTE_URL - run: echo $GIT_REMOTE_URL - - name: Test GIT_REMOTE_BRANCH - run: echo $GIT_REMOTE_BRANCH - - name: Test GIT_REMOTE_HASH - run: echo $GIT_REMOTE_HASH + run: git clone https://github.com/NCAR/ccpp-scm.git - name: Initialize submodules run: | @@ -62,6 +53,5 @@ jobs: run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ git status - ls mkdir -p /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/scm/bin/ccpp/physics/physics/ ./ccpp/framework/scripts/ccpp_prebuild.py --config ccpp/config/ccpp_prebuild_config.py \ No newline at end of file From 61f9670c056e27f5e8a75032f4c9e4774f3cf50d Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:08:31 +0000 Subject: [PATCH 46/59] Housekeeping --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 2 +- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 8a12869d9..b5e2a8383 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -1,4 +1,4 @@ -name: CI test to run FV3 ccpp_prebuild script +name: CI test to run FV3 ccpp_prebuild step on: [push, pull_request] diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 1ac0e09a4..43b6a68b3 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -1,4 +1,4 @@ -name: CI test to run SCM ccpp_prebuild script +name: CI test to run SCM ccpp_prebuild step on: [push, pull_request] From ac43a97938cf6363e20ae5b5cd76b7b82ba9d6b5 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:13:57 +0000 Subject: [PATCH 47/59] Housekeeping --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 43b6a68b3..6f0a6e7c3 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -35,6 +35,8 @@ jobs: - name: Update ccpp-physics hash in ccpp-scm run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics + echo $GIT_REMOTE_URL + echo $GIT_REMOTE_BRANCH git remote add remote_local $GIT_REMOTE_URL git fetch remote_local $GIT_REMOTE_BRANCH git checkout remote_local/$GIT_REMOTE_BRANCH From 4f789c6f2f0036782a781c006fdf25da3bab58cd Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:29:02 +0000 Subject: [PATCH 48/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 6f0a6e7c3..0362b1d6d 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -37,6 +37,7 @@ jobs: cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics echo $GIT_REMOTE_URL echo $GIT_REMOTE_BRANCH + echo ${{github.repository}} git remote add remote_local $GIT_REMOTE_URL git fetch remote_local $GIT_REMOTE_BRANCH git checkout remote_local/$GIT_REMOTE_BRANCH From e84694e88c120ab9a975398af738f0341bbffea7 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:35:02 +0000 Subject: [PATCH 49/59] Update CI --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 4 +++- .github/workflows/ci_scm_ccpp_prebuild.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index b5e2a8383..96eece28d 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -12,7 +12,9 @@ jobs: steps: - name: Checkout current ccpp-physics code - uses: actions/checkout@v2 + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 0362b1d6d..b3d56e0b7 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -13,7 +13,9 @@ jobs: steps: - name: Checkout current ccpp-physics code - uses: actions/checkout@v2 + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV From 5e02827c3c28011b11d3a29d5387f32a9969a2c9 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:41:51 +0000 Subject: [PATCH 50/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index b3d56e0b7..0daa3bc0c 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -40,6 +40,8 @@ jobs: echo $GIT_REMOTE_URL echo $GIT_REMOTE_BRANCH echo ${{github.repository}} + echo ${{ github.event.pull_request.head.sha }} + echo $GITHUB_SHA git remote add remote_local $GIT_REMOTE_URL git fetch remote_local $GIT_REMOTE_BRANCH git checkout remote_local/$GIT_REMOTE_BRANCH From e64a754c2113f805b6dafa3d2210d9c309c97771 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:46:31 +0000 Subject: [PATCH 51/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 0daa3bc0c..19b269f81 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -14,8 +14,6 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV From 309831885f1d34108e8eebbead5c1ad25eb819d2 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:52:55 +0000 Subject: [PATCH 52/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 19b269f81..0daa3bc0c 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -14,6 +14,8 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV From 4ba2ba481abc94a47c9557d18ad435e48db5eeff Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 16:59:08 +0000 Subject: [PATCH 53/59] Update CI --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 2 +- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 96eece28d..1f86f00b0 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -1,6 +1,6 @@ name: CI test to run FV3 ccpp_prebuild step -on: [push, pull_request] +on: [push] jobs: build-linux: diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 0daa3bc0c..a8a8a727c 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -1,6 +1,6 @@ name: CI test to run SCM ccpp_prebuild step -on: [push, pull_request] +on: [push] jobs: build-linux: From ba2dbbd2f53efedc169a0ddf308f915e30b1b459 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 17:07:16 +0000 Subject: [PATCH 54/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index a8a8a727c..8ed200b23 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout current ccpp-physics code uses: actions/checkout@v3 with: - ref: ${{ github.event.pull_request.head.sha }} + ref: "refs/pull/${{ github.event.number }}/merge" - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV From 1fb225bfd437acfc6642008ca5bd22c1a60759d9 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 17:09:01 +0000 Subject: [PATCH 55/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 8ed200b23..63d25f7ea 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -1,6 +1,6 @@ name: CI test to run SCM ccpp_prebuild step -on: [push] +on: [push, pull_request] jobs: build-linux: @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout current ccpp-physics code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: ref: "refs/pull/${{ github.event.number }}/merge" From 66212c08c044ce4a6114358583366f6eb34128f6 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 17:11:26 +0000 Subject: [PATCH 56/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 63d25f7ea..19b269f81 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -13,9 +13,7 @@ jobs: steps: - name: Checkout current ccpp-physics code - uses: actions/checkout@v2 - with: - ref: "refs/pull/${{ github.event.number }}/merge" + uses: actions/checkout@v3 - name: Store remote-URL for current ccpp-physics code run: echo "GIT_REMOTE_URL=`git remote get-url origin`" >> $GITHUB_ENV From b3f68a0612986ee0910262fcbc214ac2014e52ef Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 17:27:35 +0000 Subject: [PATCH 57/59] Update CI --- .github/workflows/ci_scm_ccpp_prebuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 19b269f81..64fac3cd1 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -33,6 +33,7 @@ jobs: git submodule update --init --recursive - name: Update ccpp-physics hash in ccpp-scm + if: github.event.pull_request == false run: | cd /home/runner/work/ccpp-physics/ccpp-physics/ccpp-scm/ccpp/physics echo $GIT_REMOTE_URL From 07add401c9bee32affaac3f213150f7ebcba0e33 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Oct 2022 17:29:55 +0000 Subject: [PATCH 58/59] Update CI --- .github/workflows/ci_fv3_ccpp_prebuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_fv3_ccpp_prebuild.yml b/.github/workflows/ci_fv3_ccpp_prebuild.yml index 1f86f00b0..a32b66b7b 100644 --- a/.github/workflows/ci_fv3_ccpp_prebuild.yml +++ b/.github/workflows/ci_fv3_ccpp_prebuild.yml @@ -1,6 +1,6 @@ name: CI test to run FV3 ccpp_prebuild step -on: [push] +on: [push, pull_request] jobs: build-linux: @@ -34,6 +34,7 @@ jobs: git submodule update --init --recursive - name: Update ccpp-physics hash in fv3atm + if: github.event.pull_request == false run: | cd /home/runner/work/ccpp-physics/ccpp-physics/fv3atm/ccpp/physics git remote add remote_local $GIT_REMOTE_URL From 5d42ea93a362be0dd886c0bb5713257b74040596 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 1 Nov 2022 13:37:10 -0600 Subject: [PATCH 59/59] Adjust conversion factor in radiation_clouds.f --- physics/radiation_clouds.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physics/radiation_clouds.f b/physics/radiation_clouds.f index e071b48b1..d092a0198 100644 --- a/physics/radiation_clouds.f +++ b/physics/radiation_clouds.f @@ -3906,7 +3906,7 @@ subroutine cloud_fraction_mass_flx_2 & clwmin = 0.0 do k = 1, NLAY-1 do i = 1, IX - clwt = 1.0e-10 * (plyr(i,k)*0.001) + clwt = 1.0e-6 * (plyr(i,k)*0.001) if (clwf(i,k) > clwt) then if(rhly(i,k) > 0.99) then