Skip to content

GitFlow: Merge develop into main for release #315

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
mathomp4 merged 7 commits into from
Aug 29, 2025
Merged

GitFlow: Merge develop into main for release #315

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
a41b0d6
v11: Clean up fv3_setup and fv3.j
mathomp4 Feb 4, 2025
06c2d20
Removed too much
mathomp4 Feb 5, 2025
ee88746
Merge branch 'develop' into feature/mathomp4/v11-cleanup-setup
mathomp4 Jul 8, 2025
cd4f41f
Merge pull request #295 from GEOS-ESM/feature/mathomp4/v11-cleanup-setup
mathomp4 Jul 8, 2025
5f7f6e0
fixes #309
bena-nasa Jul 31, 2025
5455d2b
Fix up the CI
mathomp4 Jul 31, 2025
1aae45b
Merge pull request #311 from GEOS-ESM/feature/bmauer/fixes-develop-#309
mathomp4 Aug 29, 2025
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
9 changes: 4 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
version: 2.1

# Anchors in case we need to override the defaults from the orb
#baselibs_version: &baselibs_version v7.17.0
#bcs_version: &bcs_version v11.3.0

#baselibs_version: &baselibs_version v7.27.0
#bcs_version: &bcs_version v11.6.0

orbs:
ci: geos-esm/circleci-tools@2
ci: geos-esm/circleci-tools@4

workflows:
build-test:
Expand All @@ -17,7 +16,7 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler: [ifort, gfortran]
compiler: [gfortran, ifort]
#baselibs_version: *baselibs_version
repo: GEOSgcm
checkout_fixture: true
Expand Down
10 changes: 2 additions & 8 deletions interp_restarts.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ program interp_restarts

real(ESMF_KIND_R8), allocatable :: r8_ak(:)
real(ESMF_KIND_R8), allocatable :: r8_bk(:)
real(ESMF_KIND_R8), allocatable :: r8_akbk(:)

real(ESMF_KIND_R4), pointer :: r4_local(:,:,:)
real(ESMF_KIND_R8), pointer :: r8_local(:,:,:), pt_local(:,:,:)
Expand Down Expand Up @@ -276,7 +275,6 @@ program interp_restarts
call set_eta(npz,ks,ptop,pint,r8_ak,r8_bk)
FV_Atm(1)%ak = r8_ak
FV_Atm(1)%bk = r8_bk
deallocate ( r8_ak,r8_bk )
nq = nmoist
FV_Atm(1)%ncnst = nq/km
if( is_master() ) then
Expand Down Expand Up @@ -468,12 +466,8 @@ program interp_restarts


! AK and BK
allocate ( r8_akbk(npz+1) )
r8_akbk = FV_Atm(1)%ak
if (AmWriter) call MAPL_VarWrite(OutFmt,"AK",r8_akbk)
r8_akbk = FV_Atm(1)%bk
if (AmWriter) call MAPL_VarWrite(OutFmt,"BK",r8_akbk)
deallocate ( r8_akbk )
if (AmWriter) call MAPL_VarWrite(OutFmt,"AK",r8_ak)
if (AmWriter) call MAPL_VarWrite(OutFmt,"BK",r8_bk)

allocate(r8_local(is:ie,js:je,npz+1))

Expand Down
4 changes: 2 additions & 2 deletions scripts/fv3.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ endif
#######################################################################

setenv GEOSDIR @GEOSDIR
setenv GEOSBIN @GEOSBIN
setenv GEOSETC @GEOSETC
setenv GEOSBIN ${GEOSDIR}/bin
setenv GEOSETC ${GEOSDIR}/etc

set TAG = `cat $GEOSETC/.FV3_VERSION`
set RUN_CMD = "$GEOSBIN/esma_mpirun -np "
Expand Down
11 changes: 0 additions & 11 deletions scripts/fv3_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,15 +637,8 @@ echo $EXPDIRroot > $HOME/.EXPDIRroot
#######################################################################

set GEOSDIR = $GEOSDEF

#
# GEOSBIN does point to the bin/ directory in each
#
setenv GEOSSRC ${GEOSDIR}
setenv GEOSBIN ${GEOSDIR}/bin
setenv GEOSETC ${GEOSDIR}/etc

setenv GEOSUTIL ${GEOSSRC}

#######################################################################
# Check for Group ID Sponsor Code
Expand Down Expand Up @@ -831,10 +824,6 @@ s?@BATCH_OUTPUTNAME?$BATCH_OUTPUTNAME?g
s?@BATCH_JOINOUTERR?$BATCH_JOINOUTERR?g
s?@SITE?$SITE?g
s?@GEOSDIR?$GEOSDIR?g
s?@GEOSSRC?$GEOSSRC?g
s?@GEOSBIN?$GEOSBIN?g
s?@GEOSETC?$GEOSETC?g
s?@GEOSUTIL?$GEOSUTIL?g
s?@SINGULARITY_BUILD?$SINGULARITY_BUILD?g
s?@NATIVE_BUILD?$NATIVE_BUILD?g
s?@SINGULARITY_SANDBOX?$SINGULARITY_SANDBOX?g
Expand Down
Loading