From a4b6ca42fc3927b9d7fd4106971b139c1a86ef5d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Jun 2023 11:56:51 -0400 Subject: [PATCH 1/4] Update CI to use Baselibs 7.13.0 This PR updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm on `main` --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f1727bc..bb1a2b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 # Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.7.0 +baselibs_version: &baselibs_version v7.13.0 bcs_version: &bcs_version v11.00.0 orbs: From 681d860112342ee0f26a056837aa8ebf1e2c9ce3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 31 Jul 2023 11:25:39 -0400 Subject: [PATCH 2/4] Update CI to Baselibs 7.14.0 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb1a2b1..26bfd37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 # Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.13.0 -bcs_version: &bcs_version v11.00.0 +baselibs_version: &baselibs_version v7.14.0 +bcs_version: &bcs_version v11.1.0 orbs: ci: geos-esm/circleci-tools@1 From c3114c2e51a1d2e68fc1a396e68c48552457e77b Mon Sep 17 00:00:00 2001 From: Peter Norris Date: Mon, 31 Jul 2023 11:50:56 -0400 Subject: [PATCH 3/4] pmn: use selectable tmin_OK --- GEOSirrad_GridComp/GEOS_IrradGridComp.F90 | 5 ++++- GEOSsolar_GridComp/GEOS_SolarGridComp.F90 | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/GEOSirrad_GridComp/GEOS_IrradGridComp.F90 b/GEOSirrad_GridComp/GEOS_IrradGridComp.F90 index 6695e10..67e6329 100644 --- a/GEOSirrad_GridComp/GEOS_IrradGridComp.F90 +++ b/GEOSirrad_GridComp/GEOS_IrradGridComp.F90 @@ -1466,7 +1466,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC) real(wp) :: press_ref_min, ptop real(wp) :: temp_ref_min, tmin real(wp), parameter :: ptop_increase_OK_fraction = 0.01_wp - real(wp), parameter :: tmin_increase_OK_Kelvin = 10.0_wp + real(wp) :: tmin_increase_OK_Kelvin ! block size for efficient column processing (set from resource file) integer :: rrtmgp_blockSize @@ -1952,6 +1952,9 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC) tmin = minval(t_lay) if (temp_ref_min > tmin) then ! allow a small increase of tmin + call MAPL_GetResource (MAPL, & + tmin_increase_OK_Kelvin, 'RRTMGP_LW_TMIN_INC_OK_K:', & + DEFAULT = 10., __RC__) if (temp_ref_min - tmin <= tmin_increase_OK_Kelvin) then where (t_lay < temp_ref_min) t_lay = temp_ref_min else diff --git a/GEOSsolar_GridComp/GEOS_SolarGridComp.F90 b/GEOSsolar_GridComp/GEOS_SolarGridComp.F90 index d9817d2..cd41e82 100644 --- a/GEOSsolar_GridComp/GEOS_SolarGridComp.F90 +++ b/GEOSsolar_GridComp/GEOS_SolarGridComp.F90 @@ -2144,7 +2144,7 @@ subroutine SORADCORE(IM,JM,LM,include_aerosols,CURRTIME,LoadBalance,RC) real(wp) :: press_ref_min, ptop real(wp) :: temp_ref_min, tmin real(wp), parameter :: ptop_increase_OK_fraction = 0.01_wp - real(wp), parameter :: tmin_increase_OK_Kelvin = 10.0_wp + real(wp) :: tmin_increase_OK_Kelvin ! block size for efficient column processing (set from resource file) integer :: rrtmgp_blockSize @@ -3014,6 +3014,9 @@ subroutine SORADCORE(IM,JM,LM,include_aerosols,CURRTIME,LoadBalance,RC) tmin = minval(t_lay) if (temp_ref_min > tmin) then ! allow a small increase of tmin + call MAPL_GetResource (MAPL, & + tmin_increase_OK_Kelvin, 'RRTMGP_SW_TMIN_INC_OK_K:', & + DEFAULT = 10., __RC__) if (temp_ref_min - tmin <= tmin_increase_OK_Kelvin) then where (t_lay < temp_ref_min) t_lay = temp_ref_min else From 4b7ae7d60c520909ab163fc7810cf6dfc0baf205 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 31 Jul 2023 11:57:26 -0400 Subject: [PATCH 4/4] Update CircleCI to use Orb Default Baselibs and BCs This PR updates the CircleCI config to default to using the Baselibs in the CircleCI orb rather than explicitly specifying the versions. In most cases, this is the "best" way as a change to the orb can fix this for projects without the need for a PR. Note that we keep commented the explicit anchors in case needed. --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26bfd37..f2f2220 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 -# Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.14.0 -bcs_version: &bcs_version v11.1.0 +# Anchors in case we need to override the defaults from the orb +#baselibs_version: &baselibs_version v7.14.0 +#bcs_version: &bcs_version v11.1.0 orbs: ci: geos-esm/circleci-tools@1 @@ -18,7 +18,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GEOSgcm checkout_fixture: true mepodevelop: true