Skip to content

Commit 342dc8c

Browse files
author
DemAnasta
authored
Merge pull request #39 from DSOlab/issue38
Issue38
2 parents ec470d7 + c53ac72 commit 342dc8c

File tree

7 files changed

+340
-158
lines changed

7 files changed

+340
-158
lines changed

.github/ChangeLog.md

Lines changed: 83 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,83 @@
1-
## Change log
2-
> Not created yet!
3-
4-
### 2015/02/09 - Inception
5-
> Author(s):
6-
Demitris G. Anastasiou
7-
Xanthos Papanikolaou
8-
Athanassios Ganas
1+
# Change Log
2+
3+
## [v1.0-rc2.0](https://github.com/DSOlab/StrainTool/tree/v1.0-rc2.0) (2018-11-27)
4+
[Full Changelog](https://github.com/DSOlab/StrainTool/compare/v1.0-rc1.0...v1.0-rc2.0)
5+
6+
**Implemented enhancements:**
7+
8+
- Dev danast go for rc2.0 [\#36](https://github.com/DSOlab/StrainTool/pull/36) ([demanasta](https://github.com/demanasta))
9+
- Gmt patch [\#35](https://github.com/DSOlab/StrainTool/pull/35) ([demanasta](https://github.com/demanasta))
10+
11+
**Fixed bugs:**
12+
13+
- Dev danast go for rc2.0 [\#36](https://github.com/DSOlab/StrainTool/pull/36) ([demanasta](https://github.com/demanasta))
14+
15+
**Closed issues:**
16+
17+
- calc of second invariant [\#34](https://github.com/DSOlab/StrainTool/issues/34)
18+
19+
## [v1.0-rc1.0](https://github.com/DSOlab/StrainTool/tree/v1.0-rc1.0) (2018-07-18)
20+
[Full Changelog](https://github.com/DSOlab/StrainTool/compare/v1.0-beta4.0...v1.0-rc1.0)
21+
22+
**Implemented enhancements:**
23+
24+
- gmt:add stamp that StrainTool used [\#28](https://github.com/DSOlab/StrainTool/issues/28)
25+
- gmt\_script: plot stations and velocities alone [\#20](https://github.com/DSOlab/StrainTool/issues/20)
26+
- get DOI and add metadata set [\#16](https://github.com/DSOlab/StrainTool/issues/16)
27+
- reformat project folders [\#15](https://github.com/DSOlab/StrainTool/issues/15)
28+
- gmt\_script: add delaunay triangles [\#8](https://github.com/DSOlab/StrainTool/issues/8)
29+
- License managements [\#4](https://github.com/DSOlab/StrainTool/issues/4)
30+
- project name [\#2](https://github.com/DSOlab/StrainTool/issues/2)
31+
- Opt [\#32](https://github.com/DSOlab/StrainTool/pull/32) ([demanasta](https://github.com/demanasta))
32+
- Dev danast [\#30](https://github.com/DSOlab/StrainTool/pull/30) ([demanasta](https://github.com/demanasta))
33+
- Gmt patch [\#29](https://github.com/DSOlab/StrainTool/pull/29) ([demanasta](https://github.com/demanasta))
34+
- Dev danast [\#27](https://github.com/DSOlab/StrainTool/pull/27) ([demanasta](https://github.com/demanasta))
35+
- Gmt patch [\#26](https://github.com/DSOlab/StrainTool/pull/26) ([demanasta](https://github.com/demanasta))
36+
- Travis patch [\#24](https://github.com/DSOlab/StrainTool/pull/24) ([demanasta](https://github.com/demanasta))
37+
- Gmt patch [\#21](https://github.com/DSOlab/StrainTool/pull/21) ([demanasta](https://github.com/demanasta))
38+
- Docs patch [\#19](https://github.com/DSOlab/StrainTool/pull/19) ([demanasta](https://github.com/demanasta))
39+
- Pretty code [\#18](https://github.com/DSOlab/StrainTool/pull/18) ([demanasta](https://github.com/demanasta))
40+
41+
**Fixed bugs:**
42+
43+
- grid.py step conflict [\#22](https://github.com/DSOlab/StrainTool/issues/22)
44+
- Dev danast [\#30](https://github.com/DSOlab/StrainTool/pull/30) ([demanasta](https://github.com/demanasta))
45+
- Gmt patch [\#29](https://github.com/DSOlab/StrainTool/pull/29) ([demanasta](https://github.com/demanasta))
46+
- Gmt patch [\#25](https://github.com/DSOlab/StrainTool/pull/25) ([demanasta](https://github.com/demanasta))
47+
- Issue22 [\#23](https://github.com/DSOlab/StrainTool/pull/23) ([demanasta](https://github.com/demanasta))
48+
- Gmt patch [\#21](https://github.com/DSOlab/StrainTool/pull/21) ([demanasta](https://github.com/demanasta))
49+
50+
## [v1.0-beta4.0](https://github.com/DSOlab/StrainTool/tree/v1.0-beta4.0) (2018-06-29)
51+
[Full Changelog](https://github.com/DSOlab/StrainTool/compare/v1.0-beta2.1...v1.0-beta4.0)
52+
53+
## [v1.0-beta2.1](https://github.com/DSOlab/StrainTool/tree/v1.0-beta2.1) (2018-06-26)
54+
[Full Changelog](https://github.com/DSOlab/StrainTool/compare/v1.0-beta2.0.1...v1.0-beta2.1)
55+
56+
## [v1.0-beta2.0.1](https://github.com/DSOlab/StrainTool/tree/v1.0-beta2.0.1) (2018-06-25)
57+
[Full Changelog](https://github.com/DSOlab/StrainTool/compare/v1.0-beta2.0...v1.0-beta2.0.1)
58+
59+
## [v1.0-beta2.0](https://github.com/DSOlab/StrainTool/tree/v1.0-beta2.0) (2018-06-25)
60+
[Full Changelog](https://github.com/DSOlab/StrainTool/compare/v1.0-beta1.0...v1.0-beta2.0)
61+
62+
**Merged pull requests:**
63+
64+
- Create LICENSE [\#17](https://github.com/DSOlab/StrainTool/pull/17) ([xanthospap](https://github.com/xanthospap))
65+
66+
## [v1.0-beta1.0](https://github.com/DSOlab/StrainTool/tree/v1.0-beta1.0) (2018-06-21)
67+
**Implemented enhancements:**
68+
69+
- gmt\_script: 2nd Inv maps [\#12](https://github.com/DSOlab/StrainTool/issues/12)
70+
- gmt\_script: dilatation maps [\#11](https://github.com/DSOlab/StrainTool/issues/11)
71+
- gmt\_script: finalize principal axis plots [\#10](https://github.com/DSOlab/StrainTool/issues/10)
72+
- gmt\_script: station names plot [\#9](https://github.com/DSOlab/StrainTool/issues/9)
73+
- gmt\_script: plot velocities [\#7](https://github.com/DSOlab/StrainTool/issues/7)
74+
- mergre forimpl to dev [\#14](https://github.com/DSOlab/StrainTool/pull/14) ([demanasta](https://github.com/demanasta))
75+
- Gmt patch merge [\#13](https://github.com/DSOlab/StrainTool/pull/13) ([demanasta](https://github.com/demanasta))
76+
77+
**Closed issues:**
78+
79+
- from ellipsoidal to utm and back [\#1](https://github.com/DSOlab/StrainTool/issues/1)
80+
81+
82+
83+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,28 +123,28 @@ The whole list of available options, is:
123123
<pre id="block-samp"><samp>optional arguments:
124124
-h, --help show this help message and exit
125125
-i INPUT_FILE, --input-file INPUT_FILE
126-
The input file. This must be an ascii file containing the columns: 'station-name longtitude latitude Ve Vn SigmaVe SigmaVn Sne time-span'. Longtitude and latitude must be given in decimal degrees; velocities (in east and north components) in mm/yr. Columns should be seperated by whitespaces. Note that at his point the last two columns (aka Sne and time-span) are not used, so they could have random values.
126+
The input file. This must be an ascii file containing the columns: 'station-name longtitude latitude Ve Vn SigmaVe SigmaVn Sne time-span'. Longtitude and latitude must be given in decimal degrees; velocities (in east and north components) in mm/yr. Columns should be seperated by whitespaces. Note that at this point the last two columns (aka Sne and time-span) are not used, so they could have random values.
127127
--x-grid-step X_GRID_STEP
128128
The x-axis grid step size in degrees. This option is only relevant if the program computes more than one strain tensors. Default is 0.5(deg).
129129
--y-grid-step Y_GRID_STEP
130130
The y-axis grid step size in degrees. This option is only relevant if the program computes more than one strain tensors. Default is 0.5(deg)
131131
-m METHOD, --method METHOD
132132
Choose a method for strain estimation. If 'shen' is passed in, the estimation will follow the algorithm described in Shen et al, 2015, using a weighted least squares approach. If 'veis' is passed in, then the region is going to be split into delaneuy triangles and a strain estimated in each barycenter. Default is 'shen'.
133133
-r REGION, --region REGION
134-
Specify a region; any station (in the input file) falling outside will be ommited. The region should be given as a rectangle, specifying min/max values in longtitude and latitude (using decimal degrees). E.g. "[...] --region=21.0/23.5/36.0/38.5 [...]"
134+
Specify a region; any station (in the input file) falling outside will be omitted. The region should be given as a rectangle, specifying min/max values in longtitude and latitude (using decimal degrees). E.g. "[...] --region=21.0/23.5/36.0/38.5 [...]"
135135
-c, --cut-excess-stations
136-
This option is only considered if the '-r' option is set. If this this option is enabled, then any station (from the input file) outside the region limit (passed in via the '-r' option) is not considered in the strain estimation.
136+
This option is only considered if the '-r' option is set. If this option is enabled, then any station (from the input file) outside the region limit (passed in via the '-r' option) is not considered in the strain estimation.
137137
-b, --barycenter Only estimate one strain tensor, at the region's barycentre.
138138
--max-beta-angle MAX_BETA_ANGLE
139-
Only relevant for '--mehod=shen'. Before estimating a tensor, the angles between consecutive points are computed. If the max angle is larger than max_beta_angle (in degrees), then the point is ommited (aka no tensor is computed). This option is used to exclude points from the computation tha only have limited geometric coverage (e.g. the edges of the grid). Default is 180 deg.
139+
Only relevant for '--method=shen'. Before estimating a tensor, the angles between consecutive points are computed. If the max angle is larger than max_beta_angle (in degrees), then the point is omitted (aka no tensor is computed). This option is used to exclude points from the computation that only have limited geometric coverage (e.g. the edges of the grid). Default is 180 deg.
140140
-t WEIGHTING_FUNCTION, --weighting-function WEIGHTING_FUNCTION
141-
Only relevant for '--mehod=shen'. Choose between a 'gaussian' or a 'quadratic' spatial weighting function. Default is 'gaussian'.
142-
--Wt Wt Only relevant for '--mehod=shen' and if 'd-param' is not passed in. Let W=Σ_i*G_i, the total reweighting coefficients of the data, and let Wt be the threshold of W. For a given Wt, the smoothing constant D is determined by Wd=Wt . It should be noted that W is a function of the interpolation coordinate, therefore for the same Wt assigned, D varies spatially based on the in situ data strength; that is, the denser the local data array is, the smaller is D, and vice versa. Default is Wt=24.
143-
--dmin D_MIN Only relevant for '--mehod=shen' and if 'd-param' is not passed in. This is the lower limit for searching for an optimal d-param value. Unit is km. Default is dmin=1km.
144-
--dmax D_MAX Only relevant for '--mehod=shen' and if 'd-param' is not passed in. This is the upper limit for searching for an optimal d-param value. Unit is km. Default is dmax=500km.
145-
--dstep D_STEP Only relevant for '--mehod=shen' and if 'd-param' is not passed in. This is the step size for searching for an optimal d-param value. Unit is km. Default is dstep=2km.
141+
Only relevant for '--method=shen'. Choose between a 'gaussian' or a 'quadratic' spatial weighting function. Default is 'gaussian'.
142+
--Wt Wt Only relevant for '--method=shen' and if 'd-param' is not passed in. Let W=Σ_i*G_i, the total reweighting coefficients of the data, and let Wt be the threshold of W. For a given Wt, the smoothing constant D is determined by Wd=Wt . It should be noted that W is a function of the interpolation coordinate, therefore for the same Wt assigned, D varies spatially based on the in situ data strength; that is, the denser the local data array is, the smaller is D, and vice versa. Default is Wt=24.
143+
--dmin D_MIN Only relevant for '--method=shen' and if 'd-param' is not passed in. This is the lower limit for searching for an optimal d-param value. Unit is km. Default is dmin=1km.
144+
--dmax D_MAX Only relevant for '--method=shen' and if 'd-param' is not passed in. This is the upper limit for searching for an optimal d-param value. Unit is km. Default is dmax=500km.
145+
--dstep D_STEP Only relevant for '--method=shen' and if 'd-param' is not passed in. This is the step size for searching for an optimal d-param value. Unit is km. Default is dstep=2km.
146146
--d-param D_PARAMETER
147-
Only relevant for '--mehod=shen'. This is the 'D' parameter for computing the spatial weights. If this option is used, then the parameters: dmin, dmax, dstep and Wt are not used.</samp></pre>
147+
Only relevant for '--method=shen'. This is the 'D' parameter for computing the spatial weights. If this option is used, then the parameters: dmin, dmax, dstep and Wt are not used.</samp></pre>
148148

149149
For example, the command we used on the [Example](#straintensor_prg_example) section:
150150

@@ -159,7 +159,7 @@ To perform the computations, `StrainTensor.py` needs an input file, that holds i
159159
<pre id="block-samp" <samp=""> station-name longtitude latitude Ve Vn SigmaVe SigmaVn Sne time-span
160160
string deg. deg. mm/yr mm/yr mm/yr mm/yr / dec. years</pre>
161161

162-
Station coordinates are provided in longtitude/latitude pairs in decimal degrees. Velocities and velocity standard deviations are provided in mm per years (mm/yr). `Sne` is the correlation coefficient between East and North velocity components and `time-span` is the total time span of the station timeseries in decimal degrees. _Note that at his point the last two columns (aka `Sne` and `time-span`) are not used, so they could have random values._
162+
Station coordinates are provided in longtitude/latitude pairs in decimal degrees. Velocities and velocity standard deviations are provided in mm per years (mm/yr). `Sne` is the correlation coefficient between East and North velocity components and `time-span` is the total time span of the station timeseries in decimal degrees. _Note that at this point the last two columns (aka `Sne` and `time-span`) are not used, so they could have random values._
163163

164164
There are no strict formating rules on how the individual elements should be printed (i.e. how many fields, decimal places, etc). The only condition is that fields are seperated by whitespace(s). To see an example of a valid input file, you can check `data/CNRS_midas.vel`.
165165

0 commit comments

Comments
 (0)