From fdb36e71b504fbbd601260d511c56e8b9ff46269 Mon Sep 17 00:00:00 2001
From: JakobDeutloff <50237419+JakobDeutloff@users.noreply.github.com>
Date: Mon, 11 Apr 2022 12:08:25 +0200
Subject: [PATCH] directory setting in build_config scripts added
---
.../Code/build_config_files/build_config_1.py | 11 ++++++++++
.../Code/build_config_files/build_config_2.py | 11 ++++++++++
.../Code/build_config_files/build_config_3.py | 11 ++++++++++
.../Code/build_config_files/build_config_4.py | 11 ++++++++++
.../build_config_files/build_config_MOSAiC.py | 13 +++++++++++-
.../build_config_initial_state.py | 11 ++++++++++
.../build_config_mosaic1.py | 15 ++++++++++++--
Run_specifics/config.json | 20 +++++++++----------
Run_specifics/description.txt | 2 +-
9 files changed, 91 insertions(+), 14 deletions(-)
diff --git a/Python_files/Code/build_config_files/build_config_1.py b/Python_files/Code/build_config_files/build_config_1.py
index 44796ab..85d241f 100644
--- a/Python_files/Code/build_config_files/build_config_1.py
+++ b/Python_files/Code/build_config_files/build_config_1.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
rho_l = 1028
diff --git a/Python_files/Code/build_config_files/build_config_2.py b/Python_files/Code/build_config_files/build_config_2.py
index ad0cd85..14bda5a 100644
--- a/Python_files/Code/build_config_files/build_config_2.py
+++ b/Python_files/Code/build_config_files/build_config_2.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
rho_l = 1028
diff --git a/Python_files/Code/build_config_files/build_config_3.py b/Python_files/Code/build_config_files/build_config_3.py
index f2b3701..2502bd0 100644
--- a/Python_files/Code/build_config_files/build_config_3.py
+++ b/Python_files/Code/build_config_files/build_config_3.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
rho_l = 1028
diff --git a/Python_files/Code/build_config_files/build_config_4.py b/Python_files/Code/build_config_files/build_config_4.py
index 4e5728e..390eb2d 100644
--- a/Python_files/Code/build_config_files/build_config_4.py
+++ b/Python_files/Code/build_config_files/build_config_4.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
diff --git a/Python_files/Code/build_config_files/build_config_MOSAiC.py b/Python_files/Code/build_config_files/build_config_MOSAiC.py
index d8991c4..0aab77e 100644
--- a/Python_files/Code/build_config_files/build_config_MOSAiC.py
+++ b/Python_files/Code/build_config_files/build_config_MOSAiC.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
rho_l = 1028
@@ -61,7 +72,7 @@ config['harmonic_flag'] = 2
config['prescribe_flag'] = 1
config['salt_flag'] = 1
# ________________________bottom setting______________________
-config['turb_flag'] = 1
+config['turb_flag'] = 2 # was on two in 203
config['bottom_flag'] = 1
config['tank_flag'] = 1
# ________________________snow______________________
diff --git a/Python_files/Code/build_config_files/build_config_initial_state.py b/Python_files/Code/build_config_files/build_config_initial_state.py
index e300efa..9962425 100644
--- a/Python_files/Code/build_config_files/build_config_initial_state.py
+++ b/Python_files/Code/build_config_files/build_config_initial_state.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
rho_l = 1028
diff --git a/Python_files/Code/build_config_files/build_config_mosaic1.py b/Python_files/Code/build_config_files/build_config_mosaic1.py
index 5b68b14..8a4372d 100644
--- a/Python_files/Code/build_config_files/build_config_mosaic1.py
+++ b/Python_files/Code/build_config_files/build_config_mosaic1.py
@@ -1,5 +1,16 @@
import json
from func_bound_values import *
+import os
+
+# set wd to build_config_files folder
+wd = os.getcwd()
+# check if already in correct wd
+if wd[-18:] == 'build_config_files':
+ pass
+# if not, change to build_config_files
+else:
+ path = wd + '/Python_files/Code/build_config_files'
+ os.chdir(path)
# set constants
@@ -50,10 +61,10 @@ config['N_middle'] = config['Nlayer'] - config['N_top'] - config['N_bottom']
# **********************************************************************************************************************
# ________________________top heat flux____________
config['boundflux_flag'] = 2
-config['albedo_flag'] = 1
+config['albedo_flag'] = 2
# ________________________brine_dynamics____________
config['grav_heat_flag'] = 1 # was set to 2 in testcase 203!
-config['flush_heat_flag'] = 2
+config['flush_heat_flag'] = 1
config['flood_flag'] = 2
config['flush_flag'] = 5
config['grav_flag'] = 2
diff --git a/Run_specifics/config.json b/Run_specifics/config.json
index 20a7276..8bdcc22 100644
--- a/Run_specifics/config.json
+++ b/Run_specifics/config.json
@@ -1,10 +1,10 @@
{
- "dt": 20,
+ "dt": 20.0,
"time": 0.0,
- "time_out": 86400,
- "time_total": 55468800,
+ "time_out": 86400.0,
+ "time_total": 55468800.0,
"timestep_data": 60,
- "length_input": 924481,
+ "length_input": 924481.0,
"thick_0": 0.02,
"Nlayer": 80,
"N_active": 1,
@@ -12,9 +12,9 @@
"N_bottom": 20,
"N_middle": 40,
"boundflux_flag": 2,
- "albedo_flag": 1,
+ "albedo_flag": 2,
"grav_heat_flag": 1,
- "flush_heat_flag": 2,
+ "flush_heat_flag": 1,
"flood_flag": 2,
"flush_flag": 5,
"grav_flag": 2,
@@ -35,11 +35,11 @@
"tank_depth": 0,
"alpha_flux_stable": 0,
"alpha_flux_instable": 0,
- "N_bgc": 0,
- "bgc_bottom_1": 0,
- "bgc_bottom_2": 0,
+ "N_bgc": 2,
+ "bgc_bottom_1": 400,
+ "bgc_bottom_2": 500,
"thick_1": 0.02,
"m_1": 20.56,
"S_abs_1": 699.04,
- "H_abs_1": 0
+ "H_abs_1": -125827.19999999998
}
\ No newline at end of file
diff --git a/Run_specifics/description.txt b/Run_specifics/description.txt
index 0982601..fd739a7 100644
--- a/Run_specifics/description.txt
+++ b/Run_specifics/description.txt
@@ -1 +1 @@
-Mosaic_run_1
\ No newline at end of file
+Testcase_MOSAiC
\ No newline at end of file
--
GitLab