Commit 5ef505837a7af6f5ac4c30f6060f7bc85c7ec244
1 parent
fb383448
Exists in
master
and in
2 other branches
Clean up.
Showing
5 changed files
with
19 additions
and
6 deletions
Show diff stats
README.md
@@ -44,3 +44,12 @@ python web/run.py | @@ -44,3 +44,12 @@ python web/run.py | ||
44 | ``` | 44 | ``` |
45 | 45 | ||
46 | Then, browse [localhost:5000](http://localhost:5000). | 46 | Then, browse [localhost:5000](http://localhost:5000). |
47 | + | ||
48 | +## Troubleshoot | ||
49 | + | ||
50 | +### Installing scipy | ||
51 | + | ||
52 | +Getting `MemoryErrors` ? | ||
53 | +Try with the `--no-cache-dir` option. | ||
54 | + | ||
55 | +`pip install scipy --no-cache-dir` |
requirements.txt
1 | ## The following requirements were originally generated with `pip freeze`. | 1 | ## The following requirements were originally generated with `pip freeze`. |
2 | 2 | ||
3 | +# yum install lapack | ||
4 | +# yum install lapack-devel | ||
5 | + | ||
3 | 6 | ||
4 | ## MAIN DEPENDENCIES | 7 | ## MAIN DEPENDENCIES |
5 | 8 | ||
@@ -22,6 +25,7 @@ pyparsing==2.2.0 | @@ -22,6 +25,7 @@ pyparsing==2.2.0 | ||
22 | packaging==16.8 | 25 | packaging==16.8 |
23 | six==1.10.0 | 26 | six==1.10.0 |
24 | Werkzeug==0.12 | 27 | Werkzeug==0.12 |
28 | +Cython==0.27.1 | ||
25 | 29 | ||
26 | 30 | ||
27 | ## FILE FORMATS | 31 | ## FILE FORMATS |
@@ -29,10 +33,10 @@ Werkzeug==0.12 | @@ -29,10 +33,10 @@ Werkzeug==0.12 | ||
29 | PyYAML==3.12 | 33 | PyYAML==3.12 |
30 | netCDF4==1.2.7 | 34 | netCDF4==1.2.7 |
31 | h5py==2.3.1 | 35 | h5py==2.3.1 |
32 | -# We only use pycdf from spacepy. | ||
33 | -spacepy==0.1.* | ||
34 | # spacepy does not like recent numpy versions (1.7 looks ok) | 36 | # spacepy does not like recent numpy versions (1.7 looks ok) |
35 | numpy==1.7.* | 37 | numpy==1.7.* |
38 | +# We only use pycdf from spacepy. | ||
39 | +spacepy==0.1.* | ||
36 | 40 | ||
37 | 41 | ||
38 | ## WEIRD STUFF | 42 | ## WEIRD STUFF |
web/run.py
@@ -401,7 +401,7 @@ def retrieve_amda_netcdf(orbiter, what, started_at, stopped_at): | @@ -401,7 +401,7 @@ def retrieve_amda_netcdf(orbiter, what, started_at, stopped_at): | ||
401 | log.debug("Unzipping '%s'..." % local_gzip_file) | 401 | log.debug("Unzipping '%s'..." % local_gzip_file) |
402 | success = True | 402 | success = True |
403 | try: | 403 | try: |
404 | - with gzip.open(local_gzip_file, 'rb') as f: | 404 | + with gzip.open(local_gzip_file) as f: |
405 | file_content = f.read() | 405 | file_content = f.read() |
406 | with open(local_netc_file, 'w+b') as g: | 406 | with open(local_netc_file, 'w+b') as g: |
407 | g.write(file_content) | 407 | g.write(file_content) |
web/static/js/swapp.js
@@ -408,7 +408,7 @@ | @@ -408,7 +408,7 @@ | ||
408 | this.setStartAndStop(started_at, stopped_at); | 408 | this.setStartAndStop(started_at, stopped_at); |
409 | formatted_started_at = started_at.format(); | 409 | formatted_started_at = started_at.format(); |
410 | formatted_stopped_at = stopped_at.format(); | 410 | formatted_stopped_at = stopped_at.format(); |
411 | - if (!this.is_invalid && (this.started_at <= started_at && started_at <= this.stopped_at) && (this.started_at <= stopped_at && stopped_at <= this.stopped_at)) { | 411 | + if ((this.started_at <= started_at && started_at <= this.stopped_at) && (this.started_at <= stopped_at && stopped_at <= this.stopped_at)) { |
412 | console.info("Resizing the temporal domain from " + formatted_started_at + " to " + formatted_stopped_at + " without fetching new data…"); | 412 | console.info("Resizing the temporal domain from " + formatted_started_at + " to " + formatted_stopped_at + " without fetching new data…"); |
413 | this.time_series.forEach(function(ts){ | 413 | this.time_series.forEach(function(ts){ |
414 | if (!ts.visible) { | 414 | if (!ts.visible) { |
web/static/js/swapp.ls
@@ -312,8 +312,8 @@ https://gitlab.irap.omp.eu/CDPP/SPACEWEATHERONLINE | @@ -312,8 +312,8 @@ https://gitlab.irap.omp.eu/CDPP/SPACEWEATHERONLINE | ||
312 | formatted_started_at = started_at.format() | 312 | formatted_started_at = started_at.format() |
313 | formatted_stopped_at = stopped_at.format() | 313 | formatted_stopped_at = stopped_at.format() |
314 | 314 | ||
315 | - if (not @is_invalid) and | ||
316 | - (@started_at <= started_at <= @stopped_at) and | 315 | +# if (not @is_invalid) and |
316 | + if (@started_at <= started_at <= @stopped_at) and | ||
317 | (@started_at <= stopped_at <= @stopped_at) then | 317 | (@started_at <= stopped_at <= @stopped_at) then |
318 | console.info "Resizing the temporal domain from #{formatted_started_at} to #{formatted_stopped_at} without fetching new data…" | 318 | console.info "Resizing the temporal domain from #{formatted_started_at} to #{formatted_stopped_at} without fetching new data…" |
319 | # We first resize the hidden time series and only afterwards we resize | 319 | # We first resize the hidden time series and only afterwards we resize |