Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Geodynamo
pygeodyn
Commits
e9db820c
Commit
e9db820c
authored
Jul 01, 2019
by
Loic Huder
Browse files
Changed 'prior' path into 'priors' to fit new structure of pygeodyn_data
Former-commit-id:
a986322f
parent
7d3590da
Changes
8
Hide whitespace changes
Inline
Side-by-side
augkf.conf
View file @
e9db820c
...
...
@@ -9,7 +9,7 @@ t_start date 1980
t_end
date
2015
dt_f
months
6
dt_a
months
12
prior_dir
str
data
/
prior
/
midpath
prior_dir
str
data
/
prior
s
/
midpath
prior_type
str
midpath
obs_dir
str
data
/
observations
/
COVOBS_hd
obs_type
str
COVOBS
\ No newline at end of file
augkf_dense.conf
View file @
e9db820c
...
...
@@ -8,7 +8,7 @@ t_start date 1955
t_end
date
2020
dt_f
months
6
dt_a
months
12
prior_dir
str
data
/
prior
/
midpath
prior_dir
str
data
/
prior
s
/
midpath
prior_type
str
midpath
obs_dir
str
data
/
observations
/
COVOBS_hd
obs_type
str
COVOBS
...
...
augkf_obs.conf
View file @
e9db820c
...
...
@@ -8,7 +8,7 @@ t_start date 1997-11
t_end
date
2017
-
11
dt_f
months
2
dt_a
months
4
prior_dir
str
data
/
prior
/
CE_augkf
prior_dir
str
data
/
prior
s
/
CE_augkf
prior_type
str
coupled_earth
obs_dir
str
data
/
observations
/
GO
-
VO_2017
obs_type
str
GO_VO
docs/configuration.rst
View file @
e9db820c
...
...
@@ -141,7 +141,7 @@ List of possible parameters
The given path can be absolute or relative to the configuration file.
- **Type**: *str*
- **Default value**: ./data/prior/CE_augkf
- **Default value**: ./data/prior
s
/CE_augkf
- prior_type
Type of the prior data contained in prior_dir. Must correspond to a reading method implemented in pygeodyn/inout/priors.
...
...
example.conf
View file @
e9db820c
...
...
@@ -29,7 +29,7 @@ TauU years 30
# Time constant for diagonal AR-1 process of ER
TauE
years
10
# Directory where to find the prior data (relative to the config path)
prior_dir
str
data
/
prior
/
CE_augkf
prior_dir
str
data
/
prior
s
/
CE_augkf
# Type of the prior data ('coupled_earth' and 'midpath' are supported)
prior_type
str
coupled_earth
# Sampling time for midpath data
...
...
pygeodyn/inout/config.py
View file @
e9db820c
...
...
@@ -149,7 +149,7 @@ class ComputationConfig(object):
Builds the full path according to the path given in conf or set default.
"""
if
not
hasattr
(
self
,
'prior_dir'
):
self
.
prior_dir
=
'data/prior/CE_augkf'
self
.
prior_dir
=
'data/prior
s
/CE_augkf'
self
.
prior_type
=
'coupled_earth'
if
not
hasattr
(
self
,
'prior_type'
):
...
...
pygeodyn/tests/test_config.conf
View file @
e9db820c
...
...
@@ -8,7 +8,7 @@ t_start date 1960
t_end
date
1962
dt_f
months
6
dt_a
months
12
prior_dir
str
data
/
prior
/
midpath
prior_dir
str
data
/
prior
s
/
midpath
prior_type
str
midpath
obs_dir
str
data
/
observations
/
COVOBS_hd
obs_type
str
COVOBS
...
...
pygeodyn/tests/test_dense.conf
View file @
e9db820c
...
...
@@ -8,7 +8,7 @@ t_start date 1960
t_end
date
1965
dt_f
months
6
dt_a
months
12
prior_dir
str
data
/
prior
/
midpath
prior_dir
str
data
/
prior
s
/
midpath
prior_type
str
midpath
obs_dir
str
data
/
observations
/
COVOBS_hd
obs_type
str
COVOBS
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment