From 99f280eb086c2cff105d5ab491253e7f4a348457 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 19 Dec 2005 15:53:47 +0000 Subject: [PATCH] Updated default command line options. --- src/BuildTiles/Parallel/fgfs-launch-clients | 7 ++++--- src/BuildTiles/Parallel/fgfs-launch-server | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/BuildTiles/Parallel/fgfs-launch-clients b/src/BuildTiles/Parallel/fgfs-launch-clients index 5637fcb9..eb8967e2 100755 --- a/src/BuildTiles/Parallel/fgfs-launch-clients +++ b/src/BuildTiles/Parallel/fgfs-launch-clients @@ -103,9 +103,10 @@ for i in $CLIENTS_RUDE; do # 9/26/05 (CLO) - removed GSHHS-LandMass from input data. We give up a # more detailed data source, but eliminate data conflicts that cause # occasional problems # and strange artifacts. - RMT_COMMAND="source ~/.bash_profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj VPF-Canals VPF-Cities VPF-FloodLand VPF-Lakes VPF-LandCover VPF-LandMass VPF-Railroads VPF-Rivers VPF-Roads VPF-Towns TowerObj SRTM-United_States-1 SRTM-North_America-3 SRTM-South_America-3 SRTM-Eurasia-3 SRTM-Africa-3 DEM-USGS-3 SRTM-30" - # (N-1) RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj GSHHS-LandMass VPF-Canals VPF-Cities VPF-FloodLand VPF-Lakes VPF-LandCover VPF-Railroads VPF-Rivers VPF-Roads VPF-Towns TowerObj SRTM-United_States-1 SRTM-North_America-3 SRTM-South_America-3 SRTM-Eurasia-3 SRTM-Africa-3 DEM-USGS-3 SRTM-30" - # (N-2) RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude --cover=$WORK_BASE/LC-Global/gusgs2_0ll.img AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass USA-Hydro USA-Urban SRTM-United_States-1 SRTM-North_America-3 SRTM-South_America-3 SRTM-Eurasia-3 DEM-USGS-3 SRTM-30" + RMT_COMMAND="source ~/.bash_profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj VPF-Canals VPF-Cities VPF-FloodLand VPF-Lakes VPF-LandCover VPF-LandMass VPF-Railroads VPF-Rivers VPF-Roads VPF-Towns TowerObj SRTM2-United_States-1 SRTM2-Africa-3 SRTM2-Australia-3 SRTM2-Eurasia-3 SRTM2-Islands-3 SRTM2-North_America-3 SRTM2-South_America-3 DEM-USGS-3 SRTM-30" + # (N-1) RMT_COMMAND="source ~/.bash_profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj VPF-Canals VPF-Cities VPF-FloodLand VPF-Lakes VPF-LandCover VPF-LandMass VPF-Railroads VPF-Rivers VPF-Roads VPF-Towns TowerObj SRTM-United_States-1 SRTM-North_America-3 SRTM-South_America-3 SRTM-Eurasia-3 SRTM-Africa-3 DEM-USGS-3 SRTM-30" + # (N-2) RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj GSHHS-LandMass VPF-Canals VPF-Cities VPF-FloodLand VPF-Lakes VPF-LandCover VPF-Railroads VPF-Rivers VPF-Roads VPF-Towns TowerObj SRTM-United_States-1 SRTM-North_America-3 SRTM-South_America-3 SRTM-Eurasia-3 SRTM-Africa-3 DEM-USGS-3 SRTM-30" + # (N-3) RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude --cover=$WORK_BASE/LC-Global/gusgs2_0ll.img AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass USA-Hydro USA-Urban SRTM-United_States-1 SRTM-North_America-3 SRTM-South_America-3 SRTM-Eurasia-3 DEM-USGS-3 SRTM-30" echo "client command:" echo "" echo "$RMT_COMMAND" diff --git a/src/BuildTiles/Parallel/fgfs-launch-server b/src/BuildTiles/Parallel/fgfs-launch-server index 0782ba3a..839acda2 100755 --- a/src/BuildTiles/Parallel/fgfs-launch-server +++ b/src/BuildTiles/Parallel/fgfs-launch-server @@ -33,7 +33,7 @@ else BASE_DIR=$1 shift WORK_BASE="${BASE_DIR}/Work" - OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.7" + OUTPUT_DIR="${BASE_DIR}/Scenery-1.0" MASTER_ON="${WORK_BASE}/Status/MASTER_ON" LOG_DIR="${WORK_BASE}/Status" LOG_FILE="${LOG_DIR}/server.log"