diff --git a/scripts/createHindScenarios.sh b/scripts/createHindScenarios.sh index 2b284af9eabcc0cb9d898ca507c8b26a3dbf7423..51971e8f714f0e3ecd1b1409b6671b6784f4f748 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 85db45324149f298fe806989fde0a3bb261e629f..f782019c81fe3e9ab86df1eae2faafba5b4c3f6a 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 50ca3b8288b93600e976b1d51c89bf6795ad36db..f6656338aace6011f43d4ca5cd463afd1515ee7c 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 431987f3f7cea743def29afa9144e9beb418c9f7..ee3f236aaa47d987c72941c60071f9891c83b5ea 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