Skip to content

v11: Clean up fv3_setup and fv3.j #295

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 3 commits into from
Jul 8, 2025
Merged

v11: Clean up fv3_setup and fv3.j #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 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
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 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