update utm for veis method #68

DSOlab · Sep 8, 2021 · 533638e · 533638e
1 parent 4adced4
commit 533638e
Show file tree

Hide file tree

Showing 27 changed files with 7 additions and 7 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/bin/StrainTensor.py b/bin/StrainTensor.py
@@ -527,7 +527,7 @@ class myFormatter(
             ##+ 3 points (in UTM) and equal_weights weighting scheme.
             sstr = ShenStrain(cx, cy, cy<0e0, [sta_list_utm[trng[0]], sta_list_utm[trng[1]], sta_list_utm[trng[2]]], weighting_function='equal_weights')
             sstr.estimate()
-            sstr.print_details(fout, utm_lcm)
+            sstr.print_details(fout, lcm)
             ## Print the triangle in the corresponding file (ellipsoidal crd, degrees)
             print('> {:}, {:}, {:}'.format(sta_list_utm[trng[0]].name, sta_list_utm[trng[1]].name, sta_list_utm[trng[2]].name), file=dlnout)
             print('{:+8.5f} {:8.5f}\n{:+8.5f} {:8.5f}\n{:+8.5f} {:8.5f}\n{:+8.5f} {:8.5f}'.format(*[ degrees(x) for x in [sta_list_ell[trng[0]].lon, sta_list_ell[trng[0]].lat, sta_list_ell[trng[1]].lon, sta_list_ell[trng[1]].lat, sta_list_ell[trng[2]].lon, sta_list_ell[trng[2]].lat, sta_list_ell[trng[0]].lon, sta_list_ell[trng[0]].lat]]), file=dlnout)

diff --git a/data/station_info.dat.ref b/data/station_info.dat.ref
diff --git a/data/strain_info.dat.ref b/data/strain_info.dat.ref
diff --git a/doc/readme.html b/doc/readme.html
diff --git a/doc/readme.md b/doc/readme.md
diff --git a/doc/straindoc.js b/doc/straindoc.js
diff --git a/plot/default-param b/plot/default-param
@@ -16,12 +16,12 @@ PAPER_SIZE="30cx30c" # width x height
 
 # //////////////////////////////////////////////////////////////////////////////
 # Set default REGION 
-west=17 #19.5
-east=30 #29
-south=34
-north=43 #42
-projscale=6000000
-frame=1
+west=25
+east=50
+south=-30
+north=22
+projscale=20000000
+frame=2
 
 # length of plot scale (Km)
 sclength=100

diff --git a/plot/default-param.def b/plot/default-param.def
diff --git a/pystrain/pystrain/Makefile b/pystrain/pystrain/Makefile
diff --git a/pystrain/pystrain/__init__.py b/pystrain/pystrain/__init__.py
diff --git a/pystrain/pystrain/geodesy/__init__.py b/pystrain/pystrain/geodesy/__init__.py
diff --git a/pystrain/pystrain/iotools/__init__.py b/pystrain/pystrain/iotools/__init__.py
diff --git a/pystrain/pystrain/iotools/iparser.py b/pystrain/pystrain/iotools/iparser.py
diff --git a/pystrain/pystrain/station.py b/pystrain/pystrain/station.py
diff --git a/pystrain/setup.py b/pystrain/setup.py