Change GEOS-Chem Classic executable name from geos to gcclassic

Signed-off-by: Lizzie Lundgren <[email protected]>

GeosCore/CMakeLists.txt

@@ -130,19 +130,3 @@ target_link_libraries(GeosCore
   $<$<BOOL:${RRTMG}>:GeosRad>			# depends on GeosRad iff RRTMG is true
   $<$<BOOL:${GTMM}>:Hg>				# depends on Hg iff GTMM is true
 )
-
-# Need to turn this off for new GC Classic repo. Need better way...
-#if("geos" IN_LIST GCCLASSIC_EXE_TARGETS)
-#	# Add geos executable target
-#	add_executable(geos
-#		main.F
-#	)
-#	target_link_libraries(geos
-#		PUBLIC GeosCore
-#	)
-#	set_target_properties(geos PROPERTIES
-#		RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-#	install(TARGETS geos
-#		RUNTIME DESTINATION ${RUNDIR}
-#	)
-#endif()

Interfaces/GCClassic/main.F90

@@ -391,7 +391,7 @@ PROGRAM GEOS_Chem
   ! No actual "compute" is performed.
   !
   ! The "dry-run" option is initialized using the command line extra
-  ! argument ./geos --dry-run
+  ! argument ./gcclassic --dry-run
   !
   ! A log file can be specified with --log FILENAME.
   ! If no log file is specified, the default logfile will be
@@ -2767,7 +2767,7 @@ SUBROUTINE Print_Dry_Run_Warning( U )
     WRITE( U, 100 ) '!!! You will NOT get output for this run!'
     WRITE( U, 100 ) '!!! Use this command to validate a '         // &
                     'GEOS-Chem run configuration:'
-    WRITE( U, 100 ) '!!!   ./geos --dryrun > log'
+    WRITE( U, 100 ) '!!!   ./gcclassi --dryrun > log'
     WRITE( U, 100 ) '!!!'
     WRITE( U, 100 ) '!!! REMOVE THE --dryrun ARGUMENT FROM THE '   // &
                     'COMMAND LINE'

PKUCPL/PKUCPL.sh

@@ -86,25 +86,25 @@ echo "                 GLOBAL is exchanging with $nested1 $nested2 $nested3"
 
 pushd $global_dir
 echo "  @dir: $global_dir"
-./geos > log.geos &
+./gcclassic > log.gcclassic &
 popd
 
 if [ "$count" == 1 ] || [ "$count" == 2 ] || [ "$count" == 3 ];then
 	pushd $nested1_dir
 	echo "  @dir: $nested1_dir"
-	./geos > log.geos &
+	./gcclassic > log.gcclassic &
 	popd
 fi
 if [ "$count" == 2 ] || [ "$count" == 3 ];then
 	pushd $nested2_dir
 	echo "  @dir:$nested2_dir"
-	./geos > log.geos &
+	./gcclassic > log.gcclassic &
 	popd
 fi
 if [ "$count" == 3 ];then
 	pushd $nested3_dir
 	echo "  @dir: $nested3_dir"
-	./geos > log.geos &
+	./gcclassic > log.gcclassic &
 	popd
 fi
 

run/GCClassic/archiveRun.sh

@@ -93,7 +93,7 @@ mv CMake*.log ${archivedir}/build
 
 # Copy everything else
 echo "Copying files..."
-copyfiles geos                           ${archivedir}/bin
+copyfiles gcclassic                      ${archivedir}/bin
 copyfiles input.geos                     ${archivedir}/config
 copyfiles rundir.version                 ${archivedir}/config
 copyfiles "*.rc"                         ${archivedir}/config

run/GCClassic/runScriptSamples/geoschem.benchmark.run

@@ -20,7 +20,7 @@
 # !REMARKS:
 #  Designed to be used with the geosfp_4x5_standard run directory created
 #  by the GEOS-Chem Unit Tester. To use this script, you must first compile
-#  the GEOS-Chem code with CMake to create the geos executable.
+#  the GEOS-Chem code with CMake to create the gcclassic executable.
 #
 #  NOTES:
 #  (1) This script is customized for the Harvard "Cannon" cluster.  If you
@@ -70,7 +70,7 @@ log=$id.log
 #-------------------------------------------------
 
 # Run GEOS-Chem and pipe output to log
-srun -c $OMP_NUM_THREADS time -p ./geos >> $log
+srun -c $OMP_NUM_THREADS time -p ./gcclassic >> $log
 
 # Echo end time
 echo '===> Run ended at' `date` >> $log

run/GCClassic/runScriptSamples/geoschem.run

@@ -20,7 +20,7 @@ export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
 # Run GEOS_Chem.  The "time" command will return CPU and wall times.
 # Stdout and stderr will be directed to the "GC.log" log file
 # (you can change the log file name below if you wish)
-srun -c $OMP_NUM_THREADS time -p ./geos >> GC.log
+srun -c $OMP_NUM_THREADS time -p ./gcclassic >> GC.log
 
 # Exit normally
 exit 0