From 346223c905cc4bfb906f0091ea391717b1a5a977 Mon Sep 17 00:00:00 2001
From: SergioLangaritaBenitez <sergiolangaritabenitez@gmail.com>
Date: Thu, 7 Nov 2024 09:36:06 +0100
Subject: [PATCH] fix typo and add sfincs

---
 .../oscar_services/sfincs-interlink.yaml      | 21 +++++++++++++++++++
 .../oscar_services/sfincs-interlink_script.sh |  5 +++++
 .../cwl_OSCAR/oscar_services/sfincs_script.sh | 13 ++++--------
 ...ow_interlink.yaml => wflow-interlink.yaml} |  2 +-
 ...nk_script.sh => wflow-interlink_script.sh} |  0
 5 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink.yaml
 create mode 100644 DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink_script.sh
 rename DT_flood/workflows/cwl_OSCAR/oscar_services/{wflow_interlink.yaml => wflow-interlink.yaml} (98%)
 rename DT_flood/workflows/cwl_OSCAR/oscar_services/{wflow_interlink_script.sh => wflow-interlink_script.sh} (100%)

diff --git a/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink.yaml b/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink.yaml
new file mode 100644
index 0000000..777f2ed
--- /dev/null
+++ b/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink.yaml
@@ -0,0 +1,21 @@
+functions:
+  oscar:
+  - cluster-id:
+      name: sfincs-interlink
+      cpu: '4.0'
+      memory: 6Gi
+      image: docker://deltares/sfincs-cpu:sfincs-v2.1.1-Dollerup-Release
+      script: sfincs_interlink_script.sh
+      log_level: DEBUG   # To avoid supervisor logs in response
+      interlink_node_name: vega-new-vk
+      annotations:
+        slurm-job.vk.io/singularity-options: --no-home --no-mount /exa5
+        slurm-job.vk.io/singularity-mounts:  --bind /ceph/hpc/home/ciangottinid/oscar_home:/tmp
+        job.vk.io/singularity-mounts: --bind /ceph/hpc/data/st2301-itwin-users/:/interlink/
+        slurm-job.vk.io/flags: --job-name=test-sfincs --time=02:30:00   --nodes=1
+      input:
+      - storage_provider: minio
+        path: sfincs/in
+      output:
+      - storage_provider: minio
+        path: sfincs/out
\ No newline at end of file
diff --git a/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink_script.sh b/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink_script.sh
new file mode 100644
index 0000000..8182deb
--- /dev/null
+++ b/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs-interlink_script.sh
@@ -0,0 +1,5 @@
+OUTPUT_FILE="$TMP_OUTPUT_DIR/sfincs_output.tar"
+tar -xvf  "$INPUT_FILE_PATH" -C /data/
+sfincs
+tar -cf sfincs_output.tar sfincs_map.nc sfincs_his.nc
+mv /data/sfincs_output.tar  $OUTPUT_FILE
diff --git a/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs_script.sh b/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs_script.sh
index 6ca8ab6..8182deb 100644
--- a/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs_script.sh
+++ b/DT_flood/workflows/cwl_OSCAR/oscar_services/sfincs_script.sh
@@ -1,10 +1,5 @@
-FILE_NAME=`basename "$INPUT_FILE_PATH"`
-OUTPUT_FILE="$TMP_OUTPUT_DIR/$FILE_NAME.nc"
-mkdir -p /model
-tar -xvf  "$INPUT_FILE_PATH" -C /model/
-/app/build/create_binaries/wflow_bundle/bin/wflow_cli /model/wflow_warmup/wflow_sbm.toml
-mv /model/wflow_event/instate/instates.nc  $OUTPUT_FILE
-
-
+OUTPUT_FILE="$TMP_OUTPUT_DIR/sfincs_output.tar"
 tar -xvf  "$INPUT_FILE_PATH" -C /data/
-sfincs
\ No newline at end of file
+sfincs
+tar -cf sfincs_output.tar sfincs_map.nc sfincs_his.nc
+mv /data/sfincs_output.tar  $OUTPUT_FILE
diff --git a/DT_flood/workflows/cwl_OSCAR/oscar_services/wflow_interlink.yaml b/DT_flood/workflows/cwl_OSCAR/oscar_services/wflow-interlink.yaml
similarity index 98%
rename from DT_flood/workflows/cwl_OSCAR/oscar_services/wflow_interlink.yaml
rename to DT_flood/workflows/cwl_OSCAR/oscar_services/wflow-interlink.yaml
index 5ec16d1..e2cd956 100644
--- a/DT_flood/workflows/cwl_OSCAR/oscar_services/wflow_interlink.yaml
+++ b/DT_flood/workflows/cwl_OSCAR/oscar_services/wflow-interlink.yaml
@@ -1,6 +1,6 @@
 functions:
   oscar:
-  - oscarr:
+  - cluster-id:
       name: wflow-interlink
       cpu: '4.0'
       memory: 6Gi
diff --git a/DT_flood/workflows/cwl_OSCAR/oscar_services/wflow_interlink_script.sh b/DT_flood/workflows/cwl_OSCAR/oscar_services/wflow-interlink_script.sh
similarity index 100%
rename from DT_flood/workflows/cwl_OSCAR/oscar_services/wflow_interlink_script.sh
rename to DT_flood/workflows/cwl_OSCAR/oscar_services/wflow-interlink_script.sh