diff --git a/scripts/fv3.j b/scripts/fv3.j index f2e0ba6..7ff293b 100755 --- a/scripts/fv3.j +++ b/scripts/fv3.j @@ -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 " diff --git a/scripts/fv3_setup b/scripts/fv3_setup index d326044..c8a5f53 100755 --- a/scripts/fv3_setup +++ b/scripts/fv3_setup @@ -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 @@ -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