From 95a1f5810a645d4ccb2d9fc6fc07388d996af194 Mon Sep 17 00:00:00 2001
From: Peter Alexander <p.m.w.alexander@gmail.com>
Date: Mon, 18 Sep 2017 21:50:37 +0100
Subject: [PATCH] Job scripts and miscanthus calib constant
---
scripts/createHindScenarios.sh | 14 +++++++-------
scripts/scheduleHindScenarios.sh | 4 ++--
scripts/scheduleScenarios.sh | 2 +-
src/ac/ed/lurg/ModelConfig.java | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/createHindScenarios.sh b/scripts/createHindScenarios.sh
index 2b284af9..51971e8f 100755
--- a/scripts/createHindScenarios.sh
+++ b/scripts/createHindScenarios.sh
@@ -34,20 +34,20 @@ do
if [ ! -d "$scenario_dir" ]; then
mkdir $scenario_dir
- mkdir $scenario_dir/calib
+# 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
+# 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
+# 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
diff --git a/scripts/scheduleHindScenarios.sh b/scripts/scheduleHindScenarios.sh
index 85db4532..f782019c 100755
--- a/scripts/scheduleHindScenarios.sh
+++ b/scripts/scheduleHindScenarios.sh
@@ -27,8 +27,8 @@ do
continue;
fi
- echo "qsub -N ${ensemble}_$scenario /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh hind1970/$ensemble/$scenario"
- qsub -N ${ensemble}_$scenario /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh hind1970/$ensemble/$scenario
+ echo "qsub -N ${ensemble}_$scenario -hold_jid h_calib /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh hind1970/$ensemble/$scenario"
+ qsub -N ${ensemble}_$scenario -hold_jid h_calib /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh hind1970/$ensemble/$scenario
# echo "/exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runCalibAndPlum.sh hind1970/$ensemble/$scenario"
# /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runCalibAndPlum.sh hind1970/$ensemble/$scenario
fi
diff --git a/scripts/scheduleScenarios.sh b/scripts/scheduleScenarios.sh
index 50ca3b82..f6656338 100755
--- a/scripts/scheduleScenarios.sh
+++ b/scripts/scheduleScenarios.sh
@@ -27,7 +27,7 @@ do
continue;
fi
- jobName=$ensemble"_"$scenario
+ jobName="$(echo $ensemble | sed 's,\.\/,,' | sed 's,\/,_,g')_$scenario"
echo "qsub -hold_jid calib -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $ensemble/$scenario"
qsub -hold_jid calib -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $ensemble/$scenario
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 431987f3..ee3f236a 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -139,7 +139,7 @@ public class ModelConfig {
public static final double CALIB_FACTOR_PULSES = getDoubleProperty("CALIB_FACTOR_PULSES", 0.572);
public static final double CALIB_FACTOR_STARCHY_ROOTS = getDoubleProperty("CALIB_FACTOR_STARCHY_ROOTS", 5.832);
- public static final double CALIB_FACTOR_MISCANTHUS = getDoubleProperty("CALIB_FACTOR_MISCANTHUS", 2.113);
+ public static final double CALIB_FACTOR_MISCANTHUS = getDoubleProperty("CALIB_FACTOR_MISCANTHUS", 2.148);
public static final double CALIB_FACTOR_SRC = getDoubleProperty("CALIB_FACTOR_SRC", Double.NaN);
// Spatial (gridded) data
--
GitLab