From 23452fb7d24bcf81775deea0a8450a5302098aa3 Mon Sep 17 00:00:00 2001
From: KyleKlenk <kyle.c.klenk@gmail.com>
Date: Tue, 4 Oct 2022 14:45:53 +0000
Subject: [PATCH] added more settings files
---
Distributed-Documentation.md | 8 +++----
Summa-Actors.code-workspace | 11 +++++++++
config/create_summa_actors_config.py | 24 ++++++++++++++++++-
.../docker/launch_docker_container.sh | 9 +++----
4 files changed, 41 insertions(+), 11 deletions(-)
create mode 100644 Summa-Actors.code-workspace
diff --git a/Distributed-Documentation.md b/Distributed-Documentation.md
index 1b1153c..4f5fb78 100644
--- a/Distributed-Documentation.md
+++ b/Distributed-Documentation.md
@@ -3,11 +3,11 @@ SUMMA-Distributed is an actor program that can compute the solution to HRUs usin
To achieve this we had to introduce two new actors into SUMMA-Actors the client actor and the server actor. These actors in combintaiton can
compute the solution to HRUs.
-To use distributed mode. Set the distributed
-
+To use distributed mode. Set the "distributed-mode" setting to true in the Summa_Actors_Settings.json file.
## SUMMA-Server
-
+Run the server with:
+ - summaMain -s -c /path/to/config
## SUMMA-Client
-
+Run the cleint with
diff --git a/Summa-Actors.code-workspace b/Summa-Actors.code-workspace
new file mode 100644
index 0000000..8b3da04
--- /dev/null
+++ b/Summa-Actors.code-workspace
@@ -0,0 +1,11 @@
+{
+ "folders": [
+ {
+ "path": "."
+ },
+ {
+ "path": "../gladwell"
+ }
+ ],
+ "settings": {}
+}
\ No newline at end of file
diff --git a/config/create_summa_actors_config.py b/config/create_summa_actors_config.py
index e2580e7..5e38881 100644
--- a/config/create_summa_actors_config.py
+++ b/config/create_summa_actors_config.py
@@ -30,7 +30,29 @@ def file_access_actor_settings():
def job_actor_settings():
job_actor_settings = {
- "FileManagerPath" : "",
+ "FileManagerPath" : "",
+ "controlVersion" : "",
+ "simStartTime" : "",
+ "simEndTime" : "",
+ "tmZoneInfo" : "",
+ "settingsPath" : "",
+ "forcingPath" : "",
+ "outputPath" : "",
+ "forcingFreq" : "",
+ "forcingStart" : "",
+ "decisionsFile" : "",
+ "outputControlFile" : "",
+ "globalHruParamFile" : "",
+ "globalGruParamFile" : "",
+ "attributeFile" : "",
+ "trialParamFile" : "",
+ "forcingListFile" : "",
+ "initConditionFile" : "",
+ "outFilePrefix" : "",
+ "vegTableFile" : "",
+ "soilTableFile" : "",
+ "generalTableFile" : "",
+ "noahmpTableFile" : "",
"outputCSV": False,
"csvPath": ""
}
diff --git a/utils/containers/docker/launch_docker_container.sh b/utils/containers/docker/launch_docker_container.sh
index 0bf72c7..94723c4 100755
--- a/utils/containers/docker/launch_docker_container.sh
+++ b/utils/containers/docker/launch_docker_container.sh
@@ -1,9 +1,6 @@
#! /bin/bash
-export PROJECT_DIR=/Users/kyleklenk/SUMMA-Projects/Summa-Actors
-export NA_TEST=/home/local/kck540/NA_Summa_Test
-export SUMMA=/Users/kyleklenk/SUMMA-Projects/summa
+export PROJECT_DIR=/home/local/kck540/SUMMA-Projects/Summa-Distributed/Summa-Actors
+export GLADWELL=/gladwell
docker run -d -it --name SUMMA-Actors --mount type=bind,source=${PROJECT_DIR},target=/Summa-Actors \
- --mount type=bind,source=${SUMMA},target=/SUMMA summa-actors:latest
- # --mount type=bind,source=${NA_TEST},target=/NA_Test \
- # \
\ No newline at end of file
+ --mount type=bind,source=${GLADWELL},target=/gladwell summa-actors:latest
\ No newline at end of file
--
GitLab