Update fv3_setup

Author: mathomp4

scripts/fv3_setup

@@ -112,7 +112,6 @@ cd $ORIGPATH
 #######################################################################
 
 # Set default behavior of switches
-set LINKX = FALSE
 set EXE_VERB = "copied"
 set SINGULARITY_RUN_SITE = ""
 if ($singstat == 1) then
@@ -142,17 +141,6 @@ while ( $#argv > 0 )
       case --[Cc][Oo][Ll][Oo][Rr]:
          goto SETCOLOR
 
-      # Symlink StandAlone_FV3_Dycore.x
-      case --link:
-         set LINKX = TRUE
-         set EXE_VERB = "linked"
-         breaksw
-
-      # Avoid Symlink StandAlone_FV3_Dycore.x
-      case --nolink:
-         set LINKX = FALSE
-         breaksw
-
       # Here any string not above will trigger USAGE
       case -[Hh]:
       case --[Hh][Ee][Ll][Pp]:
@@ -704,6 +692,21 @@ endif
 if( -e $HOME/.GROUProot ) /bin/rm $HOME/.GROUProot
 echo $GROUP > $HOME/.GROUProot
 
+#######################################################################
+#                  Set some singularity variables
+#######################################################################
+
+# Copy or link GEOSgcm.x if USING_SINGULARITY is FALSE
+if ( $USING_SINGULARITY == FALSE ) then
+   # Set a couple variables for sed'ing out bits of the run script
+   set SINGULARITY_BUILD = "#DELETE"
+   set NATIVE_BUILD = ""
+else
+   # Set a couple variables for sed'ing out bits of the run script
+   set SINGULARITY_BUILD = ""
+   set NATIVE_BUILD = "#DELETE"
+endif
+
 #######################################################################
 #               Set Recommended MPI Stack Settings
 #######################################################################