Merge branch 'master' of github.com:exoclime/THOR-dev

Author: deitrr

changelog.md

@@ -22,3 +22,9 @@
  * further updates to python plotting tools to make them more flexible
  * added "custom_example.py" to mjolnir to demonstrate how to make multipanel plots with the python tools
  * grid output now contains differential operators grad, div, and vertical component of curl (the latter is not used by the model, but may be useful in post-processing)
+ * added new features to double-grey RT: latitude variations, power law scaling of optical
+ depth, and surface heating
+ * added boundary layer module which calculates drag against the lower surface (rayleigh drag only for now)
+ * changed name of 'diff_fac' input parameter to 'diff_ang' to be more consistent ('diff_ang' = 1/diffusivity factor)
+ * fixed incompatibility with recent versions (> 1.10.1) of hdf5 libraries
+ * updated behavior of NonHydro = false and DeepModel = false model options to be consistent with White+ 2005

ifile/deephj.thr

@@ -158,7 +158,24 @@ tausw = 1.67
 Tlow = 50
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = true
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = true
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 4
+n_sw = 2
+# strength of unmixed absorbers in lw
+f_lw = 0.1
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -185,6 +202,17 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
 
 #-- Device options -----------------------------------------------------------#
 # GPU ID number

ifile/earth_acoustic_test.thr

@@ -7,14 +7,14 @@ config_version = 1
 
 #-- Time stepping and output options -----------------------------------------#
 # number of steps
-num_steps = 96
+num_steps = 97
 
 # length of timesteps in seconds
 timestep = 1800
 
 # output
 # output every n steps
-n_out = 2
+n_out = 1
 
 # output directory (relative to current working directory)
 # defaults to 'results'
@@ -157,7 +157,24 @@ tausw = 1.67
 Tlow = 50
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = true
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = true
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 4
+n_sw = 2
+# strength of unmixed absorbers in lw
+f_lw = 0.1
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -184,6 +201,18 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
+
 #-- Device options -----------------------------------------------------------#
 # GPU ID number
 GPU_ID_N = 0

ifile/earth_gwave_test.thr

@@ -157,7 +157,24 @@ tausw = 1.67
 Tlow = 50
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = true
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = true
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 4
+n_sw = 2
+# strength of unmixed absorbers in lw
+f_lw = 0.1
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -184,6 +201,18 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
+
 #-- Device options -----------------------------------------------------------#
 # GPU ID number
 GPU_ID_N = 0

ifile/earth_hstest.thr

@@ -134,7 +134,7 @@ Rv_sponge = 1e-5
 
 
 #-- Radiative transfer options (core_benchmark = NoBenchmark) --------------------------#
-radiative_transfer = true
+radiative_transfer = false
 ## RT parameters #######################################
 # stellar temperature (k)
 Tstar = 5800
@@ -158,7 +158,24 @@ tausw = 1.67
 Tlow = 50
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = true
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = true
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 4
+n_sw = 2
+# strength of unmixed absorbers in lw
+f_lw = 0.1
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -185,6 +202,19 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
+
+
 #-- Device options -----------------------------------------------------------#
 # GPU ID number
 GPU_ID_N = 0

ifile/earth_sync.thr

@@ -157,7 +157,24 @@ tausw = 1.67
 Tlow = 50
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = true
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = true
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 4
+n_sw = 2
+# strength of unmixed absorbers in lw
+f_lw = 0.1
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -184,6 +201,17 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
 
 #-- Device options -----------------------------------------------------------#
 # GPU ID number

ifile/shallowhj.thr

@@ -157,7 +157,24 @@ tausw = 1.67
 Tlow = 50
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = true
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = true
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 4
+n_sw = 2
+# strength of unmixed absorbers in lw
+f_lw = 0.1
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -184,6 +201,17 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
 
 #-- Device options -----------------------------------------------------------#
 # GPU ID number

ifile/wasp43b_ex.thr

@@ -146,7 +146,7 @@ radius_star = 0.667
 albedo = 0.18
 
 # grey opt. depth of thermal wavelengths (at ref pressure)
-taulw = 1064
+taulw = 2128
 
 # grey opt. depth of incoming stellar flux (at ref pressure)
 tausw = 532
@@ -155,7 +155,24 @@ tausw = 532
 Tlow = 970
 
 # diffusivity factor
-diff_fac = 0.5
+diff_ang = 0.5
+
+# add sin(lat)^2 dependence to tau lw (advanced)
+latf_lw = false
+# opt depth at poles (lw)
+taulw_pole = 1.5
+
+# include surface heating
+surface = false
+# heat capacity of surface
+Csurf = 1e7
+
+# power law index of unmixed absorbers (lw and sw)
+n_lw = 2
+n_sw = 1
+# strength of unmixed absorbers in lw
+f_lw = 0.5
+
 #########################################################
 
 ## insolation (orbit + spin-state) parameters ###########
@@ -182,6 +199,17 @@ sync_rot = true
 #longp = 0
 #########################################################
 
+#-- Boundary layer options (core_benchmark = NoBenchmark) --------------------#
+boundary_layer = false
+
+# type of boundary layer drag
+bl_type = RayleighHS
+
+# strength of drag
+#surf_drag = 1.157407e-5
+
+# boundary layer sigma (drag exist at this % of surface pressure and above)
+#bl_sigma = 0.7
 
 #-- Device options -----------------------------------------------------------#
 # GPU ID number