From 7dc272105bf527296a8f3165e27ad608bad56b94 Mon Sep 17 00:00:00 2001
From: KyleKlenk <kyle.c.klenk@gmail.com>
Date: Mon, 25 Apr 2022 13:45:41 -0600
Subject: [PATCH] Deleted Summa_Actors_Settings.json from Repo
Configuration.py generates the file if it does not exist
---
config/Summa_Actors_Settings.json | 53 ----------------------------
config/configuration.py | 58 +++++++++++++++++++++++++++++--
2 files changed, 55 insertions(+), 56 deletions(-)
delete mode 100644 config/Summa_Actors_Settings.json
diff --git a/config/Summa_Actors_Settings.json b/config/Summa_Actors_Settings.json
deleted file mode 100644
index debfbef..0000000
--- a/config/Summa_Actors_Settings.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "JobSubmissionParams": {
- "cpus-per-task": 8,
- "memory": "32G",
- "job-name": "SummaActors",
- "account": "rpp-kshook",
- "numHRUs": 517315,
- "maxNumberOfJobs": 500,
- "maxGRUsPerSubmission": 1000,
- "executablePath": "/home/kklenk/SummaProjects/Summa-Actors/bin/summaMain"
- },
-
- "Configuration": {
- "controlVersion": "SUMMA_FILE_MANAGER_V3.0.0",
- "simStartTime": "1979-01-01 00:00",
- "simEndTime": "2019-12-31 23:00",
- "tmZoneInfo": "utcTime",
- "settingsPath": "/project/6008034/kklenk/settings/SummaActorsSettings/",
- "forcingPath": "/project/6008034/kklenk/forcingChunked/",
- "outputPath": "/home/kklenk/projects/rpp-kshook/kklenk/SummaActorsOutput/",
- "forcingFreq": "month",
- "forcingStart": "1979-01-01",
- "decisionsFile": "modelDecisions.txt",
- "outputControlFile": "outputControl.txt",
- "globalHruParamFile": "localParamInfo.txt",
- "globalGruParamFile": "basinParamInfo.txt",
- "attributeFile": "attributes.nc",
- "trialParamFile": "trialParams.nc",
- "forcingListFile": "forcingFileList.txt",
- "initConditionFile": "coldState.nc",
- "outFilePrefix": "SummaActors",
- "vegTableFile": "TBL_VEGPARM.TBL",
- "soilTableFile": "TBL_SOILPARM.TBL",
- "generalTableFile": "TBL_GENPARM.TBL",
- "noahmpTableFile": "TBL_MPTABLE.TBL"
- },
-
- "SummaActor": {
- "OuputStructureSize": 250,
- "maxGRUPerJob": 500
- },
-
- "JobActor": {
- "FileManagerPath": "/home/kklenk/projects/rpp-kshook/kklenk/settings/SummaActorsSettings/fileManager.txt",
- "outputCSV": false,
- "csvPath": ""
- },
-
- "HRUActor": {
- "printOutput": true,
- "outputFrequency": 500
- }
-}
\ No newline at end of file
diff --git a/config/configuration.py b/config/configuration.py
index d3a475e..b6d7145 100644
--- a/config/configuration.py
+++ b/config/configuration.py
@@ -12,9 +12,61 @@ def actor_setting(actor_id, setting_name, setting_value):
Function to create the inital summa_actors_settings file
"""
def create_init_config():
- Summa_Actor_Settings = ["OutputStructureSize", "maxGRUPerJob"]
- Job_Actor_Settings = ["FileManagerPath", "outputCSV", "csvPath"]
- HRU_Actor_Settings = ["printOutput", "outputFrequency"]
+ Settings_file = {
+ "JobSubmissionParams": {
+ "cpus-per-task": 1,
+ "memory": "",
+ "job-name": "",
+ "account": "",
+ "numHRUs": 1,
+ "maxNumberOfJobs": 1,
+ "maxGRUPerSubmission": 1,
+ "executablePath": ""
+ },
+
+ "Configuration": {
+ "controlVersion": "",
+ "simStartTime": "",
+ "simEndTime": "",
+ "tmZoneInfo": "",
+ "settingsPath": "",
+ "forcingPath": "",
+ "outputPath": "",
+ "forcingFreq": "",
+ "forcingStart": "",
+ "decisionsFile": "",
+ "outputControlFile": "",
+ "globalHruParamFile": "",
+ "globalGruParamFile": "",
+ "attributeFile": "",
+ "trialParamFile": "",
+ "forcingListFile": "",
+ "initConditionFile": "",
+ "outFilePrefix": "",
+ "vegTableFile": "",
+ "soilTableFile": "",
+ "generalTableFile": "",
+ "noahmpTableFile": ""
+ },
+
+ "SummaActor": {
+ "OuputStructureSize": 1,
+ "maxGRUPerJob": 1
+ },
+
+ "JobActor": {
+ "FileManagerPath": "",
+ "outputCSV": "",
+ "csvPath": ""
+ },
+
+ "HRUActor": {
+ "printOutput": "",
+ "outputFrequency": 1
+ }
+ }
+ with open('Summa_Actors_Settings.json', 'w') as outfile:
+ json.dump(Settings_file, outfile, indent=2)
"""
Function that creates the paths for the slurm output and the netCDF data
--
GitLab