From b4b2e4179d3198ca1760a8a4db477f9e00dfdd4e Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Tue, 23 Apr 2024 08:50:32 +0200
Subject: [PATCH] fix: Changes necessary for ADASMELIAE_EU
---
.gitlab-ci.yml | 2 +-
ADASMELIAE.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7889e9a..6063682 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ deploy_to_remote_server:
- echo "MASK_FILE=$MASK_FILE" >> $ENV_FILE
# Copy files to server
- - rsync -avz --progress $ENV_FILE $MODEL_ID.cfg $MODEL_ID.py run_$MODEL_ID.sh test_$MODEL_ID.py requirements.txt europe_coastline.csv $SERVER_USER@$SERVER_IP:$HOME_DIR
+ - rsync -avz --progress $ENV_FILE ADASMELIAE.cfg ADASMELIAE.py run_ADASMELIAE.sh test_ADASMELIAE.py requirements.txt europe_coastline.csv $SERVER_USER@$SERVER_IP:$HOME_DIR
- rsync -avz --progress --rsync-path="mkdir -p $TMP_DIR && mkdir -p $HOME_DIR/log && mkdir -p $HOME_DIR/mapfile && rsync" mapfile/ $SERVER_USER@$SERVER_IP:$HOME_DIR/mapfile/
# Give nibio user (member of deployer group) rwx access
diff --git a/ADASMELIAE.py b/ADASMELIAE.py
index 3b3c9c3..8abd804 100755
--- a/ADASMELIAE.py
+++ b/ADASMELIAE.py
@@ -57,7 +57,7 @@ start_MM_DD = os.getenv("START_DATE_MM_DD")
end_MM_DD = os.getenv("END_DATE_MM_DD")
-config_file_path = f"{home_dir}{model_id}.cfg"
+config_file_path = f"{home_dir}ADASMELIAE.cfg"
mask_file_path = (
f"{home_dir}{os.getenv('MASK_FILE')}" if os.getenv("MASK_FILE") else None
)
--
GitLab