Skip to content

Update current v12 with v1.12.0 #90

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

Merged
sdrabenh merged 19 commits into from
May 26, 2026
Merged

Update current v12 with v1.12.0 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dfbd8c9
Expand the RRTMG long-wave code to add two functionalitie:
Sep 30, 2024
2e58da3
Fix in case there are no RATS_DIAGNOSTICS: listed
Oct 3, 2024
f26f9cd
Update to accomodate various AGCM.rc settings.
Oct 7, 2024
775e040
Merge branch 'main' into mslong1/rrg+rad
msl3v Oct 9, 2024
b03c6c4
Nullify pointers
mathomp4 Oct 10, 2024
f9bf581
v11: Convert Solar GC to use gFTL StringVector
mathomp4 Nov 27, 2024
50bcf45
Actually use gftl
mathomp4 Nov 27, 2024
1311ac7
Fix bad merge
mathomp4 Nov 27, 2024
8448d0d
Merge pull request #50 from GEOS-ESM/feature/mathomp4/v11-solar-strin…
mathomp4 Nov 27, 2024
cf12672
Merge pull request #51 from GEOS-ESM/develop
mathomp4 Nov 27, 2024
8807a2a
Merge branch 'main' into mslong1/rrg+rad
mathomp4 Jan 16, 2025
57ec84d
Port ifx fixes to Irrad
mathomp4 Jan 28, 2025
d3514b7
Merge pull request #56 from GEOS-ESM/bugfix/mathomp4/irrad-gftl
sdrabenh Jan 29, 2025
77fdeb4
Merge pull request #57 from GEOS-ESM/develop
mathomp4 Jan 29, 2025
74af5ba
Merge branch 'develop' into feature/mathomp4/split-chem-2025Jan23-and…
mathomp4 Jan 29, 2025
52c60f7
Merge pull request #58 from GEOS-ESM/feature/mathomp4/split-chem-2025…
mathomp4 Feb 18, 2025
bfab19a
Merge pull request #65 from GEOS-ESM/develop
mathomp4 Feb 18, 2025
b46eb1a
hand-merge v1.12.0 into feature/sdrabenh/gcm_v12
sdrabenh May 22, 2026
323b885
Remove choose_solar_scheme subroutine in merge from v1.12.0
sdrabenh May 25, 2026
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
compiler: [gfortran, ifort, ifx]
#baselibs_version: *baselibs_version
repo: GEOSgcm
checkout_fixture: true
Expand All @@ -34,7 +34,7 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
compiler: [gfortran, ifort, ifx]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
Expand Down
18 changes: 10 additions & 8 deletions GEOSirrad_GridComp/GEOS_IrradGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
! "constant" gases
TEST_(gas_concs%set_vmr('n2' , real(N2 ,kind=wp)))
TEST_(gas_concs%set_vmr('o2' , real(O2 ,kind=wp)))
if (.not. associated(CO2_3d)) TEST_(gas_concs%set_vmr('co2', real(CO2_FIXED,kind=wp))) ! <<>> MSL
TEST_(gas_concs%set_vmr('co' , real(CO ,kind=wp)))
! variable gases
! (ozone converted from mass mixing ratio, water vapor from specific humidity)
Expand All @@ -2185,6 +2186,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
TEST_(gas_concs%set_vmr('o3' , real( O3_R,kind=wp)))
TEST_(gas_concs%set_vmr('n2o', real(N2O_R,kind=wp)))
TEST_(gas_concs%set_vmr('ch4', real(CH4_R,kind=wp)))
if (associated(CO2_3d)) TEST_(gas_concs%set_vmr('co2', real(reshape(CO2_3d ,(/ncol,LM/)),kind=wp))) !<<>> MSL

if (associated( CO2_3d)) &
deallocate( CO2_R,__STAT__)
Expand Down Expand Up @@ -2316,7 +2318,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr3d, string_pointer, __RC__)
export_clrnoa = (export_clrnoa .or. associated(ptr3d))
export_clrnoa = (export_clrnoa .or. associated(ptr3d))
call string_vec_iter%next()
end do

Expand All @@ -2328,7 +2330,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr2d, string_pointer, __RC__)
export_clrnoa = (export_clrnoa .or. associated(ptr2d))
export_clrnoa = (export_clrnoa .or. associated(ptr2d))
call string_vec_iter%next()
end do

Expand All @@ -2343,7 +2345,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr3d, string_pointer, __RC__)
export_clrsky = (export_clrsky .or. associated(ptr3d))
export_clrsky = (export_clrsky .or. associated(ptr3d))
call string_vec_iter%next()
end do

Expand All @@ -2357,7 +2359,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr2d, string_pointer, __RC__)
export_clrsky = (export_clrsky .or. associated(ptr2d))
export_clrsky = (export_clrsky .or. associated(ptr2d))
call string_vec_iter%next()
end do

Expand All @@ -2372,7 +2374,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr3d, string_pointer, __RC__)
export_allnoa = (export_allnoa .or. associated(ptr3d))
export_allnoa = (export_allnoa .or. associated(ptr3d))
call string_vec_iter%next()
end do

Expand All @@ -2384,7 +2386,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr2d, string_pointer, __RC__)
export_allnoa = (export_allnoa .or. associated(ptr2d))
export_allnoa = (export_allnoa .or. associated(ptr2d))
call string_vec_iter%next()
end do

Expand All @@ -2399,7 +2401,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr3d, string_pointer, __RC__)
export_allsky = (export_allsky .or. associated(ptr3d))
export_allsky = (export_allsky .or. associated(ptr3d))
call string_vec_iter%next()
end do

Expand All @@ -2412,7 +2414,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
do while ( string_vec_iter /= string_vec%end() )
string_pointer => string_vec_iter%get()
call MAPL_GetPointer( EXPORT, ptr2d, string_pointer, __RC__)
export_allsky = (export_allsky .or. associated(ptr2d))
export_allsky = (export_allsky .or. associated(ptr2d))
call string_vec_iter%next()
end do

Expand Down
Loading