Changes to schedule calib and run at the same time for 1970 hindcast

scripts/compilePlum.sh

@@ -6,5 +6,5 @@ echo "Building version: $buildver"
 
 echo "$buildver" > ../classes/buildver
 
-javac -J-Xmx1g -cp .:/exports/csce/eddie/geos/groups/LURG/models/gams/gams24.7_linux_x64_64_sfx/apifiles/Java/api/GAMSJavaAPI.jar ./src/ac/ed/lurg/*.java ./src/ac/ed/lurg/country/*.java ./src/ac/ed/lurg/country/gams/*.java ./src/ac/ed/lurg/demand/*.java ./src/ac/ed/lurg/landuse/*.java ./src/ac/ed/lurg/output/*.java ./src/ac/ed/lurg/types/*.java ./src/ac/ed/lurg/utils/*.java ./src/ac/ed/lurg/yield/*.java ./src/ac/sac/raster/*.java -d ../classes
+javac -J-Xmx1g -cp .:/exports/csce/eddie/geos/groups/LURG/models/gams/gams24.7_linux_x64_64_sfx/apifiles/Java/api/GAMSJavaAPI.jar ./src/ac/ed/lurg/*.java ./src/ac/ed/lurg/country/*.java ./src/ac/ed/lurg/country/gams/*.java ./src/ac/ed/lurg/demand/*.java ./src/ac/ed/lurg/landuse/*.java ./src/ac/ed/lurg/output/*.java ./src/ac/ed/lurg/types/*.java ./src/ac/ed/lurg/utils/*.java ./src/ac/ed/lurg/yield/*.java ./src/ac/sac/raster/*.java ./src/ac/ed/lurg/utils/cluster/*.java -d ../classes
 

scripts/createHindScenarios.sh

+#!/bin/sh
+
+filename="$1"
+common_calib_file=/exports/csce/eddie/geos/groups/LURG/models/PLUM/output/hind1970/common_p_calib.txt
+common_run_file=/exports/csce/eddie/geos/groups/LURG/models/PLUM/output/hind1970/common_p_run.txt
+output_dir=/exports/csce/eddie/geos/groups/LURG/models/PLUM/output/hind1970
+
+if [[ $* == *-O* ]]; then overwrite=1
+else overwrite=0
+fi
+
+if [ "$#" -lt 1  ]; then
+   echo "Need to specify scenario table file"
+   exit
+fi
+
+echo "Generating scenarios into $output_dir"
+
+while read -r datarow
+do
+  IFS=',' read -r -a array <<< "$datarow"
+
+  if [ -z "$header" ]; then
+     header=( "${array[@]}" )
+  else
+     scenario="${array[0]}"
+     scenario_dir=$output_dir/$scenario
+     echo "$scenario in $scenario_dir"
+     if [ ! -d "$scenario_dir" ]; then
+        mkdir $scenario_dir
+        mkdir $scenario_dir/calib
+     elif [ $overwrite -ne 1 ]; then
+        echo "Already have scenario $scenario, set -O to overwrite existing scenarios"
+        continue;
+     fi
+
+     calib_config_file=$scenario_dir/calib/config.properties
+     cp $common_calib_file $calib_config_file
+     echo "OUTPUT_DIR=$scenario_dir/calib" >> $calib_config_file
+
+     for index in "${!array[@]}"
+     do
+        echo "${header[index]}"="${array[index]}" >> $calib_config_file
+     done
+
+     run_config_file=$scenario_dir/config.properties
+     cp $common_run_file $run_config_file
+     echo "OUTPUT_DIR=$scenario_dir" >> $run_config_file
+     echo "SERIALIZED_LAND_USE_FILE=$scenario_dir/calib/landUseRaster.ser" >> $run_config_file
+
+     for index in "${!array[@]}"
+     do
+        echo "${header[index]}"="${array[index]}" >> $run_config_file
+     done
+
+     echo "$scenario generated"
+  fi
+done < $filename
+

scripts/runCalibAndPlum.sh

+#!/bin/sh
+
+if [ $# -ne 1 ]; then
+	echo need 1 argument to specify config/output directory
+	exit 0
+fi
+
+jobName=${1//\/}c # remove slash from path as qsub doesnt allow it
+echo $jobName
+
+qsub -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1/calib
+qsub -hold_jid $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1

src/ac/ed/lurg/utils/LogWriter.java

@@ -44,7 +44,7 @@ public class LogWriter {
 	private LogWriter(String outputFileName) {
 		try {
 			File f = new File(outputFileName);
-			if(f.exists()) 
+			if(f.getParentFile().exists()) 
 				logFile = new PrintWriter(new BufferedWriter(new FileWriter(outputFileName,false)));
 			else
 				System.err.println("LogWriter: outputFileName: " + outputFileName + " not found.  Perhaps not set config file properly");