Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitFlow: Merge Develop into Main for a release #22

Merged
merged 7 commits into from
Aug 3, 2023
Merged

GitFlow: Merge Develop into Main for a release #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4b6ca4
Update CI to use Baselibs 7.13.0
mathomp4 Jun 8, 2023
681d860
Update CI to Baselibs 7.14.0
mathomp4 Jul 31, 2023
c3114c2
pmn: use selectable tmin_OK
dr0cloud Jul 31, 2023
4b7ae7d
Update CircleCI to use Orb Default Baselibs and BCs
mathomp4 Jul 31, 2023
be8a4b4
Merge pull request #19 from GEOS-ESM/feature/mathomp4/update-ci-to-7.…
mathomp4 Jul 31, 2023
02259e7
Merge branch 'develop' into feature/pnorris/RRTMGP-min-temp-selectable
dr0cloud Jul 31, 2023
2f3cafd
Merge pull request #21 from GEOS-ESM/feature/pnorris/RRTMGP-min-temp-…
dr0cloud Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v11.00.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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion GEOSirrad_GridComp/GEOS_IrradGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion GEOSsolar_GridComp/GEOS_SolarGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down