From d45e5448beb05449ab77050200f163e15ec45012 Mon Sep 17 00:00:00 2001
From: Francesco Sabatini <francesco.sabatini@idiv.de>
Date: Wed, 29 Apr 2020 17:37:49 +0200
Subject: [PATCH] aligned cli and submit
---
cli_01b.r | 2 --
submit_01b.sh | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/cli_01b.r b/cli_01b.r
index 850936d..ad8c31f 100644
--- a/cli_01b.r
+++ b/cli_01b.r
@@ -105,6 +105,4 @@ ncores <- cli$options$ncores
# ------------------------------------------------------------------------------
source("01b_MesobromionCluster.R")
-<<<<<<< HEAD
Mesobromion(species.path, traits.path, output, myfunction, combinations, start.round, relax.round,
->>>>>>> 8a43e44028ed18129c0ddc708e41bbedf1cd9177
diff --git a/submit_01b.sh b/submit_01b.sh
index 6184a13..e2544bc 100644
--- a/submit_01b.sh
+++ b/submit_01b.sh
@@ -23,7 +23,7 @@ Rscript \
--max.inter.t 20 \
--chunk.i NA \
--chunkn NA \
- --nperm 999 \
+ --nperm 199 \
--ncores ${NSLOTS:-1} \
--start.round 4 \
--relax.round 7 \
--
GitLab