Closed jmcclena closed 3 years ago
nice addition, I was trying to add this to tau_e_h98 and Greenwald. What are you giving to the following params: R1, R2, Z1, Z2 in the function def calc_line_den(ods, R1, R2, Z1, Z2) @jmcclena
@orso82 it fails with
======================================================================
FAIL: test_latest_cocos (test_omas_physics.TestOmasPhysics)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/travis/build/gafusion/omas/omas/tests/test_omas_physics.py", line 452, in test_latest_cocos
list_structures(imas_version=omas_rcparams['default_imas_version']), threshold=0, write=False, verbose=False
File "/home/travis/build/gafusion/omas/omas/omas_physics.py", line 1975, in generate_cocos_signals
assert original == new, 'COCOS signals are not up-to-date! Run `make cocos` to update the omas_cocos.py file.\n' + ''.join(diff)
AssertionError: COCOS signals are not up-to-date! Run `make cocos` to update the omas_cocos.py file.
so maybe make cocos
should be in travis.yaml or something.
@eldond the failure indicates that something is wrong with cocos. This should not be fixed with adding 'make cocos' to travis.
Maybe the error message needs an update then, because it asked me to run make cocos
and travis seems to be doing better with that added. But go ahead and revert 205b5e5 if you can do it better.
Also, why are the tests running on travis-ci.org and travis-ci.com? Can the redundant .org ones be stopped (travis-ci.org is shutting down in favor of .com at the end of the year https://blog.travis-ci.com/2018-05-02-open-source-projects-on-travis-ci-com-with-github-apps).
I am quite confident that https://github.com/gafusion/omas/commit/205b5e5cfb4df67c7307c6364232749e662e32ae worked because of the change to omas_cocos.py and not because of the changes to the travis file...
Merging #130 into master will increase coverage by
1.06%
. The diff coverage is25.88%
.
@@ Coverage Diff @@
## master #130 +/- ##
==========================================
+ Coverage 79.74% 80.80% +1.06%
==========================================
Files 49 50 +1
Lines 9237 11660 +2423
==========================================
+ Hits 7366 9422 +2056
- Misses 1871 2238 +367
Impacted Files | Coverage Δ | |
---|---|---|
omas/omas_cocos.py | 100.00% <ø> (ø) |
|
omas/omas_physics.py | 77.25% <25.88%> (+3.13%) |
:arrow_up: |
omas/__init__.py | 60.00% <0.00%> (-40.00%) |
:arrow_down: |
omas/omas_hdc.py | 37.73% <0.00%> (-1.48%) |
:arrow_down: |
omas/examples/omas_mongo_example.py | 93.47% <0.00%> (-0.28%) |
:arrow_down: |
omas/tests/failed_imports.py | 84.21% <0.00%> (-0.24%) |
:arrow_down: |
omas/omas_s3.py | 51.89% <0.00%> (-0.05%) |
:arrow_down: |
omas/omas_ascii.py | 93.02% <0.00%> (ø) |
|
omas/tests/test_omas_core.py | 96.57% <0.00%> (+0.07%) |
:arrow_up: |
omas/omas_sample.py | 99.31% <0.00%> (+0.10%) |
:arrow_up: |
... and 15 more |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 76e45cf...fe9e6e2. Read the comment docs.
Hasn't been tested on omas! Don't merge yet.
@orso82 @TimSlendebroek here is my idea for calculating the line-average density in omas.