Commit fd1a0353 authored by ultimanet's avatar ultimanet
Browse files

Merge remote-tracking branch 'upstream/develop' into mpi

parents c63f8f58 7fa457c7
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division from __future__ import division
from nifty import about
#from nifty_lm import * #from nifty_lm import *
try: try:
import libsharp_wrapper_gl as gl import libsharp_wrapper_gl as gl
...@@ -28,6 +28,7 @@ except(ImportError): ...@@ -28,6 +28,7 @@ except(ImportError):
try: try:
import healpy as hp import healpy as hp
except(ImportError): except(ImportError):
about.infos.cprint("INFO: neither libsharp_wrapper_gl nor healpy available.")
pass ## import nothing pass ## import nothing
else: else:
from nifty_lm import lm_space,hp_space ## import lm & hp from nifty_lm import lm_space,hp_space ## import lm & hp
...@@ -39,6 +40,5 @@ else: ...@@ -39,6 +40,5 @@ else:
from nifty_lm import lm_space,gl_space ## import lm & gl from nifty_lm import lm_space,gl_space ## import lm & gl
else: else:
from nifty_lm import lm_space,gl_space,hp_space ## import all 3 from nifty_lm import lm_space,gl_space,hp_space ## import all 3
from nifty_power_conversion_lm import * from nifty_power_conversion_lm import *
...@@ -636,7 +636,7 @@ class lm_space(space): ...@@ -636,7 +636,7 @@ class lm_space(space):
else: else:
return gl.dotlm(x,y,lmax=self.para[0],mmax=self.para[1]) return gl.dotlm(x,y,lmax=self.para[0],mmax=self.para[1])
else: else:
self._dotlm(x,y) return self._dotlm(x,y)
##+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ##+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
...@@ -150,7 +150,7 @@ from multiprocessing import Value as mv ...@@ -150,7 +150,7 @@ from multiprocessing import Value as mv
from multiprocessing import Array as ma from multiprocessing import Array as ma
__version__ = "1.0.4" __version__ = "1.0.5"
pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679 pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment