From f0dd89f635dfd24bba2f720e9d351de6215823ca Mon Sep 17 00:00:00 2001
From: Maria Voigt <maria.voigt@idiv.de>
Date: Tue, 5 Sep 2017 10:43:20 +0200
Subject: [PATCH] deleted some additional predictors that not needed
---
src/model_fitting/abundance_model.R | 6 ------
src/pipeline/submit_pipeline_model.sh | 31 +++++++++++++--------------
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/model_fitting/abundance_model.R b/src/model_fitting/abundance_model.R
index 11999b9..0e53fd2 100644
--- a/src/model_fitting/abundance_model.R
+++ b/src/model_fitting/abundance_model.R
@@ -217,12 +217,6 @@ predictor_names_for_scaling <- c( "dem",
"plantation_distance",
"pulp_distance",
"palm_distance",
- "plantation_age",
- "plantation_cover",
- "IOPP_age",
- "IOPP_cover",
- "ITP_age",
- "ITP_cover",
"dom_T_OC",
"dom_T_PH")
diff --git a/src/pipeline/submit_pipeline_model.sh b/src/pipeline/submit_pipeline_model.sh
index b21e587..6427310 100644
--- a/src/pipeline/submit_pipeline_model.sh
+++ b/src/pipeline/submit_pipeline_model.sh
@@ -6,14 +6,13 @@
# here somehow write the prefix depending on what we are testing
-JOB_NAME_PREFIX=ppln_ae150m_50
+JOB_NAME_PREFIX=ppln_ae4.5m_50
INPUT_PATH='/data/idiv_kuehl/maria_data/pipeline'
NAME=$JOB_NAME_PREFIX-$(date +%FT%H-%M-%S)
# FIX THIS
OUTPUT_PATH=/work/$USER/$NAME
-
# qsub -v means that OUTPUT_PATH goes into environment (normally export, but with qsub different)
QSUB="qsub -terse -v OUTPUT_PATH=$OUTPUT_PATH -o /work/$USER/$NAME.log -j y"
@@ -22,22 +21,22 @@ QSUB="qsub -terse -v OUTPUT_PATH=$OUTPUT_PATH -o /work/$USER/$NAME.log -j y"
# model-fitting & prediction
# ------------------------------------------------------------------------------
-
- MODEL_JOB_ID_FITTING=$($QSUB \
- -N ${JOB_NAME_PREFIX}_fitting \
- $HOME/orangutan_density_distribution/src/model_fitting/submit_abundance_model_ac_term.sh \
- -i $INPUT_PATH \
- --ESW-aerial 0.15 \
- --include-aerial \
- --stability)
+MODEL_JOB_ID_FITTING=$($QSUB \
+ -N ${JOB_NAME_PREFIX}_fitting \
+ $HOME/orangutan_density_distribution/src/model_fitting/submit_abundance_model.sh \
+ -i $INPUT_PATH \
+ --ESW-aerial 0.0045 \
+ --include-aerial \
+ --stability)
# prediction submitten
MODEL_JOB_ID_PRED=$($QSUB \
- -N ${JOB_NAME_PREFIX}_prediction \
- -hold_jid $MODEL_JOB_ID_FITTING \
- -t 1999:2015 \
- $HOME/orangutan_density_distribution/src/prediction/submit_abundance_pred.sh \
- -i $INPUT_PATH \
- --focal-change-predictor NA)
+ -N ${JOB_NAME_PREFIX}_prediction \
+ -hold_jid $MODEL_JOB_ID_FITTING \
+ -t 1999:2015 \
+ $HOME/orangutan_density_distribution/src/prediction/submit_abundance_pred.sh \
+ -i $INPUT_PATH \
+ --input-model $OUTPUT_PATH \
+ --focal-change-predictor NA)
--
GitLab