+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/docs/license.rst b/docs/license.rst
new file mode 100644
index 0000000..6437528
--- /dev/null
+++ b/docs/license.rst
@@ -0,0 +1,7 @@
+.. _license:
+
+=======
+License
+=======
+
+.. literalinclude:: ../LICENSE.txt
diff --git a/pywafo/.project b/pywafo/.project
deleted file mode 100644
index 4b2c5b8..0000000
--- a/pywafo/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- svn_pywafo
-
-
-
-
-
- org.python.pydev.PyDevBuilder
-
-
-
-
-
- org.python.pydev.pythonNature
-
-
diff --git a/pywafo/.pydevproject b/pywafo/.pydevproject
deleted file mode 100644
index 7ff1370..0000000
--- a/pywafo/.pydevproject
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-python 2.7
-Default
-
diff --git a/pywafo/gendocwafo.py b/pywafo/gendocwafo.py
deleted file mode 100644
index 858969f..0000000
--- a/pywafo/gendocwafo.py
+++ /dev/null
@@ -1,8 +0,0 @@
-'''
-Runs epydoc to document pywafo
-'''
-import os
-
-print('Generating html documentation for wafo in folder html.')
-
-os.system('epydoc.py --html -o html --name wafo --graph all src/wafo')
\ No newline at end of file
diff --git a/pywafo/manifest b/pywafo/manifest
deleted file mode 100644
index c64f3a8..0000000
--- a/pywafo/manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-setup.py
-src\wafo\__init__.py
-src\wafo\dctpack.py
-src\wafo\definitions.py
-src\wafo\demo_sg.py
-src\wafo\info.py
-src\wafo\interpolate.py
-src\wafo\kdetools.py
-src\wafo\misc.py
-src\wafo\namedtuple.py
-src\wafo\objects.py
-src\wafo\plotbackend.py
-src\wafo\polynomial.py
-src\wafo\polynomial_old.py
-src\wafo\sg_filter.py
-src\wafo\data\__init__.py
-src\wafo\data\info.py
-src\wafo\spectrum\__init__.py
-src\wafo\spectrum\dispersion_relation.py
-src\wafo\spectrum\models.py
-src\wafo\transform\__init__.py
-src\wafo\transform\models.py
diff --git a/pywafo/nose_all.py b/pywafo/nose_all.py
deleted file mode 100644
index 7cbeb02..0000000
--- a/pywafo/nose_all.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import subprocess as sub
-
-print('Please wait, this may take a while')
-
-#sub.check_call('nosetests --with-coverage --cover-package=wafo', stderr=sub.STDOUT)
-sub.check_call('nosetests', stderr=sub.STDOUT)
-print('Finished')
\ No newline at end of file
diff --git a/pywafo/setup.py b/pywafo/setup.py
deleted file mode 100644
index f94bb86..0000000
--- a/pywafo/setup.py
+++ /dev/null
@@ -1,212 +0,0 @@
-"""
-Install wafo
-
-Usage:
-
-python setup.py develop
-python setup.py install [, --prefix=$PREFIX]
-
-python setup.py bdist_wininst
-
-PyPi upload:
-
-python setup.py sdist bdist_wininst upload --show-response
-
-"""
-#!/usr/bin/env python
-
-import os
-import shutil
-import sys
-import subprocess
-import re
-import warnings
-from Cython.Build import cythonize
-MAJOR = 0
-MINOR = 1
-MICRO = 2
-ISRELEASED = False
-VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
-# sys.argv.append("build_src")
-# sys.argv.append("build_ext")
-# sys.argv.append("--inplace")
-# sys.argv.append("develop")
-# sys.argv.append("install")
-DISTUTILS_DEBUG = True
-PKG_NAME = 'wafo'
-ROOT_DIR = os.path.join('src',PKG_NAME)
-
-# make sure we import from this package, not an installed one:
-sys.path.insert(0, ROOT_DIR)
-import info
-
-from setuptools import find_packages # setup, Extension
-from numpy.distutils.core import setup, Extension # as FExtension
-
-def svn_version():
- '''Return the svn version as a string, raise a ValueError otherwise'''
- from numpy.compat import asstr
-
- env = os.environ.copy()
- env['LC_ALL'] = 'C'
- try:
- out = subprocess.Popen(['svn', 'info'], stdout=subprocess.PIPE,
- env=env).communicate()[0]
- except OSError:
- warnings.warn(" --- Could not run svn info --- ")
- return ""
-
- r = re.compile('Revision: ([0-9]+)')
- svnver = None
- for line in asstr(out).split('\n'):
- m = r.match(line)
- if m:
- svnver = m.group(1)
-
- if not svnver:
- raise ValueError("Error while parsing svn version ?")
- return svnver
-
-FULLVERSION = VERSION
-if not ISRELEASED:
- FULLVERSION += '.dev'
- # If in git or something, bypass the svn rev
- if os.path.exists('.svn'):
- FULLVERSION += svn_version()
-
-def write_version_py(filename='version.py'):
- cnt = """\
-# THIS FILE IS GENERATED FROM SETUP.PY
-short_version='%(version)s'
-version='%(version)s'
-release=%(isrelease)s
-"""
- fid = open(os.path.join(ROOT_DIR,filename), 'w')
- try:
- fid.write(cnt % {'version': VERSION, 'isrelease': str(ISRELEASED)})
- finally:
- fid.close()
-
-
-def get_library_extension():
- '''Return extension of an executable library'''
- if os.name == 'posix': # executable library on Linux has extension .so
- lib_ext = '.so'
- elif os.name == 'nt': # extension on Windows is .pyd
- lib_ext = '.pyd'
- else:
- raise UserWarning('Platform not supported:', os.name)
- return lib_ext
-
-
-def compile_all():
- wd = os.getcwd()
- root_dir = os.path.join(wd,'src',PKG_NAME)
- root_src = os.path.join(root_dir, 'source')
- buildscript = 'build_all.py'
- lib_ext = get_library_extension()
-
- if os.name == 'nt': # On Windows
- build_call = 'python.exe %s' % buildscript
- else:
- build_call = 'python %s' % buildscript
-
- for root, dirs, files in os.walk(root_src):
- dir1 = [dir for dir in dirs
- if not os.path.exists(os.path.join(root, dir, buildscript))]
- for dir in dir1:
- dirs.remove(dir) # don't visit directories without buildscript
- if buildscript in files:
- print('Building: ', root)
- os.chdir(root)
- t = os.system(build_call)
- print(t)
-
- for file in os.listdir('.'):
- if file.endswith(lib_ext):
- dest_file = os.path.join(root_dir, file)
- if os.path.exists(dest_file):
- os.remove(dest_file)
- shutil.copy(os.path.join(root, file), root_dir)
- os.chdir(wd)
-
-
-def setup_package():
- write_version_py()
- join = os.path.join
- packages = find_packages('src')
- for p in packages:
- print(p)
- def convert_package2path(p):
- return p.replace(PKG_NAME + '.',
- '').replace(PKG_NAME, '').replace('.', os.path.sep)
- package_paths = [convert_package2path(p) for p in packages]
- test_paths = [join(pkg_path, 'test') for pkg_path in package_paths
- if os.path.exists(join(ROOT_DIR, pkg_path, 'test'))]
- testscripts = [join(subtst, f) for subtst in test_paths
- for f in os.listdir(join(ROOT_DIR, subtst))
- if not (f.startswith('.') or f.endswith('~') or
- f.endswith('.old') or f.endswith('.bak'))]
-
- datadir = 'data'
- datafiles = [join(datadir, f) for f in os.listdir(join(ROOT_DIR, datadir))
- if not (f.startswith('.') or f.endswith('~') or
- f.endswith('.old') or f.endswith('.bak') or
- f.endswith('.py') or f.endswith('test') )]
- if 'build_ext' in sys.argv:
- compile_all()
- lib_ext = get_library_extension()
- libs = [f for f in os.listdir(join(ROOT_DIR)) if f.endswith(lib_ext)]
-
- packagedata = testscripts + datafiles + libs
-
-# ext_module_list = cythonize(join(ROOT_DIR, "primes.pyx"))
-#
-# for ext_module in ext_module_list:
-# if not isinstance(ext_module, Extension):
-# ext_module.__class__ = Extension
-
-# for name, src_files in [('mvn',('mvn.pyf', 'mvndst.f')),
-# ('c_library',('c_library.pyf', 'c_functions.c'))]:
-# sources = [join(ROOT_DIR, 'source', name, f) for f in src_files]
-# ext_module_list.append(Extension(name='%s.%s' % (PKG_NAME, name),
-# sources=sources))
-
-# sources = [join(ROOT_DIR, 'source', 'mreg', 'cov2mmpdfreg_intfc.f'), ]
-# libs = [join(ROOT_DIR, 'source', 'mreg', f)
-# for f in ['dsvdc', 'mregmodule', 'intfcmod'] ]
-# ext_module_list.append(Extension(name='wafo.covmod', sources=sources,
-# libraries=libs))
-
-# mvn_sources = [join(root_mvn, 'source', 'mvn', 'mvn.pyf'),
-# join(root_mvn, 'source', 'mvn','mvndst.f')]
-# ext_module_list.append(Extension(name='wafo.mvn', sources=mvn_sources))
-
- setup(
- version = VERSION,
- author='WAFO-group',
- author_email='wafo@maths.lth.se',
- description = 'Statistical analysis and simulation of random waves and random loads',
- long_description = info.__doc__,
- install_requires = ['numpy>=1.4','numdifftools>=0.2'],
- license = "GPL",
- url='http://code.google.com/p/pywafo/',
- name = PKG_NAME,
- package_dir = {'': 'src'},
- packages = packages,
- package_data = {'': packagedata},
- # ext_modules = ext_module_list,
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Intended Audience :: Education',
- 'Intended Audience :: Science/Research',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
- 'Operating System :: Microsoft :: Windows',
- 'Programming Language :: Python :: 2.6',
- 'Topic :: Scientific/Engineering :: Mathematics',
- ],
- )
-
-
-if __name__=='__main__':
- setup_package()
\ No newline at end of file
diff --git a/pywafo/setup_old.py b/pywafo/setup_old.py
deleted file mode 100644
index 1dfd430..0000000
--- a/pywafo/setup_old.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-Install wafo
-
-Usage:
-
-python setup.py install [, --prefix=$PREFIX]
-
-
-python setup.py bdist_wininst
-"""
-#!/usr/bin/env python
-import os, sys
-
-#sys.argv.append("develop")
-sys.argv.append("install")
-# make sure we import from WAFO in this package, not an installed one:
-sys.path.insert(0, os.path.join('src','wafo'))
-import info
-#import wafo
-
-if True :#__file__ == 'setupegg.py':
- # http://peak.telecommunity.com/DevCenter/setuptools
- from setuptools import setup, Extension
-else:
- from distutils.core import setup
-
-package_name = "wafo"
-subpackages = ('spectrum','data','transform','covariance')
-subpackagesfull = [os.path.join(package_name,f) for f in subpackages]
-subtests = [os.path.join(subpkg,'test') for subpkg in subpackages]
-
-testscripts = [os.path.join(subtst, f) for subtst in subtests
- for f in os.listdir(os.path.join('src',package_name,subtst))
- if not (f.startswith('.') or f.endswith('~') or
- f.endswith('.old') or f.endswith('.bak'))]
-datadir = 'data'
-datafiles = [os.path.join(datadir, f) for f in os.listdir(os.path.join('src',package_name,datadir))
- if not (f.endswith('.py') or f.endswith('test') )]
-#docs = [os.path.join('doc', f) for f in os.listdir('doc')]
-libs = [f for f in os.listdir(os.path.join('src',package_name)) if f.endswith('.pyd') ]
-packagedata = testscripts + datafiles + libs #['c_library.pyd'] #,'disufq1.c','diffsumfunq.pyd','diffsumfunq.pyf','findrfc.c','rfc.pyd','rfc.pyf']
-
-
-setup(
- version = '0.11',
- author='WAFO-group',
- author_email='wafo@maths.lth.se',
- description = info.__doc__,
- license = "GPL",
- url='http://www.maths.lth.se/matstat/wafo/',
- name = package_name.upper(),
- package_dir = {'': 'src'},
- packages = [package_name,] + list(subpackagesfull),
- package_data = {package_name: packagedata},
- #package_data = {'': ['wafo.cfg']},
- #scripts = [os.path.join('bin', f)
- # for f in os.listdir('bin')
- # if not (f.startswith('.') or f.endswith('~') or
- # f.endswith('.old') or f.endswith('.bak'))],
- )
diff --git a/pywafo/src/Wafo.egg-info/PKG-INFO b/pywafo/src/Wafo.egg-info/PKG-INFO
deleted file mode 100644
index 4bf4485..0000000
--- a/pywafo/src/Wafo.egg-info/PKG-INFO
+++ /dev/null
@@ -1,79 +0,0 @@
-Metadata-Version: 1.1
-Name: wafo
-Version: 0.1.2
-Summary: Statistical analysis and simulation of random waves and random loads
-Home-page: http://code.google.com/p/pywafo/
-Author: WAFO-group
-Author-email: wafo@maths.lth.se
-License: GPL
-Description:
- WAFO
- ====
- WAFO is a toolbox Python routines for statistical analysis and simulation of random waves and random loads.
- WAFO is freely redistributable software, see WAFO licence, cf. the GNU General Public License (GPL) and
- contain tools for:
-
- Fatigue Analysis
- ----------------
- -Fatigue life prediction for random loads
- -Theoretical density of rainflow cycles
-
- Sea modelling
- -------------
- -Simulation of linear and non-linear Gaussian waves
- -Estimation of seamodels (spectrums)
- -Joint wave height, wave steepness, wave period distributions
-
- Statistics
- ------------
- -Extreme value analysis
- -Kernel density estimation
- -Hidden markov models
-
- WAFO consists of several subpackages and classes with short descriptions below.
-
- Classes:
- TimeSeries - Data analysis of time series. Example: extraction of
- turning points, estimation of spectrum and covariance function.
- Estimation transformation used in transformed Gaussian model.
- CovData - Computation of spectral functions, linear
- and non-linear time series simulation.
- SpecData - Computation of spectral moments and covariance functions, linear
- and non-linear time series simulation.
- Ex: common spectra implemented, directional spectra,
- bandwidth measures, exact distributions for wave characteristics.
-
-
- CyclePairs - Cycle counting, discretization, and crossings, calculation of
- damage. Simulation of discrete Markov chains, switching Markov
- chains, harmonic oscillator. Ex: Rainflow cycles and matrix,
- discretization of loads. Damage of a rainflow count or
- matrix, damage matrix, S-N plot.
-
-
- Subpackages:
- TRANSFORM - Modelling with linear or transformed Gaussian waves. Ex:
- STATS - Statistical tools and extreme-value distributions.
- Ex: generation of random numbers, estimation of parameters,
- evaluation of pdf and cdf
- KDETOOLS - Kernel-density estimation.
- MISC - Miscellaneous routines.
- DOCS - Documentation of toolbox, definitions. An overview is given
- in the routine wafomenu.
- DATA - Measurements from marine applications.
-
- WAFO homepage:
- On the WAFO home page you will find:
- - The WAFO Tutorial
- - New versions of WAFO to download.
- - Reported bugs.
- - List of publications related to WAFO.
-
-Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Topic :: Scientific/Engineering :: Mathematics
diff --git a/pywafo/src/Wafo.egg-info/SOURCES.txt b/pywafo/src/Wafo.egg-info/SOURCES.txt
deleted file mode 100644
index 3b3c382..0000000
--- a/pywafo/src/Wafo.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,331 +0,0 @@
-.project
-.pydevproject
-gendocwafo.py
-manifest
-setup.py
-setup_old.py
-src/epydoc_wafo.prj
-src/Wafo.egg-info/PKG-INFO
-src/Wafo.egg-info/SOURCES.txt
-src/Wafo.egg-info/dependency_links.txt
-src/Wafo.egg-info/top_level.txt
-src/wafo/MSO.py
-src/wafo/MSPPT.py
-src/wafo/SpecData1D.mm
-src/wafo/__init__.py
-src/wafo/bitwise.py
-src/wafo/c_library.pyd
-src/wafo/c_library.so
-src/wafo/containers.py
-src/wafo/cov2mod.pyd
-src/wafo/dctpack.py
-src/wafo/definitions.py
-src/wafo/definitions.~py
-src/wafo/demo_sg.py
-src/wafo/demos.py
-src/wafo/fig.py
-src/wafo/gaussian.py
-src/wafo/graphutil.py
-src/wafo/info.py
-src/wafo/integrate.py
-src/wafo/interpolate.py
-src/wafo/kdetools.py
-src/wafo/magic.py
-src/wafo/meshgrid.py
-src/wafo/misc.py
-src/wafo/mvn.pyd
-src/wafo/mvn.so
-src/wafo/mvnprdmod.pyd
-src/wafo/mvnprdmod.so
-src/wafo/namedtuple.py
-src/wafo/objects.py
-src/wafo/plotbackend.py
-src/wafo/polynomial.py
-src/wafo/polynomial_old.py
-src/wafo/powerpoint.py
-src/wafo/resize_problem.py
-src/wafo/rindmod.pyd
-src/wafo/rindmod.so
-src/wafo/sg_filter.py
-src/wafo/version.py
-src/wafo/wafodata.py
-src/wafo/wtraits.py
-src/wafo/wtraits2.py
-src/wafo/wtraits3.py
-src/wafo.egg-info/SOURCES.txt
-src/wafo/covariance/__init__.py
-src/wafo/covariance/core.py
-src/wafo/data/__init__.py
-src/wafo/data/__init__.pyc
-src/wafo/data/atlantic.dat
-src/wafo/data/gfaks89.dat
-src/wafo/data/gfaksr89.dat
-src/wafo/data/info.py
-src/wafo/data/info.pyc
-src/wafo/data/info.~py
-src/wafo/data/japansea.dat
-src/wafo/data/northsea.dat
-src/wafo/data/sea.dat
-src/wafo/data/sea.m
-src/wafo/data/sfa89.dat
-src/wafo/data/sn.dat
-src/wafo/data/wafoLogoNewWithBorder.png
-src/wafo/data/wafoLogoNewWithBorder.svg
-src/wafo/data/wafoLogoNewWithoutBorder.png
-src/wafo/data/wafoLogoNewWithoutBorder.svg
-src/wafo/data/wafologoWithBorder.png
-src/wafo/data/yura87.dat
-src/wafo/doc/__init__.py
-src/wafo/doc/tutorial_scripts/chapter1.py
-src/wafo/doc/tutorial_scripts/chapter2.py
-src/wafo/doc/tutorial_scripts/chapter3.py
-src/wafo/doc/tutorial_scripts/chapter4.py
-src/wafo/doc/tutorial_scripts/chapter5.py
-src/wafo/source/c_codes/build_all.py
-src/wafo/source/c_codes/c_functions.c
-src/wafo/source/c_codes/c_library rf3 rf5 license.txt
-src/wafo/source/c_codes/c_library.pyd
-src/wafo/source/c_codes/c_library.pyf
-src/wafo/source/c_codes/setup.py
-src/wafo/source/c_codes/old/build_all_.py
-src/wafo/source/c_codes/old/diffsumfunq.pyd
-src/wafo/source/c_codes/old/diffsumfunq.pyf
-src/wafo/source/c_codes/old/disufq.pyf
-src/wafo/source/c_codes/old/disufq1.c
-src/wafo/source/c_codes/old/findcross.c
-src/wafo/source/c_codes/old/findrfc.c
-src/wafo/source/c_codes/old/rfc.pyd
-src/wafo/source/c_codes/old/rfc.pyf
-src/wafo/source/cov2XXXpdf/cov2acdf.f
-src/wafo/source/cov2XXXpdf/cov2mmpdf.f
-src/wafo/source/cov2XXXpdf/cov2mmtpdf.f
-src/wafo/source/cov2XXXpdf/cov2tccpdf.f
-src/wafo/source/cov2XXXpdf/cov2tcpdf.f
-src/wafo/source/cov2XXXpdf/cov2thpdf.f
-src/wafo/source/cov2XXXpdf/cov2thpdfalan.f
-src/wafo/source/cov2XXXpdf/cov2tthpdf.f
-src/wafo/source/cov2XXXpdf/bounds/cov2acdfb.f
-src/wafo/source/cov2XXXpdf/bounds/cov2mmpdfb.f
-src/wafo/source/cov2XXXpdf/bounds/cov2tccpdfb.f
-src/wafo/source/cov2XXXpdf/bounds/cov2tthpdfb.f
-src/wafo/source/mreg/checkmod.mod
-src/wafo/source/mreg/cov2mmpdfmod.mod
-src/wafo/source/mreg/cov2mmpdfreg.f
-src/wafo/source/mreg/cov2mmpdfreg_intfc.f
-src/wafo/source/mreg/dsvdc.f
-src/wafo/source/mreg/epsmod.mod
-src/wafo/source/mreg/expaccmod.mod
-src/wafo/source/mreg/infcmod.mod
-src/wafo/source/mreg/intfcmod.f
-src/wafo/source/mreg/mregmod.mod
-src/wafo/source/mreg/mregmodule.f
-src/wafo/source/mreg/quadrmod.mod
-src/wafo/source/mreg/rintmod.mod
-src/wafo/source/mreg/sizemod.mod
-src/wafo/source/mreg/svd.mod
-src/wafo/source/mreg/tbrmod.mod
-src/wafo/source/mvn/build_all.py
-src/wafo/source/mvn/mvn.pyd
-src/wafo/source/mvn/mvn.pyf
-src/wafo/source/mvn/mvndst.f
-src/wafo/source/mvnprd/adaptivegausskronrod.mod
-src/wafo/source/mvnprd/build_all.py
-src/wafo/source/mvnprd/erfcoremod.mod
-src/wafo/source/mvnprd/functioninterface.mod
-src/wafo/source/mvnprd/integration1dmodule.mod
-src/wafo/source/mvnprd/mvnprd.dsp
-src/wafo/source/mvnprd/mvnprd.dsw
-src/wafo/source/mvnprd/mvnprd.f
-src/wafo/source/mvnprd/mvnprd.pyf
-src/wafo/source/mvnprd/mvnprd_interface.f
-src/wafo/source/mvnprd/mvnprdmod.pyd
-src/wafo/source/mvnprd/mvnprodcorrprb.f
-src/wafo/source/mvnprd/mvnprodcorrprb_interface.f
-src/wafo/source/mvnprd/mvnprodcorrprbmod.mod
-src/wafo/source/mvnprd/setup.py
-src/wafo/source/mvnprd/old/mvnprodcorrprb/adaptivegausskronrod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/build_all.py
-src/wafo/source/mvnprd/old/mvnprodcorrprb/erfcoremod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/functioninterface.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/integration1dmodule.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprdmod.pyd
-src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb.f
-src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb_interface.f
-src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprbmod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/DF60.PDB
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/adaptivegausskronrod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/erfcoremod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/functioninterface.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/integration1dmodule.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprb.obj
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprbmod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.exe
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.ilk
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.obj
-src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.pdb
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/AdaptiveGaussKronrod.f90
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyf
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyfo
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/dea.f
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/deamod.pyf
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.f90
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.pyd
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcoremod.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/functioninterface.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f90
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1dmodule.mod
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvn.exe
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.f90
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.pyf
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprbmod.f90
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsp
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsw
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.f
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.opt
-src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.plg
-src/wafo/source/old/adaptivegausskronrod.mod
-src/wafo/source/old/dunnettprb.f
-src/wafo/source/old/erfcore.f
-src/wafo/source/old/erfcore.pyd
-src/wafo/source/old/erfcore.pydold
-src/wafo/source/old/erfcore.pyf
-src/wafo/source/old/erfcoremod.f
-src/wafo/source/old/erfcoremod.f90
-src/wafo/source/old/erfcoremod.mod
-src/wafo/source/old/erfcoremod.pyd
-src/wafo/source/old/erfcoremod.pyf
-src/wafo/source/old/erfcoremod.pyfold
-src/wafo/source/old/erfcoremod0.f90
-src/wafo/source/old/erfcoremod1.pyf
-src/wafo/source/old/erfcoremod_interface.f90
-src/wafo/source/old/functioninterface.mod
-src/wafo/source/old/integration1dmodule.mod
-src/wafo/source/rind2007/.cproject
-src/wafo/source/rind2007/.project
-src/wafo/source/rind2007/New File.txt
-src/wafo/source/rind2007/adaptmod.mod
-src/wafo/source/rind2007/build_all.py
-src/wafo/source/rind2007/c1c2mod.mod
-src/wafo/source/rind2007/dkbvrcmod.mod
-src/wafo/source/rind2007/erfcoremod.f
-src/wafo/source/rind2007/fimod.f
-src/wafo/source/rind2007/fimod.mod
-src/wafo/source/rind2007/funcmod.mod
-src/wafo/source/rind2007/globalconst.mod
-src/wafo/source/rind2007/globaldata.mod
-src/wafo/source/rind2007/intmodule.f
-src/wafo/source/rind2007/jacobmod.f
-src/wafo/source/rind2007/jacobmod.mod
-src/wafo/source/rind2007/krbvrcmod.mod
-src/wafo/source/rind2007/krobovmod.mod
-src/wafo/source/rind2007/precisionmod.mod
-src/wafo/source/rind2007/quad.mod
-src/wafo/source/rind2007/rcrudemod.mod
-src/wafo/source/rind2007/rind71mod.f
-src/wafo/source/rind2007/rind71mod.mod
-src/wafo/source/rind2007/rind_interface.f
-src/wafo/source/rind2007/rindmod.f
-src/wafo/source/rind2007/rindmod.mod
-src/wafo/source/rind2007/rindmod.pyd
-src/wafo/source/rind2007/ssobolmod.mod
-src/wafo/source/rind2007/swapmod.f
-src/wafo/source/rind2007/swapmod.mod
-src/wafo/source/rind2007/test_fimod.dsp
-src/wafo/source/rind2007/test_fimod.dsw
-src/wafo/source/rind2007/test_fimod.exe
-src/wafo/source/rind2007/test_fimod.f
-src/wafo/source/rind2007/test_rind71mod.exe
-src/wafo/source/rind2007/test_rind71mod.f
-src/wafo/source/rind2007/test_rindmod.exe
-src/wafo/source/rind2007/test_rindmod.f
-src/wafo/source/rind2007/test_rindmod2007.exe
-src/wafo/source/rind2007/test_rindmod2007.opt
-src/wafo/source/rind2007/test_rindmod2007.plg
-src/wafo/source/rind2007/trivariatevar.mod
-src/wafo/source/rind2007/Debug/DF60.PDB
-src/wafo/source/rind2007/Debug/adaptmod.mod
-src/wafo/source/rind2007/Debug/c1c2mod.mod
-src/wafo/source/rind2007/Debug/dkbvrcmod.mod
-src/wafo/source/rind2007/Debug/erfcoremod.mod
-src/wafo/source/rind2007/Debug/erfcoremod.obj
-src/wafo/source/rind2007/Debug/fimod.mod
-src/wafo/source/rind2007/Debug/fimod.obj
-src/wafo/source/rind2007/Debug/funcmod.mod
-src/wafo/source/rind2007/Debug/globaldata.mod
-src/wafo/source/rind2007/Debug/intmodule.obj
-src/wafo/source/rind2007/Debug/jacobmod.mod
-src/wafo/source/rind2007/Debug/jacobmod.obj
-src/wafo/source/rind2007/Debug/krbvrcmod.mod
-src/wafo/source/rind2007/Debug/krobovmod.mod
-src/wafo/source/rind2007/Debug/makefile
-src/wafo/source/rind2007/Debug/objects.mk
-src/wafo/source/rind2007/Debug/precisionmod.mod
-src/wafo/source/rind2007/Debug/quad.mod
-src/wafo/source/rind2007/Debug/rcrudemod.mod
-src/wafo/source/rind2007/Debug/rind71.obj
-src/wafo/source/rind2007/Debug/rindmod.mod
-src/wafo/source/rind2007/Debug/sources.mk
-src/wafo/source/rind2007/Debug/ssobolmod.mod
-src/wafo/source/rind2007/Debug/subdir.mk
-src/wafo/source/rind2007/Debug/test_rind71.exe
-src/wafo/source/rind2007/Debug/test_rind71.ilk
-src/wafo/source/rind2007/Debug/test_rind71.obj
-src/wafo/source/rind2007/Debug/test_rind71.pdb
-src/wafo/source/rind2007/Debug/trivariatevar.mod
-src/wafo/source/test_f90/hello.f90
-src/wafo/source/test_f90/hello.mod
-src/wafo/source/test_f90/hello.pyd
-src/wafo/source/test_f90/hello.txt
-src/wafo/source/test_f90/hello_interface.f90
-src/wafo/source/test_f90/mymod.f90
-src/wafo/source/test_f90/mymod.pyd
-src/wafo/source/test_f90/types.f90
-src/wafo/source/test_f90/types.mod
-src/wafo/spectrum/__init__.py
-src/wafo/spectrum/core.py
-src/wafo/spectrum/models.py
-src/wafo/spectrum/test/test_models.py
-src/wafo/spectrum/test/test_models.pyc
-src/wafo/spectrum/test/test_specdata1d.py
-src/wafo/spectrum/test/test_specdata1d.pyc
-src/wafo/stats/__init__.py
-src/wafo/stats/core.py
-src/wafo/stats/distributions.py
-src/wafo/stats/distributions_juli2010.py
-src/wafo/stats/estimation.py
-src/wafo/stats/kde_test.py
-src/wafo/stats/misc.py
-src/wafo/stats/six.py
-src/wafo/stats/sklearn_test.py
-src/wafo/stats/twolumps.py
-src/wafo/stats/tests/test_distributions.py
-src/wafo/stats/tests/test_estimation.py
-src/wafo/test/__init__.py
-src/wafo/test/__init__.pyc
-src/wafo/test/test_gaussian.py
-src/wafo/test/test_gaussian.pyc
-src/wafo/test/test_kdetools.py
-src/wafo/test/test_kdetools.pyc
-src/wafo/test/test_misc.py
-src/wafo/test/test_misc.pyc
-src/wafo/test/test_objects.py
-src/wafo/test/test_objects.pyc
-src/wafo/transform/__init__.py
-src/wafo/transform/core.py
-src/wafo/transform/models.py
-src/wafo/transform/models.~py
-src/wafo/transform/test/__init__.py
-src/wafo/transform/test/__init__.pyc
-src/wafo/transform/test/test_models.py
-src/wafo/transform/test/test_models.pyc
-src/wafo/transform/test/test_trdata.py
-src/wafo/transform/test/test_trdata.pyc
-src/wafo/wave_theory/__init__.py
-src/wafo/wave_theory/core.py
-src/wafo/wave_theory/dispersion_relation.py
-src/wafo/wave_theory/test/__init__.py
-src/wafo/wave_theory/test/__init__.pyc
-src/wafo/wave_theory/test/test_dispersion_relation.py
-src/wafo/wave_theory/test/test_dispersion_relation.pyc
\ No newline at end of file
diff --git a/pywafo/src/Wafo.egg-info/top_level.txt b/pywafo/src/Wafo.egg-info/top_level.txt
deleted file mode 100644
index 71345e3..0000000
--- a/pywafo/src/Wafo.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-wafo
diff --git a/pywafo/src/epydoc_wafo.prj b/pywafo/src/epydoc_wafo.prj
deleted file mode 100644
index df8c73a..0000000
--- a/pywafo/src/epydoc_wafo.prj
+++ /dev/null
@@ -1,64 +0,0 @@
-(dp0
-S'show_imports'
-p1
-I0
-sS'private_css'
-p2
-S'default'
-p3
-sS'prj_name'
-p4
-S'WAFO'
-p5
-sS'docformat'
-p6
-S'restructuredtext'
-p7
-sS'inheritance'
-p8
-S'grouped'
-p9
-sS'help'
-p10
-NsS'modules'
-p11
-(S'C:/pab/workspace/PYWAFO/src/wafo/objects.py'
-p12
-S'C:/pab/workspace/PYWAFO/src/wafo/__init__.py'
-p13
-S'C:/pab/workspace/PYWAFO/src/wafo/info.py'
-p14
-S'C:/pab/workspace/PYWAFO/src/wafo/plotbackend.py'
-p15
-S'C:/pab/workspace/PYWAFO/src/wafo/spectrum/__init__.py'
-p16
-S'C:/pab/workspace/PYWAFO/src/wafo/spectrum/dispersion_relation.py'
-p17
-S'C:/pab/workspace/PYWAFO/src/wafo/spectrum/models.py'
-p18
-S'C:/pab/workspace/PYWAFO/src/wafo/data/info.py'
-p19
-S'C:/pab/workspace/PYWAFO/src/wafo/transform/__init__.py'
-p20
-S'C:/pab/workspace/PYWAFO/src/wafo/transform/models.py'
-p21
-tp22
-sS'private'
-p23
-I1
-sS'prj_url'
-p24
-S'http://www.maths.lth.se/matstat/wafo/'
-p25
-sS'frames'
-p26
-I1
-sS'css'
-p27
-S'default'
-p28
-sS'outdir'
-p29
-S'html'
-p30
-s.
\ No newline at end of file
diff --git a/pywafo/src/wafo/c_library.pyd b/pywafo/src/wafo/c_library.pyd
deleted file mode 100644
index 5b6243e..0000000
Binary files a/pywafo/src/wafo/c_library.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/c_library.so b/pywafo/src/wafo/c_library.so
deleted file mode 100755
index ff80c41..0000000
Binary files a/pywafo/src/wafo/c_library.so and /dev/null differ
diff --git a/pywafo/src/wafo/cov2mod.pyd b/pywafo/src/wafo/cov2mod.pyd
deleted file mode 100644
index 7f29572..0000000
Binary files a/pywafo/src/wafo/cov2mod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/data/info.~py b/pywafo/src/wafo/data/info.~py
deleted file mode 100644
index 6a0aec3..0000000
--- a/pywafo/src/wafo/data/info.~py
+++ /dev/null
@@ -1,456 +0,0 @@
-"""
-Data package in WAFO Toolbox.
-
-Contents
---------
-atlantic - Significant wave-height data recorded in the Atlantic Ocean
-gfaks89 - Surface elevation measured at Gullfaks C 24.12.1989
-gfaksr89 - Reconstructed surface elevation measured at Gullfaks C 24.12.1989.
-japansea - coastline map of The Japan Sea
-northsea - coastline map of The Nortsea
-sea - Surface elevation dataset used in WAT version 1.1.
-sfa89 - Wind measurements at Statfjord A 24.12.1989
-sn - Fatigue experiment, constant-amplitude loading.
-yura87 - Surface elevation measured off the coast of Yura
-
-
-
-This module gives gives detailed information and easy access to all datasets
-included in WAFO
-
-"""
-#from pylab import load
-#from scipy.io import read_array
-from numpy import (loadtxt,nan)
-import os
-__path2data = os.path.dirname( os.path.realpath(__file__))
-
-__all__ =['atlantic','gfaks89','gfaksr89','japansea','northsea','sea','sfa89',
- 'sn','yura87']
-
-def _load(file):
- """ local load function
- """
- return loadtxt(os.path.join(__path2data,file))
-
-def _tofloat(x):
- if x=='nan' or x=='NaN':
- y = nan
- else:
- y = float(x or 0)
- return y
-def _loadnan(file):
- """ local load function accepting nan's
- """
- myconverter = {0: _tofloat, 1: _tofloat}
- return loadtxt(os.path.join(__path2data,file),converters=myconverter)
-
-def atlantic():
- """
- Return Significant wave-height data recorded in the Atlantic Ocean
-
- Data summary
- ------------
- Size : 582 X 1
- Sampling Rate : ~ 14 times a month
- Device :
- Source :
- Format : ascii
-
- Description
- ------------
- atlantic.dat contains average significant wave-height data recorded
- approximately 14 times a month in December-February during 7 years and
- at 2 locations in the Atlantic Ocean
-
- Example
- --------
- >>> import pylab
- >>> import wafo
- >>> Hs = wafo.data.atlantic()
- >>> h = pylab.plot(Hs)
-
- Acknowledgement:
- ---------------
- This dataset were made available by Dr. David Carter
- and Dr. David Cotton, Satellite Observing Systems, UK.
- """
- return _load('atlantic.dat')
-def gfaks89():
- """
- Return Surface elevation measured at Gullfaks C 24.12.1989
-
- Data summary
- ------------
- Size : 39000 X 2
- Sampling Rate : 2.5 Hz
- Device : EMI laser
- Source : STATOIL
- Format : ascii, c1: time c2: surface elevation
-
- Description
- ------------
- The wave data was measured 24th December 1989 at the Gullfaks C platform
- in the North Sea from 17.00 to 21.20. The period from 20.00 to 20.20
- is missing and contains NaNs. The water depth of 218 m is
- regarded as deep water for the most important wave components.
- There are two EMI laser sensors named 219 and 220. This data set is
- obtained from sensor 219, which is located in the Northwest
- corner approximately two platform leg diameters away from
- the closest leg.
- Thus the wave elevation is not expected to be significantly
- affected by diffraction effects for incoming waves in the western sector.
- The wind direction for this period is from the south.
- Some difficulties in calibration of the instruments have been reported
- resulting in several consecutive measured values being equal or almost equal
- in the observed data set.
-
- This dataset is for non-commercial use only.
-
- Hm0 = 6.8m, Tm02 = 8s, Tp = 10.5
-
- Example
- -------
- >>> import pylab
- >>> import wafo
- >>> x = wafo.data.gfaks89()
- >>> h = pylab.plot(x[:,0],x[:,1])
-
- Acknowledgement:
- ---------------
- This dataset were prepared and made available by Dr. S. Haver,
- STATOIL, Norway
-
- See also
- --------
- gfaksr89, northsea
-
- """
- return _loadnan('gfaks89.dat')
-def gfaksr89():
- """
- Return a reconstruction of surface elevation measured at Gullfaks C 24.12.1989.
-
-
- Data summary
- ------------
- Size : 39000 X 2
- Sampling Rate : 2.5 Hz
- Device : EMI laser
- Source : STATOIL
- Format : ascii, c1: time c2: surface elevation
-
- Description
- -----------
- This is a reconstructed version of the data in the GFAKS89.DAT file.
- The following calls were made to reconstruct the data:
-
- inds = findoutliers(gfaks89,.02,2,1.23);
- gfaksr89 = reconstruct(gfaks89,inds,6);
-
- The wave data was measured 24th December 1989 at the Gullfaks C platform
- in the North Sea from 17.00 to 21.20. The period from 20.00 to 20.20
- is missing in the original data. The water depth of 218 m is
- regarded as deep water for the most important wave components.
- There are two EMI laser sensors named 219 and 220. This data set is
- obtained from sensor 219, which is located in the Northwest
- corner approximately two platform leg diameters away from
- the closest leg.
- Thus the wave elevation is not expected to be significantly
- affected by diffraction effects for incoming waves in the western sector.
- The wind direction for this period is from the south.
- Some difficulties in calibration of the instruments have been reported
- resulting in several consecutive measured values being equal or almost equal
- in the observed data set.
-
- Hm0 = 6.8m, Tm02 = 8s, Tp = 10.5
-
-
- Example
- -------
- >>> import pylab
- >>> import wafo
- >>> x = wafo.data.gfaksr89()
- >>> h = pylab.plot(x[:,0],x[:,1])
-
-
- See also
- --------
- gfaks89
- """
- return _loadnan('gfaksr89.dat')
-def japansea():
- """
- Return coastline map of The Japan Sea
-
-
- Data summary
- ------------
- Size : 692 X 2
- Sampling Rate :
- Device :
- Source : http://crusty.er.usgs.gov/coast/getcoast.html
- Format : ascii, c1: longitude c2: latitude
-
- Description
- -----------
- JAPANSEA.DAT contains data for plotting a map of The Japan Sea.
- The data is obtained from USGS coastline extractor.
-
- Example:
- -------
- #the map is seen by
-
- >>> import pylab
- >>> import wafo
- >>> map1 = wafo.data.japansea()
- >>> h = pylab.plot(map1[:,0],map1[:,1])
- >>> lon_loc = [131,132,132,135,139.5,139]
- >>> lat_loc = [46, 43, 40, 35, 38.3, 35.7]
- >>> loc = ['China','Vladivostok','Japan Sea', 'Japan', 'Yura','Tokyo']
- >>> algn = 'right'
- >>> for lon, lat, name in zip(lon_loc,lat_loc,loc):
- pylab.text(lon,lat,name,horizontalalignment=algn)
-
-
- # If you have the m_map toolbox (see http://www.ocgy.ubc.ca/~rich/):
- m_proj('lambert','long',[130 148],'lat',[30 48]);
- m_line(map(:,1),map(:,2));
- m_grid('box','fancy','tickdir','out');
- m_text(131,46,'China');
- m_text(132,43,'Vladivostok');
- m_text(132,40,'Japan Sea');
- m_text(135,35,'Japan');
- m_text(139.5,38.3,'Yura');
- m_text(139,35.7,'Tokyo');
- """
- return _loadnan('japansea.dat')
-def northsea():
- """
- NORTHSEA coastline map of The Nortsea
-
- Data summary
- -------------
- Size : 60646 X 2
- Sampling Rate :
- Device :
- Source : http://crusty.er.usgs.gov/coast/getcoast.html
- Format : ascii, c1: longitude c2: latitude
-
- Description
- -----------
- NORTHSEA.DAT contains data for plotting a map of The Northsea.
- The data is obtained from USGS coastline extractor.
-
- Example
- -------
- # the map is seen by
-
- >>> import pylab
- >>> import wafo
- >>> map1 = wafo.data.northsea()
- >>> h = pylab.plot(map1[:,0],map1[:,1])
- >>> lon_pltfrm = [1.8, 2.3, 2., 1.9, 2.6]
- >>> lat_pltfrm = [61.2, 61.2, 59.9, 58.4, 57.7]
- >>> pltfrm = ['Statfjord A', 'Gullfaks C', 'Frigg', 'Sleipner', 'Draupner']
- >>> h = pylab.scatter(lon_pltfrm,lat_pltfrm);
- >>> algn = 'right'
- >>> for lon, lat, name in zip(lon_pltfrm,lat_pltfrm,pltfrm):
- pylab.text(lon,lat,name,horizontalalignment=algn); algn = 'left'
-
-
- >>> lon_city = [10.8, 10.8, 5.52, 5.2]
- >>> lat_city = [59.85, 63.4, 58.9, 60.3]
- >>> city = ['Oslo','Trondheim','Stavanger', 'Bergen']
- >>> h = pylab.scatter(lon_city,lat_city);
- >>> algn = 'right'
- >>> for lon, lat, name in zip(lon_city,lat_city,city):
- pylab.text(lon,lat,name,horizontalalignment=algn)
-
- >>> from mpl_toolkits.basemap import Basemap
- >>> import matplotlib.pyplot as plt
-
- # setup Lambert Conformal basemap.
- >>> m = Basemap(width=1200000,height=900000,projection='lcc',
- resolution='f',lat_1=56.,lat_2=64,lat_0=58,lon_0=5.)
- # draw coastlines.
- >>> m.drawcoastlines()
- >>> h = m.scatter(lon_pltfrm,lat_pltfrm);
- >>> algn = 'right'
- >>> for lon, lat, name in zip(lon_pltfrm,lat_pltfrm,pltfrm):
- m.text(lon,lat,name,horizontalalignment=algn); algn = 'left'
- >>> m.scatter(lon_city,lat_city)
- >>> m.scatter()
-
- # If you have the m_map toolbox (see http://www.ocgy.ubc.ca/~rich/):
- m_proj('lambert','long',[-2 12],'lat',[56 64]);
- m_line(map(:,1),map(:,2));
- m_grid('box','fancy','tickdir','out');
- m_text( 1,62 ,'Statfjord A') ;
- m_line([1.8, 1.8], [62 ,61.2 ]);
- m_text(1.7,61.2,'x') ;
- m_text(1,59.5,'Gullfaks C') ;
- m_line([1.8, 2.3 ], [59.50 ,61.20 ]);
- m_text(2.20,61.20,'x') ;
- m_text(10.10,60.05,'Oslo');
- m_text(8.5,63.5,'Trondheim');
- m_text(4.00,58.80,'Stavanger');
- m_text(3.50,60.30,'Bergen') ;
- m_text(8,61,'Norway');
- """
- return _loadnan('northsea.dat')
-def sea():
- """
- Return Surface elevation dataset used in WAT version 1.1.
-
- Data summary
- ------------
- Size : 9524 X 2
- Sampling Rate : 4.0 Hz
- Device : unknown
- Source : unknown
- Format : ascii, c1: time c2: surface elevation
-
- Description
- -----------
- The wave data was used in one of WAFO predecessors, i.e. the Wave
- Analysis Toolbox version 1.1 (WAT)
- Hm0 = 1.9m, Tm02 = 4.0s, Tp2 = 11.5s Tp1=5.6s
-
- Example
- -------
- >>> import pylab
- >>> import wafo
- >>> x = wafo.data.sea()
- >>> h = pylab.plot(x[:,0],x[:,1])
- """
- return _load('sea.dat')
-def sfa89():
- """
- Return Wind measurements at Statfjord A 24.12.1989
-
- Data summary
- ------------
- Size : 144 X 3
- Sampling Rate : 1/600 Hz
- Device :
- Source : DNMI (The Norwegian Meteorological Institute)
- Format : ascii, c1: time (hours)
- c2: velocity (m/s)
- c3: direction (degrees)
- Description
- -----------
- The registration of wind speeds at the Gullfaks field
- started up on Statfjord A in 1978 and continued until 1990.
- The dataregistration was transferred to Gullfaks C in Nov 1989.
- Due to some difficulties of the windregistration on Gullfaks C in
- the beginning, they continued to use the registered data from
- Statfjord A.
- The windspeed is measured in (meter/second), 110 m above mean water
- level (MWL) and the wind direction is given in degrees for the data.
- The data are a mean value of every 10 minutes.
- Wind directions are defined in the meteorological convention, i.e.,
- 0 degrees = wind approaching from North, 90 degrees = wind from East, etc.
- This dataset is for non-commercial use only.
-
- Example
- -------
- >>> import pylab
- >>> import wafo
- >>> x = wafo.data.sfa89()
- >>> h = pylab.plot(x[:,0],x[:,1])
-
- Acknowledgement
- ----------------
- These data are made available by Knut A. Iden, DNMI.
-
- See also
- --------
- northsea
- """
- return _load('sfa89.dat')
-def sn():
- """
- Return SN Fatigue experiment, constant-amplitude loading.
-
-
- Data summary
- ------------
- Size : 40 X 2
- Source : unknown
- Format : ascii, c1: Amplitude MPa c2: Number of cycles
-
- Description
- -----------
- A fatigue experiment with constant amplitudes at five levels:
- 10,15,20,25 and 30 MPa. For each level is related 8 observations of
- the number of cycles to failure.
-
- The origin of the data is unknown.
-
- Example
- -------
- >>> import pylab
- >>> import wafo
- >>> x = wafo.data.sn()
- >>> h = pylab.plot(x[:,0],x[:,1])
-
- See also
- --------
- The same data appear in the directory wdemos/itmkurs/
- as SN.mat.
-
- """
- return _load('sn.dat')
-def yura87():
- """
- Return Surface elevation measured off the coast of Yura.
-
-
- Data summary
- -----------
- Size : 85547 X 4
- Sampling Rate : 1 Hz
- Device : ultrasonic wave gauges
- Source : SRI, Ministry of Transport, Japan
- Format : ascii, c1: time (sec) c2-4: surface elevation (m)
-
- Description
- -----------
- The wave data was measured at the Poseidon platform
- in the Japan Sea from 24th November 1987 08.12 hours to 25th November
- 1987 07.57 hours. Poseidon was located 3 km off the coast of Yura
- in the Yamagata prefecture, in the Japan Sea during the measurements.
- The most important wave components are to some extent influenced by the
- water depth of 42 m. The data are measured with three ultrasonic wave
- gauges located at the sea floor and the relative coordinates of the
- gauges are as follows (x-axis points to the East, y-axis points to
- the North):
- X (m) Y (m)
- c2: -4.93, 25.02
- c3: 5.80, 92.12
- c4: 0.00, 0.00
-
- This dataset is for non-commercial use only.
-
- Hm0 = 5.1m, Tm02 = 7.7s, Tp = 12.8s
- Example
- -------
- >>> import pylab
- >>> import wafo
- >>> x = wafo.data.yura87()
- >>> h = pylab.plot(x[:,0],x[:,1])
-
- Acknowledgement:
- -----------------
- This dataset were prepared and made available by Dr. Sc. H. Tomita,
- Ship Research Institute, Ministry of Transport, Japan.
-
- See also
- --------
- japansea
- """
- return _load('yura87.dat')
-if __name__=='__main__':
- import doctest
- doctest.testmod()
\ No newline at end of file
diff --git a/pywafo/src/wafo/definitions.~py b/pywafo/src/wafo/definitions.~py
deleted file mode 100644
index 1ec1a24..0000000
--- a/pywafo/src/wafo/definitions.~py
+++ /dev/null
@@ -1,281 +0,0 @@
-"""
-WAFO defintions and numenclature
-
-crossings :
-cycle_pairs :
-turning_points :
-wave_amplitudes :
-wave_periods :
-waves :
-"""
-def wave_amplitudes():
- """
- Wave amplitudes and heights definitions and nomenclature
-
- Definition of wave amplitudes and wave heights
- ---------------------------------------------
-
- <----- Direction of wave propagation
-
-
- ...............c_..........
- | /| \ |
- Hd | _/ | \ | Hu
- M | / | \ |
- / \ | M / Ac | \_ | c_
- F \ | / \m/ | \ | / \
- ------d----|---u------------------d---|---u----d------ level v
- \ | /| \ | / \L
- \_ | / | At \_|_/
- \|/..| t
- t
-
- Parameters
- ----------
- Ac : crest amplitude
- At : trough amplitude
- Hd : wave height as defined for down crossing waves
- Hu : wave height as defined for up crossing waves
-
- See also
- --------
- waves, crossings, turning_points
- """
- pass
-def crossings():
- """
- Level v crossing definitions and nomenclature
-
- Definition of level v crossings
- -------------------------------
- M
- . . M M
- . . . . . .
- F d . . L
- -----------------------u-------d-------o----------------- level v
- . . . . u
- . m
- m
-
- Let the letters 'm', 'M', 'F', 'L','d' and 'u' in the
- figure above denote local minimum, maximum, first value, last
- value, down- and up-crossing, respectively. The remaining
- sampled values are indicated with a '.'. Values that are identical
- with v, but do not cross the level is indicated with the letter 'o'.
- We have a level up-crossing at index, k, if
-
- x(k) < v and v < x(k+1)
- or if
- x(k) == v and v < x(k+1) and x(r) < v for some di < r <= k-1
-
- where di is the index to the previous downcrossing.
- Similarly there is a level down-crossing at index, k, if
-
- x(k) > v and v > x(k+1)
- or if
- x(k) == v and v > x(k+1) and x(r) > v for some ui < r <= k-1
-
- where ui is the index to the previous upcrossing.
-
- The first (F) value is a up crossing if x(1) = v and x(2) > v.
- Similarly, it is a down crossing if x(1) = v and x(2) < v.
-
- See also
- --------
- wave_periods, waves, turning_points, findcross, findtp
- """
- pass
-def cycle_pairs():
- """
- Cycle pairs definitions and numenclature
-
- Definition of Max2min and min2Max cycle pair
- --------------------------------------------
- A min2Max cycle pair (mM) is defined as the pair of a minimum
- and the following Maximum. Similarly a Max2min cycle pair (Mm)
- is defined as the pair of a Maximum and the following minimum.
- (all turning points possibly rainflowfiltered before pairing into cycles.)
-
- See also
- --------
- turning_points
- """
- pass
-def wave_periods():
- """
- Wave periods (lengths) definitions and nomenclature
-
- Definition of wave periods (lengths)
- ------------------------------------
-
-
- <----- Direction of wave propagation
-
- <-------Tu--------->
- : :
- <---Tc-----> :
- : : : <------Tcc---->
- M : c : : : :
- / \ : M / \_ : : c_ c
- F \ :/ \m/ \: :/ \ / \
- ------d--------u----------d-------u----d--------u---d-------- level v
- \ / \ / :\_ _/: :\_ L
- \_ / \_t_/ : \t_/ : : \m/
- \t/ : : : :
- : : <---Tt---> :
- <--------Ttt-------> : :
- <-----Td----->
- Tu = Up crossing period
- Td = Down crossing period
- Tc = Crest period, i.e., period between up crossing and
- the next down crossing
- Tt = Trough period, i.e., period between down crossing and
- the next up crossing
- Ttt = Trough2trough period
- Tcc = Crest2crest period
-
-
- <----- Direction of wave propagation
-
- <--Tcf-> Tuc
- : : <-Tcb-> <->
- M : c : : : :
- / \ : M / \_ c_ : : c
- F \ :/ \m/ \ / \___: :/ \
- ------d---------u----------d---------u-------d--------u---d------ level v
- :\_ / \ __/: \_ _/ \_ L
- : \_ / \_t_/ : \t_/ \m/
- : \t/ : :
- : : : :
- <-Ttf-> <-Ttb->
-
-
- Tcf = Crest front period, i.e., period between up crossing and crest
- Tcb = Crest back period, i.e., period between crest and down crossing
- Ttf = Trough front period, i.e., period between down crossing and trough
- Ttb = Trough back period, i.e., period between trough and up crossing
- Also note that Tcf and Ttf can also be abbreviated by their crossing
- marker, e.g. Tuc (u2c) and Tdt (d2t), respectively. Similar applies
- to all the other wave periods and wave lengths.
-
- (The nomenclature for wave length is similar, just substitute T and
- period with L and length, respectively)
-
- <----- Direction of wave propagation
-
- <--TMm-->
- <-TmM-> : :
- M : : M :
- / \ : M /:\_ : M_ M
- F \ : / \m/ : \ : /: \ / \
- \ : / : \ : / : \ / \
- \ : / : \ : / : \_ _/ \_ L
- \_ : / : \_m_/ : \m_/ \m/
- \m/ : : : :
- <-----TMM-----> <----Tmm----->
-
-
- TmM = Period between minimum and the following Maximum
- TMm = Period between Maximum and the following minimum
- TMM = Period between Maximum and the following Maximum
- Tmm = Period between minimum and the following minimum
-
- See also
- --------
- waves,
- wave_amplitudes,
- crossings,
- turning_points
- """
- pass
-def turning_points():
- """
- Turning points definitions and numenclature
-
- Definition of turningpoints
- ---------------------------
- <----- Direction of wave propagation
-
- M M
- / \ .... M /:\_ M_ M
- F \ | / \m/ : \ /: \ / \
- \ h | / : \ / : \ / \
- \ | / : \ / : \_ _/ \_ L
- \_ | / : \_m_/ : \m_/ \m/
- \m/ : : : :
- <------Mw-----> <-----mw----->
-
- Local minimum or maximum are indicated with the
- letters 'm' or 'M'. Turning points in this connection are all
- local max (M) and min (m) and the last (L) value and the
- first (F) value if the first local extremum is a max.
-
- (This choice is made in order to get the exact up-crossing intensity
- from rfc by mm2lc(tp2mm(rfc)) )
-
-
- See also
- --------
- waves,
- crossings,
- cycle_pairs
- findtp
-
- """
- pass
-def waves():
- """
- Wave definitions and nomenclature
-
- Definition of trough and crest
- ------------------------------
- A trough (t) is defined as the global minimum between a
- level v down-crossing (d) and the next up-crossing (u)
- and a crest (c) is defined as the global maximum between a
- level v up-crossing and the following down-crossing.
-
- Definition of down- and up -crossing waves
- ------------------------------------------
- A level v-down-crossing wave (dw) is a wave from a
- down-crossing to the following down-crossing.
- Similarly, a level v-up-crossing wave (uw) is a wave from an up-crossing
- to the next up-crossing.
-
- Definition of trough and crest waves
- ------------------------------------
- A trough-to-trough wave (tw) is a wave from a trough (t) to the
- following trough. The crest-to-crest wave (cw) is defined similarly.
-
-
- Definition of min2min and Max2Max wave
- --------------------------------------
- A min2min wave (mw) is defined starting from a minimum (m) and
- ending in the following minimum.
- Similarly a Max2Max wave (Mw) is thus a wave from a maximum (M)
- to the next maximum (all waves optionally rainflow filtered).
-
- <----- Direction of wave propagation
-
-
- <------Mw-----> <----mw---->
- M : : c :
- / \ M : / \_ : c_ c
- F \ / \m/ \ : /: \ /:\
- ------d--------u----------d-------u----d--------u---d------ level v
- \ /: \ : /: : :\_ _/ : :\_ L
- \_ / : \_t_/ : : : \t_/ : : \m/
- \t/ <-------uw---------> : <-----dw----->
- : : : :
- <--------tw--------> <------cw----->
-
- (F= first value and L=last value).
-
- See also
- --------
- turning_points,
- crossings,
- wave_periods
- findtc,
- findcross
- """
- pass
\ No newline at end of file
diff --git a/pywafo/src/wafo/mvn.pyd b/pywafo/src/wafo/mvn.pyd
deleted file mode 100644
index 5dbb792..0000000
Binary files a/pywafo/src/wafo/mvn.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/mvn.so b/pywafo/src/wafo/mvn.so
deleted file mode 100755
index dad7a10..0000000
Binary files a/pywafo/src/wafo/mvn.so and /dev/null differ
diff --git a/pywafo/src/wafo/mvnprdmod.pyd b/pywafo/src/wafo/mvnprdmod.pyd
deleted file mode 100644
index 84ed727..0000000
Binary files a/pywafo/src/wafo/mvnprdmod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/mvnprdmod.so b/pywafo/src/wafo/mvnprdmod.so
deleted file mode 100755
index 5c0cab9..0000000
Binary files a/pywafo/src/wafo/mvnprdmod.so and /dev/null differ
diff --git a/pywafo/src/wafo/rindmod.pyd b/pywafo/src/wafo/rindmod.pyd
deleted file mode 100644
index e497cd4..0000000
Binary files a/pywafo/src/wafo/rindmod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/rindmod.so b/pywafo/src/wafo/rindmod.so
deleted file mode 100755
index a54a113..0000000
Binary files a/pywafo/src/wafo/rindmod.so and /dev/null differ
diff --git a/pywafo/src/wafo/source/mreg/checkmod.mod b/pywafo/src/wafo/source/mreg/checkmod.mod
deleted file mode 100644
index 0515a80..0000000
--- a/pywafo/src/wafo/source/mreg/checkmod.mod
+++ /dev/null
@@ -1,54 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:d9cc3708c49161cf45724d686af16cf0 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'checkmod' 'checkmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0
-0)
-3 'iii0' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-4 'iii01' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-5 'iii101' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-6 'iii11' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-7 'iii21' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-8 'iii31' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-9 'iii41' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-10 'iii51' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-11 'iii61' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-12 'iii71' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-13 'iii81' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-14 'iii91' 'checkmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-)
-
-('checkmod' 0 2 'iii0' 0 3 'iii01' 0 4 'iii101' 0 5 'iii11' 0 6 'iii21'
-0 7 'iii31' 0 8 'iii41' 0 9 'iii51' 0 10 'iii61' 0 11 'iii71' 0 12 'iii81'
-0 13 'iii91' 0 14)
diff --git a/pywafo/src/wafo/source/mreg/cov2mmpdfmod.mod b/pywafo/src/wafo/source/mreg/cov2mmpdfmod.mod
deleted file mode 100644
index b04ec1e..0000000
--- a/pywafo/src/wafo/source/mreg/cov2mmpdfmod.mod
+++ /dev/null
@@ -1,151 +0,0 @@
-GFORTRAN module version '0' created from cov2mmpdfreg_intfc.f on Thu Aug 06 03:39:39 2009
-MD5:983e75e1f187678a4601b92db2a3f449 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () ()
-() () () () () () () () () () () () () () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'c_' 'cov2mmpdfmod' 'c_' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-3 'cov2mmpdfmod' 'cov2mmpdfmod' 'cov2mmpdfmod' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 ()
-() () 0 0)
-4 'cov2mmpdfreg' 'cov2mmpdfmod' 'cov2mmpdfreg' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 5 0 (6 7 8 9 10 11 12 13 14 15 16 17) () 0 () () () 0 0)
-18 'covg' 'cov2mmpdfmod' 'covg' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 19 0 (20 21 22 23 24
-25) () 0 () () () 0 0)
-26 'eps0_' 'cov2mmpdfmod' 'eps0_' 1 ((VARIABLE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN IMPLICIT-SAVE) (REAL 8 0 0 REAL ()) 0 0 () () 0 ()
-() () 0 0)
-27 'eps_' 'cov2mmpdfmod' 'eps_' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-28 'epss_' 'cov2mmpdfmod' 'epss_' 1 ((VARIABLE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN IMPLICIT-SAVE) (REAL 8 0 0 REAL ()) 0 0 () () 0 ()
-() () 0 0)
-29 'iac_' 'cov2mmpdfmod' 'iac_' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0
-0)
-30 'initinteg' 'cov2mmpdfmod' 'initinteg' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () ()
-0 () () () 0 0)
-31 'initlevels' 'cov2mmpdfmod' 'initlevels' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0
-UNKNOWN ()) 32 0 (33 34 35 36 37 38) () 0 () () () 0 0)
-39 'isq_' 'cov2mmpdfmod' 'isq_' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0
-0)
-40 'sple' 'cov2mmpdfmod' 'sple' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 REAL ()) 41 0 (42 43
-44 45) () 40 () () () 0 0)
-46 'transf' 'cov2mmpdfmod' 'transf' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0
-UNKNOWN ()) 47 0 (48 49 50 51 52 53) () 0 () () () 0 0)
-9 'ulev' '' 'ulev' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-14 ())) 0 () () () 0 0)
-10 'vlev' '' 'vlev' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-15 ())) 0 () () () 0 0)
-11 'tg' '' 'tg' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 16 ())) 0 () ()
-() 0 0)
-12 'xg' '' 'xg' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 16 ())) 0 () ()
-() 0 0)
-13 'nt' '' 'nt' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'nu' '' 'nu' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-15 'nv' '' 'nv' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-16 'ng' '' 'ng' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-17 'nit' '' 'nit' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'uvdens' '' 'uvdens' 5 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (2 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-14 ()) (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4
-0 0 INTEGER ()) 0 15 ())) 0 () () () 0 0)
-7 't' '' 't' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 13 ())) 0 () ()
-() 0 0)
-8 'cov' '' 'cov' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (2 EXPLICIT (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 13 ()) (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '5')) 0 () () () 0 0)
-33 't' '' 't' 32 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-34 'ht' '' 'ht' 32 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-35 'n' '' 'n' 32 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-36 'ng' '' 'ng' 32 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-37 'nu' '' 'nu' 32 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-38 'nv' '' 'nv' 32 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-48 'n' '' 'n' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-49 't' '' 't' 47 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-50 'a' '' 'a' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-51 'timev' '' 'timev' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-52 'value' '' 'value' 47 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-53 'der' '' 'der' 47 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-42 'n' '' 'n' 41 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-43 't' '' 't' 41 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-44 'a' '' 'a' 41 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-45 'timev' '' 'timev' 41 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-20 'xl0' '' 'xl0' 19 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-21 'xl2' '' 'xl2' 19 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-22 'xl4' '' 'xl4' 19 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-23 'cov' '' 'cov' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (2 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ()) (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '5')) 0 () () () 0 0)
-24 't' '' 't' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 25 ())) 0 () ()
-() 0 0)
-25 'n' '' 'n' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-)
-
-('c_' 0 2 'cov2mmpdfmod' 0 3 'cov2mmpdfreg' 0 4 'covg' 0 18 'eps0_' 0 26
-'eps_' 0 27 'epss_' 0 28 'iac_' 0 29 'initinteg' 0 30 'initlevels' 0 31
-'isq_' 0 39 'sple' 0 40 'transf' 0 46)
diff --git a/pywafo/src/wafo/source/mreg/epsmod.mod b/pywafo/src/wafo/source/mreg/epsmod.mod
deleted file mode 100644
index e6f3d3b..0000000
--- a/pywafo/src/wafo/source/mreg/epsmod.mod
+++ /dev/null
@@ -1,27 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:6ae09751c5b336ec35eb71534e46a563 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'eps' 'epsmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-3 'eps0' 'epsmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-4 'epsmod' 'epsmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-5 'epss' 'epsmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('eps' 0 2 'eps0' 0 3 'epsmod' 0 4 'epss' 0 5)
diff --git a/pywafo/src/wafo/source/mreg/expaccmod.mod b/pywafo/src/wafo/source/mreg/expaccmod.mod
deleted file mode 100644
index 6d17560..0000000
--- a/pywafo/src/wafo/source/mreg/expaccmod.mod
+++ /dev/null
@@ -1,25 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:4fddbcea71fd92bd3345281bbf49e6eb -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'expaccmod' 'expaccmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0
-0)
-3 'pmax' 'expaccmod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.28000000000000@2') () 0 () () () 0 0)
-)
-
-('expaccmod' 0 2 'pmax' 0 3)
diff --git a/pywafo/src/wafo/source/mreg/infcmod.mod b/pywafo/src/wafo/source/mreg/infcmod.mod
deleted file mode 100644
index 0683ccc..0000000
--- a/pywafo/src/wafo/source/mreg/infcmod.mod
+++ /dev/null
@@ -1,33 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:88b29dedfc036f5dd0339afd03f086f2 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'iac' 'infcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-3 'inf' 'infcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '10')) 0 () () () 0 0)
-4 'infcmod' 'infcmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-5 'info' 'infcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '10')) 0 () () () 0 0)
-6 'isq' 'infcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-)
-
-('iac' 0 2 'inf' 0 3 'infcmod' 0 4 'info' 0 5 'isq' 0 6)
diff --git a/pywafo/src/wafo/source/mreg/mregmod.mod b/pywafo/src/wafo/source/mreg/mregmod.mod
deleted file mode 100644
index 283448f..0000000
--- a/pywafo/src/wafo/source/mreg/mregmod.mod
+++ /dev/null
@@ -1,99 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:c0ff9d5617455613bb8b25284c401293 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('fi' 'mregmod' 2) ('mreg' 'mregmod' 3) ('rind' 'mregmod' 4))
-
-()
-
-()
-
-()
-
-(2 'fi' 'mregmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC IMPLICIT_PURE) (REAL 8 0 0 0 REAL ()) 5 0 (
-6) () 2 () () () 0 0)
-3 'mreg' 'mregmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 7 0 (8 9 10
-11 12 13 14 15 16 17 18 19 20) () 0 () () () 0 0)
-4 'rind' 'mregmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 21 0 (22 23
-24 25 26 27 28 29 30 31) () 0 () () () 0 0)
-6 'xx' '' '' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-8 'f' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'r' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '40401')) 0 () () () 0 0)
-10 'b' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '201')) 0 () () () 0 0)
-11 'db' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '201')) 0 () () () 0 0)
-12 'aa' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '4') (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER
-4 0 0 0 INTEGER ()) 0 '4')) 0 () () () 0 0)
-13 'bb' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '7')) 0 () () () 0 0)
-14 'a' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '1407')) 0 () () () 0 0)
-15 'da' '' '' 7 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '7')) 0 () () () 0 0)
-16 'vder' '' '' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-17 'm' '' '' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-18 'n' '' '' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-19 'nit' '' '' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-20 'infr' '' '' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-22 'xind' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-23 'r' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '40401')) 0 () () () 0 0)
-24 'bu' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '201')) 0 () () () 0 0)
-25 'dbun' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-26 'db' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '201')) 0 () () () 0 0)
-27 'sq' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '201')) 0 () () () 0 0)
-28 'vder' '' '' 21 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-29 'nit' '' '' 21 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-30 'n' '' '' 21 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-31 'infr' '' '' 21 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-)
-
-('fi' 0 2 'mreg' 0 3 'rind' 0 4)
diff --git a/pywafo/src/wafo/source/mreg/quadrmod.mod b/pywafo/src/wafo/source/mreg/quadrmod.mod
deleted file mode 100644
index 5bd7c55..0000000
--- a/pywafo/src/wafo/source/mreg/quadrmod.mod
+++ /dev/null
@@ -1,39 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:28f744b94fb4ee56c4d53d5079b965d6 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'h' 'quadrmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '126')) 0 () () () 0 0)
-3 'i' 'quadrmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-4 'nn' 'quadrmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (
-1 0 EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '25')) 0 () () () 0 0)
-5 'nnw' 'quadrmod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13') () 0 () () () 0 0)
-6 'quadrmod' 'quadrmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0
-0)
-7 'z' 'quadrmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '126')) 0 () () () 0 0)
-)
-
-('h' 0 2 'i' 0 3 'nn' 0 4 'nnw' 0 5 'quadrmod' 0 6 'z' 0 7)
diff --git a/pywafo/src/wafo/source/mreg/rintmod.mod b/pywafo/src/wafo/source/mreg/rintmod.mod
deleted file mode 100644
index 240a401..0000000
--- a/pywafo/src/wafo/source/mreg/rintmod.mod
+++ /dev/null
@@ -1,25 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:b066accfa9abc965446066977295c242 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'c' 'rintmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-3 'fc' 'rintmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-4 'rintmod' 'rintmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-)
-
-('c' 0 2 'fc' 0 3 'rintmod' 0 4)
diff --git a/pywafo/src/wafo/source/mreg/sizemod.mod b/pywafo/src/wafo/source/mreg/sizemod.mod
deleted file mode 100644
index b0a10ea..0000000
--- a/pywafo/src/wafo/source/mreg/sizemod.mod
+++ /dev/null
@@ -1,30 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:045224226b5a92ce3fb027e2c0064e27 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'mmax' 'sizemod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '6') () 0 () () () 0 0)
-3 'nmax' 'sizemod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '201') () 0 () () () 0 0)
-4 'rdim' 'sizemod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '40401') () 0 () () () 0 0)
-5 'sizemod' 'sizemod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-)
-
-('mmax' 0 2 'nmax' 0 3 'rdim' 0 4 'sizemod' 0 5)
diff --git a/pywafo/src/wafo/source/mreg/svd.mod b/pywafo/src/wafo/source/mreg/svd.mod
deleted file mode 100644
index 644dce9..0000000
--- a/pywafo/src/wafo/source/mreg/svd.mod
+++ /dev/null
@@ -1,94 +0,0 @@
-GFORTRAN module version '10' created from dsvdc.f
-MD5:abcd8831f7c356963533637fa7c27518 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'dp' 'svd' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '8') () 0 () () () 0 0)
-3 'drot1' 'svd' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN
-0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 4 0 (5 6 7 8
-9) () 0 () () () 0 0)
-10 'drotg' 'svd' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 11 0
-(12 13 14 15) () 0 () () () 0 0)
-16 'dsvdc' 'svd' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN ()) 17
-0 (18 19 20 21 22 23 24 25 26) () 0 () () () 0 0)
-27 'dswap1' 'svd' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 28 0
-(29 30 31) () 0 () () () 0 0)
-32 'selected_real_kind' '(intrinsic)' '' 1 ((PROCEDURE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 FUNCTION) (UNKNOWN 0 0 0 0 UNKNOWN ())
-0 0 () () 32 () () () 0 0)
-33 'svd' 'svd' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-5 'n' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'dx' '' '' 4 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SIZE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-7 'dy' '' '' 4 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SIZE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-8 'c' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 's' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'da' '' '' 11 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-13 'db' '' '' 11 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-14 'dc' '' '' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-15 'ds' '' '' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-18 'x' '' '' 17 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-19 'n' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-20 'p' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-21 's' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-22 'e' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-23 'u' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-24 'v' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-25 'job' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-26 'info' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-29 'n' '' '' 28 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-30 'dx' '' '' 28 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SIZE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-31 'dy' '' '' 28 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SIZE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('dp' 0 2 'drot1' 0 3 'drotg' 0 10 'dsvdc' 0 16 'dswap1' 0 27
-'selected_real_kind' 0 32 'svd' 0 33)
diff --git a/pywafo/src/wafo/source/mreg/tbrmod.mod b/pywafo/src/wafo/source/mreg/tbrmod.mod
deleted file mode 100644
index 754d997..0000000
--- a/pywafo/src/wafo/source/mreg/tbrmod.mod
+++ /dev/null
@@ -1,36 +0,0 @@
-GFORTRAN module version '10' created from mregmodule.f
-MD5:4a3c9785928b78adb9e08df8fc7a2445 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'hh' 'tbrmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '201')) 0 () () () 0 0)
-3 'mmax' 'sizemod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '6') () 0 () () () 0 0)
-4 'nmax' 'sizemod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '201') () 0 () () () 0 0)
-5 'rdim' 'sizemod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '40401') () 0 () () () 0 0)
-6 'sizemod' 'sizemod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-7 'tbrmod' 'tbrmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-)
-
-('hh' 0 2 'mmax' 0 3 'nmax' 0 4 'rdim' 0 5 'sizemod' 0 6 'tbrmod' 0 7)
diff --git a/pywafo/src/wafo/source/mvn/mvn.pyd b/pywafo/src/wafo/source/mvn/mvn.pyd
deleted file mode 100644
index 5dbb792..0000000
Binary files a/pywafo/src/wafo/source/mvn/mvn.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/adaptivegausskronrod.mod b/pywafo/src/wafo/source/mvnprd/adaptivegausskronrod.mod
deleted file mode 100644
index d6f5e21..0000000
--- a/pywafo/src/wafo/source/mvnprd/adaptivegausskronrod.mod
+++ /dev/null
@@ -1,116 +0,0 @@
-GFORTRAN module version '10' created from mvnprodcorrprb.f
-MD5:4cf088ac31844fc439b9335751705634 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('dqagp' 'adaptivegausskronrod' 2) ('dqagpe' 'adaptivegausskronrod' 3))
-
-()
-
-()
-
-()
-
-(2 'dqagp' 'adaptivegausskronrod' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 4 0 (5 6 7 8 9 10 11 12 13 14 15 16) () 0 () () () 0 0)
-3 'dqagpe' 'adaptivegausskronrod' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 17 0 (18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
-36 37 38) () 0 () () () 0 0)
-5 'f' '' '' 4 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-6 'a' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-7 'b' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-8 'npts' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-9 'points' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0 INTEGER ())
-0 8 ())) 0 () () () 0 0)
-10 'epsabs' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-11 'epsrel' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'limit' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-13 'result1' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-14 'abserr' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-15 'neval' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-16 'ier' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-18 'f' '' '' 17 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-19 'a' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-20 'b' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-21 'npts' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-22 'points' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0 INTEGER ())
-0 21 ())) 0 () () () 0 0)
-23 'epsabs' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-24 'epsrel' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-25 'limit' '' '' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-26 'result' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-27 'abserr' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-28 'neval' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-29 'ier' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-30 'alist' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0 INTEGER ())
-0 25 ())) 0 () () () 0 0)
-31 'blist' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0 INTEGER ())
-0 25 ())) 0 () () () 0 0)
-32 'rlist' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0 INTEGER ())
-0 25 ())) 0 () () () 0 0)
-33 'elist' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0 INTEGER ())
-0 25 ())) 0 () () () 0 0)
-34 'pts' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 0 INTEGER ()) 0
-PLUS (VARIABLE (INTEGER 4 0 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER
-4 0 0 0 INTEGER ()) 0 '2'))) 0 () () () 0 0)
-35 'iord' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0
-INTEGER ()) 0 25 ())) 0 () () () 0 0)
-36 'level' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 0
-INTEGER ()) 0 25 ())) 0 () () () 0 0)
-37 'ndin' '' '' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 0
-INTEGER ()) 0 PLUS (VARIABLE (INTEGER 4 0 0 0 INTEGER ()) 0 21 ()) (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '2'))) 0 () () () 0 0)
-38 'last' '' '' 17 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-)
-
-('dqagp' 0 2 'dqagpe' 0 3)
diff --git a/pywafo/src/wafo/source/mvnprd/erfcoremod.mod b/pywafo/src/wafo/source/mvnprd/erfcoremod.mod
deleted file mode 100644
index 5610e18..0000000
--- a/pywafo/src/wafo/source/mvnprd/erfcoremod.mod
+++ /dev/null
@@ -1,53 +0,0 @@
-GFORTRAN module version '10' created from mvnprodcorrprb.f
-MD5:d50eebbb2a58cec28466fffd901e30ce -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('calerf' 'erfcoremod' 2) ('derf' 'erfcoremod' 3) ('derfc' 'erfcoremod'
-4) ('derfcx' 'erfcoremod' 5))
-
-()
-
-()
-
-()
-
-(2 'calerf' 'erfcoremod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN 0 0 SUBROUTINE GENERIC IMPLICIT_PURE) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 6 0 (7 8 9) () 0 () () () 0 0)
-3 'derf' 'erfcoremod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 10 0 (11) () 12 ()
-() () 0 0)
-4 'derfc' 'erfcoremod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 13 0 (14) () 15 ()
-() () 0 0)
-5 'derfcx' 'erfcoremod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 16 0 (17) () 18 ()
-() () 0 0)
-19 'erfcoremod' 'erfcoremod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0
-0)
-7 'arg' '' '' 6 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-8 'result' '' '' 6 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'jint' '' '' 6 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-11 'x' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'value' '' '' 10 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-14 'x' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-15 'value' '' '' 13 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-17 'x' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-18 'value' '' '' 16 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('calerf' 0 2 'derf' 0 3 'derfc' 0 4 'derfcx' 0 5 'erfcoremod' 0 19)
diff --git a/pywafo/src/wafo/source/mvnprd/functioninterface.mod b/pywafo/src/wafo/source/mvnprd/functioninterface.mod
deleted file mode 100644
index 339f769..0000000
--- a/pywafo/src/wafo/source/mvnprd/functioninterface.mod
+++ /dev/null
@@ -1,29 +0,0 @@
-GFORTRAN module version '10' created from mvnprodcorrprb.f
-MD5:2635116f2ab857b1a31d22224a34abc8 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'f' 'functioninterface' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-BODY UNKNOWN 0 0 EXTERNAL FUNCTION) (REAL 8 0 0 0 REAL ()) 3 0 (4) () 5
-() () () 0 0)
-6 'functioninterface' 'functioninterface' '' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () ()
-0 () () () 0 0)
-4 'z' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-5 'val' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('f' 0 2 'functioninterface' 0 6)
diff --git a/pywafo/src/wafo/source/mvnprd/integration1dmodule.mod b/pywafo/src/wafo/source/mvnprd/integration1dmodule.mod
deleted file mode 100644
index f6e6c73..0000000
--- a/pywafo/src/wafo/source/mvnprd/integration1dmodule.mod
+++ /dev/null
@@ -1,252 +0,0 @@
-GFORTRAN module version '10' created from mvnprodcorrprb.f
-MD5:c465e58723b4af4dc6c95dff6bfd5851 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('adaptivesimpson' 'integration1dmodule' 2 3) ('adaptivetrapz'
-'integration1dmodule' 4 5) ('d1mach' 'integration1dmodule' 6) ('dea'
-'integration1dmodule' 7) ('romberg' 'integration1dmodule' 8 9))
-
-()
-
-()
-
-()
-
-(10 'adaptiveintwithbreaks' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE ALWAYS_EXPLICIT)
-(UNKNOWN 0 0 0 0 UNKNOWN ()) 11 0 (12 13 14 15 16 17 18 19 20) () 0 () ()
-() 0 0)
-21 'adaptivesimpson1' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 22 0 (23 24 25 26 27 28 29) () 0 () () () 0 0)
-3 'adaptivesimpson2' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 30 0 (31 32 33 34 35 36 37) () 0 () () () 0 0)
-38 'adaptivesimpson3' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 39 0 (40 41 42 43 44 45 46) () 0 () () () 0 0)
-2 'adaptivesimpsonwithbreaks' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE ALWAYS_EXPLICIT)
-(UNKNOWN 0 0 0 0 UNKNOWN ()) 47 0 (48 49 50 51 52 53 54 55 56) () 0 () ()
-() 0 0)
-5 'adaptivetrapz1' 'integration1dmodule' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 57
-0 (58 59 60 61 62 63 64) () 0 () () () 0 0)
-4 'adaptivetrapzwithbreaks' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE ALWAYS_EXPLICIT)
-(UNKNOWN 0 0 0 0 UNKNOWN ()) 65 0 (66 67 68 69 70 71 72 73 74) () 0 () ()
-() 0 0)
-6 'd1mach' 'integration1dmodule' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 75
-0 (76) () 6 () () () 0 0)
-7 'dea' 'integration1dmodule' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 77 0 (78 79 80 81 82 83 84) () 0 () () () 0 0)
-85 'dea3' 'integration1dmodule' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 86 0 (87 88 89 90 91) () 0 () () () 0 0)
-92 'integration1dmodule' 'integration1dmodule' '' 1 ((MODULE
-UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-9 'romberg1' 'integration1dmodule' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 93
-0 (94 95 96 97 98 99 100 101) () 0 () () () 0 0)
-8 'rombergwithbreaks' 'integration1dmodule' '' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE ALWAYS_EXPLICIT)
-(UNKNOWN 0 0 0 0 UNKNOWN ()) 102 0 (103 104 105 106 107 108 109 110 111)
-() 0 () () () 0 0)
-12 'f' '' '' 11 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-13 'a' '' '' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-14 'b' '' '' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-15 'n' '' '' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-16 'brks' '' '' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-17 'epsi' '' '' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-18 'iflg' '' '' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-19 'abserr' '' '' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-20 'val' '' '' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-23 'f' '' '' 22 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN 0
-0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 23 () () ()
-0 0)
-24 'a' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-25 'b' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-26 'epsi' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-27 'iflg' '' '' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-28 'abserr' '' '' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-29 'val' '' '' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-31 'f' '' '' 30 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN 0
-0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 31 () () ()
-0 0)
-32 'a' '' '' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-33 'b' '' '' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-34 'epsi' '' '' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-35 'iflg' '' '' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-36 'abserr' '' '' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-37 'val' '' '' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-40 'f' '' '' 39 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN 0
-0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 40 () () ()
-0 0)
-41 'a' '' '' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-42 'b' '' '' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-43 'epsi' '' '' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-44 'iflg' '' '' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-45 'abserr' '' '' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-46 'val' '' '' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-48 'f' '' '' 47 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-49 'a' '' '' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-50 'b' '' '' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-51 'n' '' '' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-52 'brks' '' '' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-53 'epsi' '' '' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-54 'iflg' '' '' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-55 'abserr' '' '' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-56 'val' '' '' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-58 'f' '' '' 57 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN 0
-0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 58 () () ()
-0 0)
-59 'a' '' '' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-60 'b' '' '' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-61 'epsi' '' '' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-62 'iflg' '' '' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-63 'abserr' '' '' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-64 'val' '' '' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-66 'f' '' '' 65 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-67 'a' '' '' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-68 'b' '' '' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-69 'n' '' '' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-70 'brks' '' '' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-71 'epsi' '' '' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-72 'iflg' '' '' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-73 'abserr' '' '' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-74 'val' '' '' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-76 'i' '' '' 75 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-78 'newflg' '' '' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (LOGICAL 4 0 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
-79 'svalue' '' '' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-80 'limexp' '' '' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-81 'result' '' '' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-82 'abserr' '' '' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-83 'epstab' '' '' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SIZE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-84 'ierr' '' '' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-87 'e0' '' '' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-88 'e1' '' '' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-89 'e2' '' '' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-90 'abserr' '' '' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-91 'result' '' '' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-94 'f' '' '' 93 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN 0
-0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 94 () () ()
-0 0)
-95 'a' '' '' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-96 'b' '' '' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-97 'decdigs' '' '' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-98 'abseps' '' '' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-99 'errflg' '' '' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-100 'abserr' '' '' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-101 'val' '' '' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-103 'f' '' '' 102 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 0 REAL ()) 0 0 () () 0
-() () () 0 0)
-104 'a' '' '' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-105 'b' '' '' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-106 'n' '' '' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-107 'brks' '' '' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-108 'epsi' '' '' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-109 'iflg' '' '' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-110 'abserr' '' '' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-111 'val' '' '' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('adaptiveintwithbreaks' 0 10 'adaptivesimpson1' 0 21 'adaptivesimpson2'
-0 3 'adaptivesimpson3' 0 38 'adaptivesimpsonwithbreaks' 0 2
-'adaptivetrapz1' 0 5 'adaptivetrapzwithbreaks' 0 4 'd1mach' 0 6 'dea' 0
-7 'dea3' 0 85 'integration1dmodule' 0 92 'romberg1' 0 9
-'rombergwithbreaks' 0 8)
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprdmod.pyd b/pywafo/src/wafo/source/mvnprd/mvnprdmod.pyd
deleted file mode 100644
index 84ed727..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/mvnprdmod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprodcorrprbmod.mod b/pywafo/src/wafo/source/mvnprd/mvnprodcorrprbmod.mod
deleted file mode 100644
index a9389a2..0000000
--- a/pywafo/src/wafo/source/mvnprd/mvnprodcorrprbmod.mod
+++ /dev/null
@@ -1,46 +0,0 @@
-GFORTRAN module version '10' created from mvnprodcorrprb.f
-MD5:8740350189059c565ea73e4e38d4d956 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('mvnprodcorrprb' 'mvnprodcorrprbmod' 2))
-
-()
-
-()
-
-()
-
-(2 'mvnprodcorrprb' 'mvnprodcorrprbmod' '' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (
-UNKNOWN 0 0 0 0 UNKNOWN ()) 3 0 (4 5 6 7 8 9 10 11 12 13) () 0 () () ()
-0 0)
-4 'rho' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-5 'a' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-6 'b' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-7 'abseps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-8 'releps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'usebreakpoints' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (LOGICAL 4 0 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
-10 'usesimpson' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (LOGICAL 4 0 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
-11 'abserr' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'errflg' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-13 'prb' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('mvnprodcorrprb' 0 2)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/DF60.PDB b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/DF60.PDB
deleted file mode 100644
index 37b3931..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/DF60.PDB and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/adaptivegausskronrod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/adaptivegausskronrod.mod
deleted file mode 100644
index 30fb457..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/adaptivegausskronrod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/erfcoremod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/erfcoremod.mod
deleted file mode 100644
index 3e3c364..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/erfcoremod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/functioninterface.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/functioninterface.mod
deleted file mode 100644
index fb09733..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/functioninterface.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/integration1dmodule.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/integration1dmodule.mod
deleted file mode 100644
index b6494bb..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/integration1dmodule.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprb.obj b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprb.obj
deleted file mode 100644
index 270a6ae..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprb.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprbmod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprbmod.mod
deleted file mode 100644
index 7d95c20..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/mvnprodcorrprbmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.exe b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.exe
deleted file mode 100644
index 7fbaad6..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.ilk b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.ilk
deleted file mode 100644
index e52ed2a..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.ilk and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.obj b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.obj
deleted file mode 100644
index 24b800c..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.pdb b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.pdb
deleted file mode 100644
index 70cf0a4..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/Debug/test_mvnprodcorrprb.pdb and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/adaptivegausskronrod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/adaptivegausskronrod.mod
deleted file mode 100644
index 7d21c23..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/adaptivegausskronrod.mod
+++ /dev/null
@@ -1,112 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Thu Dec 04 12:55:42 2008
-MD5:6d500af6c301beba9c314ac587f06931 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('dqagpe' 'adaptivegausskronrod' 2) ('dqagp' 'adaptivegausskronrod' 3))
-
-()
-
-()
-
-(3 'dqagp' 'adaptivegausskronrod' 'dqagp' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-4 0 (5 6 7 8 9 10 11 12 13 14 15 16) () 0 () () 0 0)
-2 'dqagpe' 'adaptivegausskronrod' 'dqagpe' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-17 0 (18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38) ()
-0 () () 0 0)
-10 'epsabs' '' 'epsabs' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-11 'epsrel' '' 'epsrel' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'limit' '' 'limit' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-13 'result1' '' 'result1' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'abserr' '' 'abserr' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'neval' '' 'neval' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-16 'ier' '' 'ier' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-33 'elist' '' 'elist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-34 'pts' '' 'pts' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 INTEGER ()) 0 PLUS (
-VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '2'))) 0 () () 0 0)
-35 'iord' '' 'iord' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0
-INTEGER ()) 0 25 ())) 0 () () 0 0)
-36 'level' '' 'level' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0
-INTEGER ()) 0 25 ())) 0 () () 0 0)
-37 'ndin' '' 'ndin' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 INTEGER ())
-0 PLUS (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER
-4 0 0 INTEGER ()) 0 '2'))) 0 () () 0 0)
-38 'last' '' 'last' 17 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-7 'b' '' 'b' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-8 'npts' '' 'npts' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-9 'points' '' 'points' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-8 ())) 0 () () 0 0)
-5 'f' '' 'f' 4 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-6 'a' '' 'a' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-18 'f' '' 'f' 17 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-19 'a' '' 'a' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-20 'b' '' 'b' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-21 'npts' '' 'npts' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-22 'points' '' 'points' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-21 ())) 0 () () 0 0)
-23 'epsabs' '' 'epsabs' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-24 'epsrel' '' 'epsrel' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-25 'limit' '' 'limit' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-26 'result' '' 'result' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-27 'abserr' '' 'abserr' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-28 'neval' '' 'neval' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-29 'ier' '' 'ier' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-30 'alist' '' 'alist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-31 'blist' '' 'blist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-32 'rlist' '' 'rlist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-)
-
-('dqagp' 0 3 'dqagpe' 0 2)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/erfcoremod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/erfcoremod.mod
deleted file mode 100644
index 62b1a08..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/erfcoremod.mod
+++ /dev/null
@@ -1,51 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Thu Dec 04 11:05:50 2008
-MD5:3ad89711ff6ea0f8c745365231e1a1ea -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('derf' 'erfcoremod' 2) ('calerf' 'erfcoremod' 3) ('derfcx' 'erfcoremod'
-4) ('derfc' 'erfcoremod' 5))
-
-()
-
-()
-
-(3 'calerf' 'erfcoremod' 'calerf' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-6 0 (7 8 9) () 0 () () 0 0)
-2 'derf' 'erfcoremod' 'derf' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 10 0 (11) () 12 () ()
-0 0)
-5 'derfc' 'erfcoremod' 'derfc' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 13 0 (14) () 15 () ()
-0 0)
-4 'derfcx' 'erfcoremod' 'derfcx' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 16 0 (
-17) () 18 () () 0 0)
-19 'erfcoremod' 'erfcoremod' 'erfcoremod' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 ()
-() 0 0)
-11 'x' '' 'x' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'value' '' 'value' 10 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'x' '' 'x' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'value' '' 'value' 13 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-17 'x' '' 'x' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-18 'value' '' 'value' 16 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-7 'arg' '' 'arg' 6 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-8 'result' '' 'result' 6 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-9 'jint' '' 'jint' 6 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-)
-
-('calerf' 0 3 'derf' 0 2 'derfc' 0 5 'derfcx' 0 4 'erfcoremod' 0 19)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/functioninterface.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/functioninterface.mod
deleted file mode 100644
index f5c7ab8..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/functioninterface.mod
+++ /dev/null
@@ -1,27 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Wed Dec 03 15:55:57 2008
-MD5:2bffd45d12c9c1718b19499dd55e4953 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'f' 'functioninterface' 'f' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-BODY UNKNOWN EXTERNAL FUNCTION) (REAL 8 0 0 REAL ()) 3 0 (4) () 5 () ()
-0 0)
-6 'functioninterface' 'functioninterface' 'functioninterface' 1 ((
-MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () 0 0)
-4 'z' '' 'z' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-5 'val' '' 'val' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('f' 0 2 'functioninterface' 0 6)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/integration1dmodule.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/integration1dmodule.mod
deleted file mode 100644
index 698f6a9..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/integration1dmodule.mod
+++ /dev/null
@@ -1,241 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Thu Dec 04 12:55:42 2008
-MD5:2001ac092337caac013ba2fcb5e647f3 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () ()
-() () () () () () () () () () () () () () ())
-
-()
-
-(('adaptivesimpson' 'integration1dmodule' 2 3) ('d1mach'
-'integration1dmodule' 4) ('adaptivetrapz' 'integration1dmodule' 5 6) (
-'romberg' 'integration1dmodule' 7 8) ('dea' 'integration1dmodule' 9))
-
-()
-
-()
-
-(10 'adaptiveintwithbreaks' 'integration1dmodule' 'adaptiveintwithbreaks'
-1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 11 0 (12 13 14 15 16 17 18
-19 20) () 0 () () 0 0)
-21 'adaptivesimpson1' 'integration1dmodule' 'adaptivesimpson1' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 22 0 (23 24 25 26 27 28 29) () 0 () () 0 0)
-3 'adaptivesimpson2' 'integration1dmodule' 'adaptivesimpson2' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 30 0 (31 32 33 34 35 36 37) () 0 () () 0 0)
-38 'adaptivesimpson3' 'integration1dmodule' 'adaptivesimpson3' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 39 0 (40 41 42 43 44 45 46) () 0 () () 0 0)
-2 'adaptivesimpsonwithbreaks' 'integration1dmodule'
-'adaptivesimpsonwithbreaks' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 47 0
-(48 49 50 51 52 53 54 55 56) () 0 () () 0 0)
-6 'adaptivetrapz1' 'integration1dmodule' 'adaptivetrapz1' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 57 0 (58 59 60 61 62 63 64) () 0 () () 0 0)
-5 'adaptivetrapzwithbreaks' 'integration1dmodule'
-'adaptivetrapzwithbreaks' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 65 0 (66
-67 68 69 70 71 72 73 74) () 0 () () 0 0)
-4 'd1mach' 'integration1dmodule' 'd1mach' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 75 0 (
-76) () 4 () () 0 0)
-9 'dea' 'integration1dmodule' 'dea' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-77 0 (78 79 80 81 82 83 84) () 0 () () 0 0)
-85 'dea3' 'integration1dmodule' 'dea3' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 86 0 (
-87 88 89 90 91) () 0 () () 0 0)
-92 'integration1dmodule' 'integration1dmodule' 'integration1dmodule' 1 (
-(MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () 0 0)
-8 'romberg1' 'integration1dmodule' 'romberg1' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 93 0 (94 95 96 97 98 99 100 101) () 0 () () 0 0)
-7 'rombergwithbreaks' 'integration1dmodule' 'rombergwithbreaks' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 102 0 (103 104 105 106 107
-108 109 110 111) () 0 () () 0 0)
-78 'newflg' '' 'newflg' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () 0 0)
-79 'svalue' '' 'svalue' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-80 'limexp' '' 'limexp' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-81 'result' '' 'result' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-82 'abserr' '' 'abserr' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-87 'e0' '' 'e0' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-88 'e1' '' 'e1' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-83 'epstab' '' 'epstab' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SIZE (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-84 'ierr' '' 'ierr' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-89 'e2' '' 'e2' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-90 'abserr' '' 'abserr' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-91 'result' '' 'result' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-17 'epsi' '' 'epsi' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-18 'iflg' '' 'iflg' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-19 'abserr' '' 'abserr' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-20 'val' '' 'val' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-48 'f' '' 'f' 47 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-49 'a' '' 'a' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-50 'b' '' 'b' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-51 'n' '' 'n' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-31 'f' '' 'f' 30 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 31 () () 0 0)
-32 'a' '' 'a' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-33 'b' '' 'b' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-34 'epsi' '' 'epsi' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-13 'a' '' 'a' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'b' '' 'b' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'n' '' 'n' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-16 'brks' '' 'brks' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-58 'f' '' 'f' 57 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 58 () () 0 0)
-59 'a' '' 'a' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-60 'b' '' 'b' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-35 'iflg' '' 'iflg' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-36 'abserr' '' 'abserr' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-37 'val' '' 'val' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-40 'f' '' 'f' 39 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 40 () () 0 0)
-52 'brks' '' 'brks' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-53 'epsi' '' 'epsi' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-54 'iflg' '' 'iflg' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-55 'abserr' '' 'abserr' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-56 'val' '' 'val' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-23 'f' '' 'f' 22 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 23 () () 0 0)
-41 'a' '' 'a' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-42 'b' '' 'b' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-43 'epsi' '' 'epsi' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-44 'iflg' '' 'iflg' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-24 'a' '' 'a' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-25 'b' '' 'b' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-26 'epsi' '' 'epsi' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-27 'iflg' '' 'iflg' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-28 'abserr' '' 'abserr' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-29 'val' '' 'val' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-66 'f' '' 'f' 65 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-76 'i' '' 'i' 75 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-12 'f' '' 'f' 11 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-45 'abserr' '' 'abserr' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-46 'val' '' 'val' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-72 'iflg' '' 'iflg' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-73 'abserr' '' 'abserr' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-74 'val' '' 'val' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-71 'epsi' '' 'epsi' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-67 'a' '' 'a' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-68 'b' '' 'b' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-69 'n' '' 'n' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-70 'brks' '' 'brks' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-61 'epsi' '' 'epsi' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-62 'iflg' '' 'iflg' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-63 'abserr' '' 'abserr' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-64 'val' '' 'val' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-103 'f' '' 'f' 102 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-104 'a' '' 'a' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-105 'b' '' 'b' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-106 'n' '' 'n' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-107 'brks' '' 'brks' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-108 'epsi' '' 'epsi' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-109 'iflg' '' 'iflg' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-110 'abserr' '' 'abserr' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-111 'val' '' 'val' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-94 'f' '' 'f' 93 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 94 () () 0 0)
-95 'a' '' 'a' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-96 'b' '' 'b' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-97 'decdigs' '' 'decdigs' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-98 'abseps' '' 'abseps' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-99 'errflg' '' 'errflg' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-100 'abserr' '' 'abserr' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-101 'val' '' 'val' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('adaptiveintwithbreaks' 0 10 'adaptivesimpson1' 0 21 'adaptivesimpson2'
-0 3 'adaptivesimpson3' 0 38 'adaptivesimpsonwithbreaks' 0 2
-'adaptivetrapz1' 0 6 'adaptivetrapzwithbreaks' 0 5 'd1mach' 0 4 'dea' 0
-9 'dea3' 0 85 'integration1dmodule' 0 92 'romberg1' 0 8
-'rombergwithbreaks' 0 7)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprdmod.pyd b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprdmod.pyd
deleted file mode 100644
index 3b8605b..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprdmod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprbmod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprbmod.mod
deleted file mode 100644
index 6f23eb4..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprbmod.mod
+++ /dev/null
@@ -1,44 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Thu Dec 04 12:55:42 2008
-MD5:52cce08f767867c5bd7250c82948c098 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () ()
-() () () () () () () () () () () () () () () () ())
-
-()
-
-(('mvnprodcorrprb' 'mvnprodcorrprbmod' 2))
-
-()
-
-()
-
-(2 'mvnprodcorrprb' 'mvnprodcorrprbmod' 'mvnprodcorrprb' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 3 0 (4 5 6 7 8 9 10 11 12 13)
-() 0 () () 0 0)
-4 'rho' '' 'rho' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-9 'usebreakpoints' '' 'usebreakpoints' 3 ((VARIABLE IN UNKNOWN-PROC
-UNKNOWN UNKNOWN DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () 0 0)
-10 'usesimpson' '' 'usesimpson' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () 0 0)
-11 'abserr' '' 'abserr' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'errflg' '' 'errflg' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-13 'prb' '' 'prb' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-5 'a' '' 'a' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-6 'b' '' 'b' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DIMENSION
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT (INTEGER 4
-0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-7 'abseps' '' 'abseps' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-8 'releps' '' 'releps' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('mvnprodcorrprb' 0 2)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.mod
deleted file mode 100644
index 00fa45b..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.mod
+++ /dev/null
@@ -1,112 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Tue Dec 02 13:32:39 2008
-MD5:5f0b454993ede1db4c4b6b9e47df36c4 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('dqagpe' 'adaptivegausskronrod' 2) ('dqagp' 'adaptivegausskronrod' 3))
-
-()
-
-()
-
-(3 'dqagp' 'adaptivegausskronrod' 'dqagp' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-4 0 (5 6 7 8 9 10 11 12 13 14 15 16) () 0 () () 0 0)
-2 'dqagpe' 'adaptivegausskronrod' 'dqagpe' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-17 0 (18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38) ()
-0 () () 0 0)
-10 'epsabs' '' 'epsabs' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-11 'epsrel' '' 'epsrel' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'limit' '' 'limit' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-13 'result1' '' 'result1' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'abserr' '' 'abserr' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'neval' '' 'neval' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-16 'ier' '' 'ier' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-9 'points' '' 'points' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-8 ())) 0 () () 0 0)
-5 'f' '' 'f' 4 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-6 'a' '' 'a' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-7 'b' '' 'b' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-8 'npts' '' 'npts' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-18 'f' '' 'f' 17 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-19 'a' '' 'a' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-20 'b' '' 'b' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-21 'npts' '' 'npts' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-22 'points' '' 'points' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-21 ())) 0 () () 0 0)
-23 'epsabs' '' 'epsabs' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-24 'epsrel' '' 'epsrel' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-25 'limit' '' 'limit' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-26 'result' '' 'result' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-27 'abserr' '' 'abserr' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-28 'neval' '' 'neval' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-29 'ier' '' 'ier' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-30 'alist' '' 'alist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-31 'blist' '' 'blist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-32 'rlist' '' 'rlist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-33 'elist' '' 'elist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-34 'pts' '' 'pts' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 INTEGER ()) 0 PLUS (
-VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '2'))) 0 () () 0 0)
-35 'iord' '' 'iord' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0
-INTEGER ()) 0 25 ())) 0 () () 0 0)
-36 'level' '' 'level' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0
-INTEGER ()) 0 25 ())) 0 () () 0 0)
-37 'ndin' '' 'ndin' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 INTEGER ())
-0 PLUS (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER
-4 0 0 INTEGER ()) 0 '2'))) 0 () () 0 0)
-38 'last' '' 'last' 17 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-)
-
-('dqagp' 0 3 'dqagpe' 0 2)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyfo b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyfo
deleted file mode 100644
index 31ea5ed..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyfo
+++ /dev/null
@@ -1,149 +0,0 @@
-! -*- f90 -*-
-! Note: the context of this file is case sensitive.
-
-python module dqk21__user__routines
- interface dqk21_user_interface
- function f(centr) result (fc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod:dqk21:unknown_interface
- double precision :: centr
- double precision :: fc
- end function f
- end interface dqk21_user_interface
-end python module dqk21__user__routines
-python module dqk15__user__routines
- interface dqk15_user_interface
- function f(centr) result (fc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod:dqk15:unknown_interface
- double precision :: centr
- double precision :: fc
- end function f
- end interface dqk15_user_interface
-end python module dqk15__user__routines
-python module dqk9__user__routines
- interface dqk9_user_interface
- function f(centr) result (fc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod:dqk9:unknown_interface
- double precision :: centr
- double precision :: fc
- end function f
- end interface dqk9_user_interface
-end python module dqk9__user__routines
-python module dqkl9__user__routines
- interface dqkl9_user_interface
- function f(centr) result (fc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod:dqkl9:unknown_interface
- double precision :: centr
- double precision :: fc
- end function f
- end interface dqkl9_user_interface
-end python module dqkl9__user__routines
-python module adaptivegausskronrod ! in
- interface ! in :adaptivegausskronrod
- module adaptivegausskronrod ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90
- subroutine dea3(e0,e1,e2,abserr,result) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- double precision intent(in) :: e0
- double precision intent(in) :: e1
- double precision intent(in) :: e2
- double precision intent(out) :: abserr
- double precision intent(out) :: result
- end subroutine dea3
- subroutine dqagp(f,a,b,npts,points,epsabs,epsrel,limit,result1,abserr,neval,ier) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- external f
- double precision intent(in) :: a
- double precision intent(in) :: b
- integer optional,intent(in),check(len(points)>=npts),depend(points) :: npts=len(points)
- double precision dimension(npts),intent(in) :: points
- double precision intent(in) :: epsabs
- double precision intent(in) :: epsrel
- integer intent(in) :: limit
- double precision intent(out) :: result1
- double precision intent(out) :: abserr
- integer intent(out) :: neval
- integer intent(out) :: ier
- end subroutine dqagp
- subroutine dqagpe(f,a,b,npts,points,epsabs,epsrel,limit,result,abserr,neval,ier,alist,blist,rlist,elist,pts,iord,level,ndin,last) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- external f
- double precision intent(in) :: a
- double precision intent(in) :: b
- integer optional,intent(in),check(len(points)>=npts),depend(points) :: npts=len(points)
- double precision dimension(npts),intent(in) :: points
- double precision intent(in) :: epsabs
- double precision intent(in) :: epsrel
- integer intent(in) :: limit
- double precision intent(out) :: result
- double precision intent(out) :: abserr
- integer intent(out) :: neval
- integer intent(out) :: ier
- double precision dimension(limit),intent(out),depend(limit) :: alist
- double precision dimension(limit),intent(out),depend(limit) :: blist
- double precision dimension(limit),intent(out),depend(limit) :: rlist
- double precision dimension(limit),intent(out),depend(limit) :: elist
- double precision dimension(npts + 2),intent(out),depend(npts) :: pts
- integer dimension(limit),intent(out),depend(limit) :: iord
- integer dimension(limit),intent(out),depend(limit) :: level
- integer dimension(npts + 2),intent(out),depend(npts) :: ndin
- integer :: last
- end subroutine dqagpe
- subroutine dqk21(f,a,b,result,abserr,resabs,resasc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- use dqk21__user__routines
- external f
- double precision :: a
- double precision :: b
- double precision :: result
- double precision :: abserr
- double precision :: resabs
- double precision :: resasc
- end subroutine dqk21
- subroutine dqk15(f,a,b,result,abserr,resabs,resasc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- use dqk15__user__routines
- external f
- double precision :: a
- double precision :: b
- double precision :: result
- double precision :: abserr
- double precision :: resabs
- double precision :: resasc
- end subroutine dqk15
- subroutine dqk9(f,a,b,result,abserr,resabs,resasc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- use dqk9__user__routines
- external f
- double precision :: a
- double precision :: b
- double precision :: result
- double precision :: abserr
- double precision :: resabs
- double precision :: resasc
- end subroutine dqk9
- subroutine dqkl9(f,a,b,result,abserr,resabs,resasc) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- use dqkl9__user__routines
- external f
- double precision :: a
- double precision :: b
- double precision :: result
- double precision :: abserr
- double precision :: resabs
- double precision :: resasc
- end subroutine dqkl9
- subroutine dqpsrt(limit,last,maxerr,ermax,elist,iord,nrmax) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- integer :: limit
- integer optional,check(len(elist)>=last),depend(elist) :: last=len(elist)
- integer :: maxerr
- double precision :: ermax
- double precision dimension(last) :: elist
- integer dimension(last),depend(last) :: iord
- integer :: nrmax
- end subroutine dqpsrt
- subroutine dqelg(n,epstab,result,abserr,res3la,nres) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- integer :: n
- double precision dimension(52) :: epstab
- double precision :: result
- double precision :: abserr
- double precision dimension(3) :: res3la
- integer :: nres
- end subroutine dqelg
- function d1mach(i) ! in :adaptivegausskronrod:AdaptiveGuassKronrod.f90:adaptivegausskronrod
- integer intent(in) :: i
- double precision :: d1mach
- end function d1mach
- end module adaptivegausskronrod
- end interface
-end python module adaptivegausskronrod
-
-! This file was auto-generated with f2py (version:2_5972).
-! See http://cens.ioc.ee/projects/f2py2e/
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.pyd b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.pyd
deleted file mode 100644
index 4d78a99..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcoremod.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcoremod.mod
deleted file mode 100644
index a1d91e7..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcoremod.mod
+++ /dev/null
@@ -1,51 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Fri Nov 28 22:53:18 2008
-MD5:3ad89711ff6ea0f8c745365231e1a1ea -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('derf' 'erfcoremod' 2) ('calerf' 'erfcoremod' 3) ('derfcx' 'erfcoremod'
-4) ('derfc' 'erfcoremod' 5))
-
-()
-
-()
-
-(3 'calerf' 'erfcoremod' 'calerf' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-6 0 (7 8 9) () 0 () () 0 0)
-2 'derf' 'erfcoremod' 'derf' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 10 0 (11) () 12 () ()
-0 0)
-5 'derfc' 'erfcoremod' 'derfc' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 13 0 (14) () 15 () ()
-0 0)
-4 'derfcx' 'erfcoremod' 'derfcx' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 16 0 (
-17) () 18 () () 0 0)
-19 'erfcoremod' 'erfcoremod' 'erfcoremod' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 ()
-() 0 0)
-11 'x' '' 'x' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'value' '' 'value' 10 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'x' '' 'x' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'value' '' 'value' 13 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-17 'x' '' 'x' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-18 'value' '' 'value' 16 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-7 'arg' '' 'arg' 6 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-8 'result' '' 'result' 6 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-9 'jint' '' 'jint' 6 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-)
-
-('calerf' 0 3 'derf' 0 2 'derfc' 0 5 'derfcx' 0 4 'erfcoremod' 0 19)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/functioninterface.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/functioninterface.mod
deleted file mode 100644
index bd8697e..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/functioninterface.mod
+++ /dev/null
@@ -1,27 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Fri Nov 28 22:53:18 2008
-MD5:2bffd45d12c9c1718b19499dd55e4953 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'f' 'functioninterface' 'f' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-BODY UNKNOWN EXTERNAL FUNCTION) (REAL 8 0 0 REAL ()) 3 0 (4) () 5 () ()
-0 0)
-6 'functioninterface' 'functioninterface' 'functioninterface' 1 ((
-MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () 0 0)
-4 'z' '' 'z' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-5 'val' '' 'val' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('f' 0 2 'functioninterface' 0 6)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1dmodule.mod b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1dmodule.mod
deleted file mode 100644
index 9308240..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1dmodule.mod
+++ /dev/null
@@ -1,241 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Tue Dec 02 13:32:40 2008
-MD5:ec74f2365292905dedfb7525a3d64c0f -- If you edit this, you'll get what you deserve.
-
-(() () () ()
-() () () () () () () () () () () () () () () () () () () () () () ())
-
-()
-
-(('adaptivesimpson' 'integration1dmodule' 2 3) ('adaptivetrapz'
-'integration1dmodule' 4 5) ('d1mach' 'integration1dmodule' 6) ('dea'
-'integration1dmodule' 7) ('romberg' 'integration1dmodule' 8 9))
-
-()
-
-()
-
-(10 'adaptiveintwithbreaks' 'integration1dmodule' 'adaptiveintwithbreaks'
-1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 11 0 (12 13 14 15 16 17 18
-19 20) () 0 () () 0 0)
-21 'adaptivesimpson1' 'integration1dmodule' 'adaptivesimpson1' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 22 0 (23 24 25 26 27 28 29) () 0 () () 0 0)
-3 'adaptivesimpson2' 'integration1dmodule' 'adaptivesimpson2' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 30 0 (31 32 33 34 35 36 37) () 0 () () 0 0)
-38 'adaptivesimpson3' 'integration1dmodule' 'adaptivesimpson3' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 39 0 (40 41 42 43 44 45 46) () 0 () () 0 0)
-2 'adaptivesimpsonwithbreaks' 'integration1dmodule'
-'adaptivesimpsonwithbreaks' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 47 0
-(48 49 50 51 52 53 54 55 56) () 0 () () 0 0)
-5 'adaptivetrapz1' 'integration1dmodule' 'adaptivetrapz1' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 57 0 (58 59 60 61 62 63 64) () 0 () () 0 0)
-4 'adaptivetrapzwithbreaks' 'integration1dmodule'
-'adaptivetrapzwithbreaks' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 65 0 (66
-67 68 69 70 71 72 73 74) () 0 () () 0 0)
-6 'd1mach' 'integration1dmodule' 'd1mach' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 75 0 (
-76) () 6 () () 0 0)
-7 'dea' 'integration1dmodule' 'dea' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-77 0 (78 79 80 81 82 83 84) () 0 () () 0 0)
-85 'dea3' 'integration1dmodule' 'dea3' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 86 0 (
-87 88 89 90 91) () 0 () () 0 0)
-92 'integration1dmodule' 'integration1dmodule' 'integration1dmodule' 1 (
-(MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () 0 0)
-9 'romberg1' 'integration1dmodule' 'romberg1' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 93 0 (94 95 96 97 98 99 100 101) () 0 () () 0 0)
-8 'rombergwithbreaks' 'integration1dmodule' 'rombergwithbreaks' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 102 0 (103 104 105 106 107
-108 109 110 111) () 0 () () 0 0)
-89 'e2' '' 'e2' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-90 'abserr' '' 'abserr' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-91 'result' '' 'result' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'f' '' 'f' 11 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-40 'f' '' 'f' 39 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 40 () () 0 0)
-87 'e0' '' 'e0' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-88 'e1' '' 'e1' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-76 'i' '' 'i' 75 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-13 'a' '' 'a' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-35 'iflg' '' 'iflg' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-36 'abserr' '' 'abserr' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-37 'val' '' 'val' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-17 'epsi' '' 'epsi' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-48 'f' '' 'f' 47 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-41 'a' '' 'a' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-42 'b' '' 'b' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-43 'epsi' '' 'epsi' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-44 'iflg' '' 'iflg' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-45 'abserr' '' 'abserr' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-46 'val' '' 'val' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-66 'f' '' 'f' 65 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-67 'a' '' 'a' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-68 'b' '' 'b' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-69 'n' '' 'n' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-70 'brks' '' 'brks' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-18 'iflg' '' 'iflg' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-19 'abserr' '' 'abserr' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-20 'val' '' 'val' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-78 'newflg' '' 'newflg' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () 0 0)
-79 'svalue' '' 'svalue' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-80 'limexp' '' 'limexp' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-81 'result' '' 'result' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-82 'abserr' '' 'abserr' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-71 'epsi' '' 'epsi' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-49 'a' '' 'a' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-50 'b' '' 'b' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-51 'n' '' 'n' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-52 'brks' '' 'brks' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-53 'epsi' '' 'epsi' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-54 'iflg' '' 'iflg' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-55 'abserr' '' 'abserr' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-56 'val' '' 'val' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-23 'f' '' 'f' 22 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 23 () () 0 0)
-31 'f' '' 'f' 30 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 31 () () 0 0)
-32 'a' '' 'a' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-33 'b' '' 'b' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-34 'epsi' '' 'epsi' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-83 'epstab' '' 'epstab' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SIZE (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-84 'ierr' '' 'ierr' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-24 'a' '' 'a' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-25 'b' '' 'b' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-26 'epsi' '' 'epsi' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-27 'iflg' '' 'iflg' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-28 'abserr' '' 'abserr' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-29 'val' '' 'val' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'b' '' 'b' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'n' '' 'n' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-16 'brks' '' 'brks' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-72 'iflg' '' 'iflg' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-73 'abserr' '' 'abserr' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-74 'val' '' 'val' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-58 'f' '' 'f' 57 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 58 () () 0 0)
-59 'a' '' 'a' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-60 'b' '' 'b' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-61 'epsi' '' 'epsi' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-62 'iflg' '' 'iflg' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-63 'abserr' '' 'abserr' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-64 'val' '' 'val' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-103 'f' '' 'f' 102 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-104 'a' '' 'a' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-105 'b' '' 'b' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-106 'n' '' 'n' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-107 'brks' '' 'brks' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-108 'epsi' '' 'epsi' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-109 'iflg' '' 'iflg' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-110 'abserr' '' 'abserr' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-111 'val' '' 'val' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-94 'f' '' 'f' 93 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 94 () () 0 0)
-95 'a' '' 'a' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-96 'b' '' 'b' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-97 'decdigs' '' 'decdigs' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-98 'abseps' '' 'abseps' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-99 'errflg' '' 'errflg' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-100 'abserr' '' 'abserr' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-101 'val' '' 'val' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('adaptiveintwithbreaks' 0 10 'adaptivesimpson1' 0 21 'adaptivesimpson2'
-0 3 'adaptivesimpson3' 0 38 'adaptivesimpsonwithbreaks' 0 2
-'adaptivetrapz1' 0 5 'adaptivetrapzwithbreaks' 0 4 'd1mach' 0 6 'dea' 0
-7 'dea3' 0 85 'integration1dmodule' 0 92 'romberg1' 0 9
-'rombergwithbreaks' 0 8)
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvn.exe b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvn.exe
deleted file mode 100644
index 718ffc0..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvn.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.opt b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.opt
deleted file mode 100644
index 015d2b2..0000000
Binary files a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.opt and /dev/null differ
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.plg b/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.plg
deleted file mode 100644
index 8ea30dd..0000000
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.plg
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-Build Log
-
---------------------Configuration: test_mvnprodcorrprb - Win32 Debug--------------------
-
-Command Lines
-Creating temporary file "C:\DOCUME~1\pab.NTU\LOCALS~1\Temp\RSP265.tmp" with contents
-[
-/check:bounds /compile_only /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt /module:"Debug/" /object:"Debug/" /pdbfile:"Debug/DF60.PDB"
-"C:\pab\workspace\PYWAFO\src\wafo\src\mvnprodcorrprb\test_mvnprodcorrprb.f"
-]
-Creating command line "link.exe kernel32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/test_mvnprodcorrprb.pdb" /debug /machine:I386 /out:"Debug/test_mvnprodcorrprb.exe" /pdbtype:sept .\Debug\mvnprodcorrprb.obj .\Debug\test_mvnprodcorrprb.obj "
-Output Window
-Compiling Fortran...
-C:\pab\workspace\PYWAFO\src\wafo\src\mvnprodcorrprb\test_mvnprodcorrprb.f
-Linking...
-
-
-
-Results
-test_mvnprodcorrprb.exe - 0 error(s), 0 warning(s)
-
-
-
diff --git a/pywafo/src/wafo/source/old/adaptivegausskronrod.mod b/pywafo/src/wafo/source/old/adaptivegausskronrod.mod
deleted file mode 100644
index 211b8c8..0000000
--- a/pywafo/src/wafo/source/old/adaptivegausskronrod.mod
+++ /dev/null
@@ -1,112 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Mon Nov 10 15:32:07 2008
-MD5:3741e25b152f50d5036e26826a6dde6c -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('dqagpe' 'adaptivegausskronrod' 2) ('dqagp' 'adaptivegausskronrod' 3))
-
-()
-
-()
-
-(3 'dqagp' 'adaptivegausskronrod' 'dqagp' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-4 0 (5 6 7 8 9 10 11 12 13 14 15 16) () 0 () () 0 0)
-2 'dqagpe' 'adaptivegausskronrod' 'dqagpe' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-17 0 (18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38) ()
-0 () () 0 0)
-18 'f' '' 'f' 17 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-19 'a' '' 'a' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-20 'b' '' 'b' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-21 'npts' '' 'npts' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-22 'points' '' 'points' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-21 ())) 0 () () 0 0)
-23 'epsabs' '' 'epsabs' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-37 'ndin' '' 'ndin' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 INTEGER ())
-0 PLUS (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER
-4 0 0 INTEGER ()) 0 '2'))) 0 () () 0 0)
-38 'last' '' 'last' 17 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-5 'f' '' 'f' 4 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-6 'a' '' 'a' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-7 'b' '' 'b' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-8 'npts' '' 'npts' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-9 'points' '' 'points' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-8 ())) 0 () () 0 0)
-10 'epsabs' '' 'epsabs' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-11 'epsrel' '' 'epsrel' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-12 'limit' '' 'limit' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-13 'result1' '' 'result1' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'abserr' '' 'abserr' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'neval' '' 'neval' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-16 'ier' '' 'ier' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-24 'epsrel' '' 'epsrel' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-25 'limit' '' 'limit' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-26 'result' '' 'result' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-27 'abserr' '' 'abserr' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-28 'neval' '' 'neval' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-29 'ier' '' 'ier' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-30 'alist' '' 'alist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-31 'blist' '' 'blist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-32 'rlist' '' 'rlist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-33 'elist' '' 'elist' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0 INTEGER ()) 0
-25 ())) 0 () () 0 0)
-34 'pts' '' 'pts' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 EXPLICIT (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') (OP (INTEGER 4 0 0 INTEGER ()) 0 PLUS (
-VARIABLE (INTEGER 4 0 0 INTEGER ()) 0 21 ()) (CONSTANT (INTEGER 4 0 0
-INTEGER ()) 0 '2'))) 0 () () 0 0)
-35 'iord' '' 'iord' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0
-INTEGER ()) 0 25 ())) 0 () () 0 0)
-36 'level' '' 'level' 17 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () (1 EXPLICIT (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') (VARIABLE (INTEGER 4 0 0
-INTEGER ()) 0 25 ())) 0 () () 0 0)
-)
-
-('dqagp' 0 3 'dqagpe' 0 2)
diff --git a/pywafo/src/wafo/source/old/erfcore.pyd b/pywafo/src/wafo/source/old/erfcore.pyd
deleted file mode 100644
index 9b10fb5..0000000
Binary files a/pywafo/src/wafo/source/old/erfcore.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/old/erfcore.pydold b/pywafo/src/wafo/source/old/erfcore.pydold
deleted file mode 100644
index c946776..0000000
Binary files a/pywafo/src/wafo/source/old/erfcore.pydold and /dev/null differ
diff --git a/pywafo/src/wafo/source/old/erfcoremod.mod b/pywafo/src/wafo/source/old/erfcoremod.mod
deleted file mode 100644
index db2e558..0000000
--- a/pywafo/src/wafo/source/old/erfcoremod.mod
+++ /dev/null
@@ -1,48 +0,0 @@
-GFORTRAN module created from erfcoremod.f on Tue Nov 11 11:30:34 2008
-MD5:00cbd9feeb2c79d7d491982c1dc7f04f -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'calerf' 'erfcoremod' 'calerf' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 3 0 (4 5
-6) () 0 () () 0 0)
-7 'derf' 'erfcoremod' 'derf' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION) (REAL 8 0 0 REAL ()) 8 0 (9) () 10 () () 0 0)
-11 'derfc' 'erfcoremod' 'derfc' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN FUNCTION) (REAL 8 0 0 REAL ()) 12 0 (13) () 14 () () 0 0)
-15 'derfcx' 'erfcoremod' 'derfcx' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION) (REAL 8 0 0 REAL ()) 16 0 (17) () 18
-() () 0 0)
-19 'erfcoremod' 'erfcoremod' 'erfcoremod' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 ()
-() 0 0)
-9 'x' '' 'x' 8 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-10 'value' '' 'value' 8 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-13 'x' '' 'x' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'value' '' 'value' 12 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-17 'x' '' 'x' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-18 'value' '' 'value' 16 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-4 'arg' '' 'arg' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-5 'result' '' 'result' 3 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-6 'jint' '' 'jint' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-)
-
-('calerf' 0 2 'derf' 0 7 'derfc' 0 11 'derfcx' 0 15 'erfcoremod' 0 19)
diff --git a/pywafo/src/wafo/source/old/erfcoremod.pyd b/pywafo/src/wafo/source/old/erfcoremod.pyd
deleted file mode 100644
index df75051..0000000
Binary files a/pywafo/src/wafo/source/old/erfcoremod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/old/erfcoremod.pyfold b/pywafo/src/wafo/source/old/erfcoremod.pyfold
deleted file mode 100644
index 02b4929..0000000
--- a/pywafo/src/wafo/source/old/erfcoremod.pyfold
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-! Note: the context of this file is case sensitive.
-
-python module erfcoremod ! in
- interface ! in :erfcoremod
- function derf(x) result (value) ! in :erfcoremod:erfcoremod.f
- double precision intent(in) :: x
- double precision :: value
- end function derf
- function derfc(x) result (value) ! in :erfcoremod:erfcoremod.f
- double precision intent(in) :: x
- double precision :: value
- end function derfc
- function derfcx(x) result (value) ! in :erfcoremod:erfcoremod.f
- double precision intent(in) :: x
- double precision :: value
- end function derfcx
- subroutine calerf(arg,result,jint) ! in :erfcoremod:erfcoremod.f
- double precision intent(in) :: arg
- double precision intent(inout) :: result
- integer intent(in) :: jint
- end subroutine calerf
- end interface
-end python module erfcoremod
-
-! This file was auto-generated with f2py (version:2_5972).
-! See http://cens.ioc.ee/projects/f2py2e/
diff --git a/pywafo/src/wafo/source/old/functioninterface.mod b/pywafo/src/wafo/source/old/functioninterface.mod
deleted file mode 100644
index 3183899..0000000
--- a/pywafo/src/wafo/source/old/functioninterface.mod
+++ /dev/null
@@ -1,27 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Mon Nov 10 15:00:44 2008
-MD5:2bffd45d12c9c1718b19499dd55e4953 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'f' 'functioninterface' 'f' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-BODY UNKNOWN EXTERNAL FUNCTION) (REAL 8 0 0 REAL ()) 3 0 (4) () 5 () ()
-0 0)
-6 'functioninterface' 'functioninterface' 'functioninterface' 1 ((
-MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () 0 0)
-4 'z' '' 'z' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (REAL 8
-0 0 REAL ()) 0 0 () () 0 () () 0 0)
-5 'val' '' 'val' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN RESULT) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('f' 0 2 'functioninterface' 0 6)
diff --git a/pywafo/src/wafo/source/old/integration1dmodule.mod b/pywafo/src/wafo/source/old/integration1dmodule.mod
deleted file mode 100644
index 0e7fda3..0000000
--- a/pywafo/src/wafo/source/old/integration1dmodule.mod
+++ /dev/null
@@ -1,241 +0,0 @@
-GFORTRAN module created from mvnprodcorrprb.f on Mon Nov 10 15:32:07 2008
-MD5:5dd704e6daf3bd44e2297b08a55e52ff -- If you edit this, you'll get what you deserve.
-
-(() () () ()
-() () () () () () () () () () () () () () () () () () () () () () ())
-
-()
-
-(('adaptivesimpson' 'integration1dmodule' 2 3) ('adaptivetrapz'
-'integration1dmodule' 4 5) ('d1mach' 'integration1dmodule' 6) ('dea'
-'integration1dmodule' 7) ('romberg' 'integration1dmodule' 8 9))
-
-()
-
-()
-
-(10 'adaptiveintwithbreaks' 'integration1dmodule' 'adaptiveintwithbreaks'
-1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 11 0 (12 13 14 15 16 17 18
-19 20) () 0 () () 0 0)
-21 'adaptivesimpson1' 'integration1dmodule' 'adaptivesimpson1' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 22 0 (23 24 25 26 27 28 29) () 0 () () 0 0)
-3 'adaptivesimpson2' 'integration1dmodule' 'adaptivesimpson2' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 30 0 (31 32 33 34 35 36 37) () 0 () () 0 0)
-38 'adaptivesimpson3' 'integration1dmodule' 'adaptivesimpson3' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0
-0 0 UNKNOWN ()) 39 0 (40 41 42 43 44 45 46) () 0 () () 0 0)
-2 'adaptivesimpsonwithbreaks' 'integration1dmodule'
-'adaptivesimpsonwithbreaks' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 47 0
-(48 49 50 51 52 53 54 55 56) () 0 () () 0 0)
-5 'adaptivetrapz1' 'integration1dmodule' 'adaptivetrapz1' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 57 0 (58 59 60 61 62 63 64) () 0 () () 0 0)
-4 'adaptivetrapzwithbreaks' 'integration1dmodule'
-'adaptivetrapzwithbreaks' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN SUBROUTINE ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 65 0 (66
-67 68 69 70 71 72 73 74) () 0 () () 0 0)
-6 'd1mach' 'integration1dmodule' 'd1mach' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION GENERIC) (REAL 8 0 0 REAL ()) 75 0 (
-76) () 6 () () 0 0)
-7 'dea' 'integration1dmodule' 'dea' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE GENERIC) (UNKNOWN 0 0 0 UNKNOWN ())
-77 0 (78 79 80 81 82 83 84) () 0 () () 0 0)
-85 'dea3' 'integration1dmodule' 'dea3' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 86 0 (
-87 88 89 90 91) () 0 () () 0 0)
-92 'integration1dmodule' 'integration1dmodule' 'integration1dmodule' 1 (
-(MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN) (UNKNOWN 0 0 0
-UNKNOWN ()) 0 0 () () 0 () () 0 0)
-9 'romberg1' 'integration1dmodule' 'romberg1' 1 ((PROCEDURE
-UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0
-UNKNOWN ()) 93 0 (94 95 96 97 98 99 100 101) () 0 () () 0 0)
-8 'rombergwithbreaks' 'integration1dmodule' 'rombergwithbreaks' 1 ((
-PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN SUBROUTINE
-ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 102 0 (103 104 105 106 107
-108 109 110 111) () 0 () () 0 0)
-76 'i' '' 'i' 75 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-91 'result' '' 'result' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-83 'epstab' '' 'epstab' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SIZE (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-84 'ierr' '' 'ierr' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-87 'e0' '' 'e0' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-19 'abserr' '' 'abserr' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-20 'val' '' 'val' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-89 'e2' '' 'e2' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-90 'abserr' '' 'abserr' 86 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-13 'a' '' 'a' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-14 'b' '' 'b' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-15 'n' '' 'n' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-16 'brks' '' 'brks' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-48 'f' '' 'f' 47 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-67 'a' '' 'a' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-68 'b' '' 'b' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-69 'n' '' 'n' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-70 'brks' '' 'brks' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-71 'epsi' '' 'epsi' 65 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-17 'epsi' '' 'epsi' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-18 'iflg' '' 'iflg' 11 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-12 'f' '' 'f' 11 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-49 'a' '' 'a' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-50 'b' '' 'b' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-51 'n' '' 'n' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-52 'brks' '' 'brks' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-53 'epsi' '' 'epsi' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-54 'iflg' '' 'iflg' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-55 'abserr' '' 'abserr' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-56 'val' '' 'val' 47 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-23 'f' '' 'f' 22 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 23 () () 0 0)
-35 'iflg' '' 'iflg' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-31 'f' '' 'f' 30 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 31 () () 0 0)
-32 'a' '' 'a' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-33 'b' '' 'b' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-34 'epsi' '' 'epsi' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-78 'newflg' '' 'newflg' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () 0 0)
-79 'svalue' '' 'svalue' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-80 'limexp' '' 'limexp' 77 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-81 'result' '' 'result' 77 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-88 'e1' '' 'e1' 86 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-82 'abserr' '' 'abserr' 77 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-41 'a' '' 'a' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-42 'b' '' 'b' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-43 'epsi' '' 'epsi' 39 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-44 'iflg' '' 'iflg' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-40 'f' '' 'f' 39 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 40 () () 0 0)
-45 'abserr' '' 'abserr' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-46 'val' '' 'val' 39 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-66 'f' '' 'f' 65 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-24 'a' '' 'a' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-25 'b' '' 'b' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-26 'epsi' '' 'epsi' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-27 'iflg' '' 'iflg' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-28 'abserr' '' 'abserr' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-29 'val' '' 'val' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-36 'abserr' '' 'abserr' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-37 'val' '' 'val' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-72 'iflg' '' 'iflg' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-73 'abserr' '' 'abserr' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-74 'val' '' 'val' 65 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-58 'f' '' 'f' 57 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 58 () () 0 0)
-59 'a' '' 'a' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-60 'b' '' 'b' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-61 'epsi' '' 'epsi' 57 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-62 'iflg' '' 'iflg' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-63 'abserr' '' 'abserr' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-64 'val' '' 'val' 57 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-103 'f' '' 'f' 102 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN EXTERNAL DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-104 'a' '' 'a' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-105 'b' '' 'b' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-106 'n' '' 'n' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-107 'brks' '' 'brks' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () 0 0)
-108 'epsi' '' 'epsi' 102 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-109 'iflg' '' 'iflg' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-110 'abserr' '' 'abserr' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-111 'val' '' 'val' 102 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-94 'f' '' 'f' 93 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC UNKNOWN UNKNOWN
-EXTERNAL DUMMY FUNCTION) (REAL 8 0 0 REAL ()) 0 0 () () 94 () () 0 0)
-95 'a' '' 'a' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-96 'b' '' 'b' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY) (
-REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-97 'decdigs' '' 'decdigs' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-98 'abseps' '' 'abseps' 93 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-99 'errflg' '' 'errflg' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-100 'abserr' '' 'abserr' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-101 'val' '' 'val' 93 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN DUMMY)
-(REAL 8 0 0 REAL ()) 0 0 () () 0 () () 0 0)
-)
-
-('adaptiveintwithbreaks' 0 10 'adaptivesimpson1' 0 21 'adaptivesimpson2'
-0 3 'adaptivesimpson3' 0 38 'adaptivesimpsonwithbreaks' 0 2
-'adaptivetrapz1' 0 5 'adaptivetrapzwithbreaks' 0 4 'd1mach' 0 6 'dea' 0
-7 'dea3' 0 85 'integration1dmodule' 0 92 'romberg1' 0 9
-'rombergwithbreaks' 0 8)
diff --git a/pywafo/src/wafo/source/rind2007/Debug/DF60.PDB b/pywafo/src/wafo/source/rind2007/Debug/DF60.PDB
deleted file mode 100644
index fb148f5..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/DF60.PDB and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/adaptmod.mod b/pywafo/src/wafo/source/rind2007/Debug/adaptmod.mod
deleted file mode 100644
index 7a25ec1..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/adaptmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/c1c2mod.mod b/pywafo/src/wafo/source/rind2007/Debug/c1c2mod.mod
deleted file mode 100644
index f482fb8..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/c1c2mod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/dkbvrcmod.mod b/pywafo/src/wafo/source/rind2007/Debug/dkbvrcmod.mod
deleted file mode 100644
index 729862b..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/dkbvrcmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/erfcoremod.mod b/pywafo/src/wafo/source/rind2007/Debug/erfcoremod.mod
deleted file mode 100644
index f5b8c9b..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/erfcoremod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/erfcoremod.obj b/pywafo/src/wafo/source/rind2007/Debug/erfcoremod.obj
deleted file mode 100644
index 892c80e..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/erfcoremod.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/fimod.mod b/pywafo/src/wafo/source/rind2007/Debug/fimod.mod
deleted file mode 100644
index be1c4e8..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/fimod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/fimod.obj b/pywafo/src/wafo/source/rind2007/Debug/fimod.obj
deleted file mode 100644
index 73c6561..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/fimod.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/funcmod.mod b/pywafo/src/wafo/source/rind2007/Debug/funcmod.mod
deleted file mode 100644
index ba662bc..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/funcmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/globaldata.mod b/pywafo/src/wafo/source/rind2007/Debug/globaldata.mod
deleted file mode 100644
index 99ed174..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/globaldata.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/intmodule.obj b/pywafo/src/wafo/source/rind2007/Debug/intmodule.obj
deleted file mode 100644
index 8d1b733..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/intmodule.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/jacobmod.mod b/pywafo/src/wafo/source/rind2007/Debug/jacobmod.mod
deleted file mode 100644
index 4413ed8..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/jacobmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/jacobmod.obj b/pywafo/src/wafo/source/rind2007/Debug/jacobmod.obj
deleted file mode 100644
index a6f9dca..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/jacobmod.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/krbvrcmod.mod b/pywafo/src/wafo/source/rind2007/Debug/krbvrcmod.mod
deleted file mode 100644
index e7a910c..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/krbvrcmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/krobovmod.mod b/pywafo/src/wafo/source/rind2007/Debug/krobovmod.mod
deleted file mode 100644
index 77e1c0c..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/krobovmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/precisionmod.mod b/pywafo/src/wafo/source/rind2007/Debug/precisionmod.mod
deleted file mode 100644
index ee24870..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/precisionmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/quad.mod b/pywafo/src/wafo/source/rind2007/Debug/quad.mod
deleted file mode 100644
index 2ec4f2a..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/quad.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/rcrudemod.mod b/pywafo/src/wafo/source/rind2007/Debug/rcrudemod.mod
deleted file mode 100644
index 917c55b..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/rcrudemod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/rind71.obj b/pywafo/src/wafo/source/rind2007/Debug/rind71.obj
deleted file mode 100644
index 177c8eb..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/rind71.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/rindmod.mod b/pywafo/src/wafo/source/rind2007/Debug/rindmod.mod
deleted file mode 100644
index 4885230..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/rindmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/ssobolmod.mod b/pywafo/src/wafo/source/rind2007/Debug/ssobolmod.mod
deleted file mode 100644
index d756f3e..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/ssobolmod.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.exe b/pywafo/src/wafo/source/rind2007/Debug/test_rind71.exe
deleted file mode 100644
index c796593..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.ilk b/pywafo/src/wafo/source/rind2007/Debug/test_rind71.ilk
deleted file mode 100644
index 44420eb..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.ilk and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.obj b/pywafo/src/wafo/source/rind2007/Debug/test_rind71.obj
deleted file mode 100644
index 68670b1..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.obj and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.pdb b/pywafo/src/wafo/source/rind2007/Debug/test_rind71.pdb
deleted file mode 100644
index 9aa5348..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/test_rind71.pdb and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/Debug/trivariatevar.mod b/pywafo/src/wafo/source/rind2007/Debug/trivariatevar.mod
deleted file mode 100644
index 826a40e..0000000
Binary files a/pywafo/src/wafo/source/rind2007/Debug/trivariatevar.mod and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/New File.txt b/pywafo/src/wafo/source/rind2007/New File.txt
deleted file mode 100644
index ae0b9b7..0000000
--- a/pywafo/src/wafo/source/rind2007/New File.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- subroutine set_constants(method,xcscale,abseps,releps,coveps,
- & maxpts,minpts,nit,xcutoff,Nc1c2)
- use rindmod
- double precision :: xcscale,abseps,releps,coveps,xcutoff
- integer method, maxpts, minpts, nit, Nc1c2
-Cf2py double precision, optional :: xcscale = 0.0D0
-Cf2py double precision, optional :: abseps = 0.01D0
-Cf2py double precision, optional :: releps = 0.01D0
-Cf2py double precision, optional :: coveps = 1.0D-10
-Cf2py double precision, optional :: xcutoff = 5.0D0
-
-Cf2py integer, optional :: method = 3
-Cf2py integer, optional :: minpts = 0
-Cf2py integer, optional :: maxpts = 40000
-Cf2py integer, optional :: nit = 1000
-Cf2py integer, optional :: Nc1c2 = 2
-
- call setconstants(method,xcscale,abseps,releps,coveps,
- & maxpts,minpts,nit,xcutoff,Nc1c2)
- return
- end subroutine set_constants
\ No newline at end of file
diff --git a/pywafo/src/wafo/source/rind2007/adaptmod.mod b/pywafo/src/wafo/source/rind2007/adaptmod.mod
deleted file mode 100644
index 3001f36..0000000
--- a/pywafo/src/wafo/source/rind2007/adaptmod.mod
+++ /dev/null
@@ -1,71 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:6b832f3082aec892583a61a9998cf5eb -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('adapt' 'adaptmod' 2) ('sadapt' 'adaptmod' 3))
-
-()
-
-()
-
-()
-
-(2 'adapt' 'adaptmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 4 0 (5 6 7
-8 9 10 11 12 13) () 0 () () () 0 0)
-3 'sadapt' 'adaptmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 14 0 (15 16
-17 18 19 20 21 22) () 0 () () () 0 0)
-5 'ndim' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'mincls' '' '' 4 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-7 'maxcls' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-8 'functn' '' '' 4 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY UNKNOWN
-0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 23 0 (24 25)
-() 8 () () () 0 0)
-9 'absreq' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-10 'relreq' '' '' 4 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-11 'absest' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'finest' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-13 'inform' '' '' 4 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-15 'n' '' '' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-16 'maxpts' '' '' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-17 'functn' '' '' 14 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY
-UNKNOWN 0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 26 0
-(27 28) () 17 () () () 0 0)
-18 'abseps' '' '' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-19 'releps' '' '' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-20 'error' '' '' 14 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-21 'value' '' '' 14 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-22 'inform' '' '' 14 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-24 'n' '' '' 23 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-25 'z' '' '' 23 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-27 'n' '' '' 26 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-28 'z' '' '' 26 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('adapt' 0 2 'sadapt' 0 3)
diff --git a/pywafo/src/wafo/source/rind2007/c1c2mod.mod b/pywafo/src/wafo/source/rind2007/c1c2mod.mod
deleted file mode 100644
index 3c3d338..0000000
--- a/pywafo/src/wafo/source/rind2007/c1c2mod.mod
+++ /dev/null
@@ -1,40 +0,0 @@
-GFORTRAN module version '10' created from rind71mod.f
-MD5:29854c062906bbb41e95ea0739b932af -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('c1c2' 'c1c2mod' 2))
-
-()
-
-()
-
-()
-
-(2 'c1c2' 'c1c2mod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC IMPLICIT_PURE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 0 UNKNOWN ()) 3 0 (4 5 6 7 8 9) () 0 () () () 0 0)
-10 'c1c2mod' 'c1c2mod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-4 'c1' '' '' 3 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-5 'c2' '' '' 3 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-6 'cm' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-7 'b1' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-8 'sq' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-9 'ind' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT
-(INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('c1c2' 0 2 'c1c2mod' 0 10)
diff --git a/pywafo/src/wafo/source/rind2007/dkbvrcmod.mod b/pywafo/src/wafo/source/rind2007/dkbvrcmod.mod
deleted file mode 100644
index bd9f9e5..0000000
--- a/pywafo/src/wafo/source/rind2007/dkbvrcmod.mod
+++ /dev/null
@@ -1,46 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:5db9060e86b2574cd530f108139d8f83 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('dkbvrc' 'dkbvrcmod' 2))
-
-()
-
-()
-
-()
-
-(2 'dkbvrc' 'dkbvrcmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 3 0 (4 5 6
-7 8 9 10 11 12) () 0 () () () 0 0)
-4 'ndim' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-5 'minvls' '' '' 3 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'maxvls' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-7 'functn' '' '' 3 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY UNKNOWN
-0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 13 0 (14 15)
-() 7 () () () 0 0)
-8 'abseps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'releps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-10 'abserr' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-11 'finest' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'inform' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'n' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-15 'z' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('dkbvrc' 0 2)
diff --git a/pywafo/src/wafo/source/rind2007/fimod.mod b/pywafo/src/wafo/source/rind2007/fimod.mod
deleted file mode 100644
index 0646be5..0000000
--- a/pywafo/src/wafo/source/rind2007/fimod.mod
+++ /dev/null
@@ -1,217 +0,0 @@
-GFORTRAN module version '10' created from fimod.f
-MD5:91d910b9ce2741a570f24f5bec6fdc83 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('bvnmvn' 'fimod' 2) ('bvtl' 'fimod' 3) ('bvu' 'fimod' 4) ('exinv'
-'fimod' 5) ('exlms' 'fimod' 6) ('fi' 'fimod' 7) ('fiinv' 'fimod' 8) (
-'gausint' 'fimod' 9) ('gausint2' 'fimod' 10) ('mvnlimits' 'fimod' 11) (
-'mvnlms' 'fimod' 12) ('normprb' 'fimod' 13) ('studnt' 'fimod' 14) ('tvtl'
-'fimod' 15))
-
-()
-
-()
-
-()
-
-(2 'bvnmvn' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 16
-0 (17 18 19 20) () 21 () () () 0 0)
-3 'bvtl' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 22 0 (23 24 25 26)
-() 3 () () () 0 0)
-4 'bvu' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN
-0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 27 0 (28 29 30) () 31 () ()
-() 0 0)
-5 'exinv' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 32 0 (33 34 35 36)
-() 37 () () () 0 0)
-6 'exlms' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 38 0 (39 40
-41 42 43 44 45 46) () 0 () () () 0 0)
-7 'fi' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN
-0 0 FUNCTION GENERIC IMPLICIT_PURE) (REAL 8 0 0 0 REAL ()) 47 0 (48) ()
-49 () () () 0 0)
-8 'fiinv' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC IMPLICIT_PURE) (REAL 8 0 0 0 REAL ()) 50 0
-(51) () 52 () () () 0 0)
-9 'gausint' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 53 0 (54 55 56 57
-58 59) () 60 () () () 0 0)
-10 'gausint2' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 61 0 (62 63 64 65)
-() 66 () () () 0 0)
-11 'mvnlimits' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 67 0 (68 69 70 71 72 73) () 0 () () () 0 0)
-12 'mvnlms' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 74 0 (75 76
-77 78 79) () 0 () () () 0 0)
-13 'normprb' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC IMPLICIT_PURE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 0 UNKNOWN ()) 80 0 (81 82 83) () 0 () () () 0 0)
-14 'studnt' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC) (REAL 8 0 0 0 REAL ()) 84 0 (85 86) () 14
-() () () 0 0)
-87 'tvnmvn' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 88 0 (89 90
-91 92 93) () 94 () () () 0 0)
-15 'tvtl' 'fimod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 95
-0 (96 97 98 99) () 15 () () () 0 0)
-17 'lower' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-18 'upper' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-19 'infin' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 ASSUMED_SHAPE
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-20 'correl' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-21 'val' '' '' 16 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 RESULT ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-23 'nu' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-24 'dh' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-25 'dk' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-26 'r' '' '' 22 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-28 'sh' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-29 'sk' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-30 'r' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-31 'val' '' '' 27 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-33 'p' '' '' 32 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-34 'a' '' '' 32 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-35 'ca' '' '' 32 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-36 'pa' '' '' 32 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-37 'val' '' '' 32 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-39 'a' '' '' 38 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-40 'x1' '' '' 38 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-41 'x2' '' '' 38 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-42 'infin' '' '' 38 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-43 'lower' '' '' 38 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-44 'upper' '' '' 38 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-45 'ca' '' '' 38 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-46 'pa' '' '' 38 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-48 'z' '' '' 47 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-49 'value' '' '' 47 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-51 'p' '' '' 50 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-52 'val' '' '' 50 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-54 'x1' '' '' 53 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-55 'x2' '' '' 53 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-56 'a' '' '' 53 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-57 'b' '' '' 53 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-58 'c' '' '' 53 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-59 'd' '' '' 53 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-60 'value' '' '' 53 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-62 'x1' '' '' 61 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-63 'x2' '' '' 61 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-64 'a' '' '' 61 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-65 'b' '' '' 61 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-66 'value' '' '' 61 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-68 'a' '' '' 67 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-69 'b' '' '' 67 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-70 'infin' '' '' 67 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-71 'ap' '' '' 67 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-72 'prb' '' '' 67 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-73 'aq' '' '' 67 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-75 'a' '' '' 74 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-76 'b' '' '' 74 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-77 'infin' '' '' 74 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-78 'lower' '' '' 74 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-79 'upper' '' '' 74 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-81 'z' '' '' 80 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-82 'p' '' '' 80 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-83 'q' '' '' 80 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-85 'nu' '' '' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-86 't' '' '' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-89 'a' '' '' 88 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-90 'b' '' '' 88 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-91 'infin' '' '' 88 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 ASSUMED_SHAPE
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-92 'r' '' '' 88 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-93 'epsi' '' '' 88 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-94 'val' '' '' 88 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 RESULT ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-96 'nu1' '' '' 95 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-97 'h' '' '' 95 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-98 'r' '' '' 95 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-99 'epsi' '' '' 95 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('bvnmvn' 0 2 'bvtl' 0 3 'bvu' 0 4 'exinv' 0 5 'exlms' 0 6 'fi' 0 7
-'fiinv' 0 8 'gausint' 0 9 'gausint2' 0 10 'mvnlimits' 0 11 'mvnlms' 0 12
-'normprb' 0 13 'studnt' 0 14 'tvnmvn' 0 87 'tvtl' 0 15)
diff --git a/pywafo/src/wafo/source/rind2007/funcmod.mod b/pywafo/src/wafo/source/rind2007/funcmod.mod
deleted file mode 100644
index cae4078..0000000
--- a/pywafo/src/wafo/source/rind2007/funcmod.mod
+++ /dev/null
@@ -1,63 +0,0 @@
-GFORTRAN module version '10' created from rind71mod.f
-MD5:6bcfb6bfc6e35ac2718a061882cb76df -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('mvnfun' 'funcmod' 2) ('mvnfun2' 'funcmod' 3))
-
-()
-
-()
-
-()
-
-(4 'big' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-2 0 DEFERRED () () () ()) 0 () () () 0 0)
-5 'cm' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-1 0 DEFERRED () ()) 0 () () () 0 0)
-6 'cmn' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-1 0 DEFERRED () ()) 0 () () () 0 0)
-7 'funcmod' 'funcmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-2 'mvnfun' 'funcmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 8 0
-(9 10) () 11 () () () 0 0)
-3 'mvnfun2' 'funcmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 12
-0 (13 14) () 15 () () () 0 0)
-16 'pl1' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-17 'pu1' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-18 'xc' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-1 0 DEFERRED () ()) 0 () () () 0 0)
-19 'xd' 'funcmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-1 0 DEFERRED () ()) 0 () () () 0 0)
-9 'ndim' '' '' 8 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-10 'w' '' '' 8 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-11 'xind' '' '' 8 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 RESULT ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () ()
-0 0)
-13 'ndim' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'w' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-15 'xind' '' '' 12 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 ()
-() () 0 0)
-)
-
-('big' 0 4 'cm' 0 5 'cmn' 0 6 'funcmod' 0 7 'mvnfun' 0 2 'mvnfun2' 0 3
-'pl1' 0 16 'pu1' 0 17 'xc' 0 18 'xd' 0 19)
diff --git a/pywafo/src/wafo/source/rind2007/globalconst.mod b/pywafo/src/wafo/source/rind2007/globalconst.mod
deleted file mode 100644
index a68b060..0000000
--- a/pywafo/src/wafo/source/rind2007/globalconst.mod
+++ /dev/null
@@ -1,66 +0,0 @@
-GFORTRAN module version '10' created from rindmod.f
-MD5:f808c5946c0c41fb2c75e26aa349bbd9 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'ghalf' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.80000000000000@0') () 0 () () () 0 0)
-3 'ginfinity' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.25000000000000@2') () 0 () () () 0 0)
-4 'globalconst' 'globalconst' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0
-0)
-5 'gone' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.10000000000000@1') () 0 () () () 0 0)
-6 'gpi' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.3243f6a8885a22@1') () 0 () () () 0 0)
-7 'gpi1' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.517cc1b72721dc@0') () 0 () () () 0 0)
-8 'gsqpi' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.1c5bf891b4ef7d@1') () 0 () () () 0 0)
-9 'gsqpi1' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.906eba8214dc78@0') () 0 () () () 0 0)
-10 'gsqtw' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.16a09e667f3be3@1') () 0 () () () 0 0)
-11 'gsqtw1' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.b504f333f9df18@0') () 0 () () () 0 0)
-12 'gsqtwpi' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.281b263fec4e08@1') () 0 () () () 0 0)
-13 'gsqtwpi1' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.662114cf50d880@0') () 0 () () () 0 0)
-14 'gtwo' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.20000000000000@1') () 0 () () () 0 0)
-15 'gtwpi' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.6487ed5110b444@1') () 0 () () () 0 0)
-16 'gzero' 'globalconst' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.00000000000000@0') () 0 () () () 0 0)
-)
-
-('ghalf' 0 2 'ginfinity' 0 3 'globalconst' 0 4 'gone' 0 5 'gpi' 0 6 'gpi1'
-0 7 'gsqpi' 0 8 'gsqpi1' 0 9 'gsqtw' 0 10 'gsqtw1' 0 11 'gsqtwpi' 0 12
-'gsqtwpi1' 0 13 'gtwo' 0 14 'gtwpi' 0 15 'gzero' 0 16)
diff --git a/pywafo/src/wafo/source/rind2007/globaldata.mod b/pywafo/src/wafo/source/rind2007/globaldata.mod
deleted file mode 100644
index 9e9c34a..0000000
--- a/pywafo/src/wafo/source/rind2007/globaldata.mod
+++ /dev/null
@@ -1,169 +0,0 @@
-GFORTRAN module version '10' created from rind71mod.f
-MD5:60dce69be122281d64fa324954fe4b9a -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 '__convert_r4_r8' '(intrinsic)' '' 1 ((PROCEDURE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 FUNCTION ELEMENTAL PURE) (REAL 8 0 0 0
-REAL ()) 0 0 () () 2 () () () 0 0)
-3 'c1c2det' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (LOGICAL 4 0 0 0 LOGICAL ()) 0 0 () (
-CONSTANT (LOGICAL 4 0 0 0 LOGICAL ()) 0 1) () 0 () () () 0 0)
-4 'cepss' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-5 'cov' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-1 0 DEFERRED () ()) 0 () () () 0 0)
-6 'covix' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-7 'eps' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-8 'eps0' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-9 'eps2' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-10 'epss' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-11 'fxcepss' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-12 'globaldata' 'globaldata' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0
-0)
-13 'hlo' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ())
-0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-14 'hup' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ())
-0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-15 'index1' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (INTEGER 4 0 0 0
-INTEGER ()) 0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-16 'indxtd' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (INTEGER 4 0 0 0
-INTEGER ()) 0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-17 'mb' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-18 'nc' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-19 'nd' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-20 'ni' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-21 'nit' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-22 'nj' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-23 'njj' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-24 'nsimmax' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-25 'nsimmin' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-26 'nsxdj' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (INTEGER 4 0 0 0
-INTEGER ()) 0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-27 'nsxtmj' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (INTEGER 4 0 0 0
-INTEGER ()) 0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-28 'nt' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-29 'ntd' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-30 'ntdc' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-31 'ntscis' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-32 'nugget' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-33 'nx' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-34 'pi' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.3243f6a8885a22@1') () 0 () () () 0 0)
-35 'pi1' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.517cc1b72721dc@0') () 0 () () () 0 0)
-36 'plowgth' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.00000000000000@0') () 0 () () () 0 0)
-37 'releps' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-38 'scis' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-39 'sq' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (REAL 8 0 0 0 REAL ()) 0 0 () (
-2 0 DEFERRED () () () ()) 0 () () () 0 0)
-40 'sqpi' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.1c5bf891b4ef7d@1') () 0 () () () 0 0)
-41 'sqpi1' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.906eba8214dc78@0') () 0 () () () 0 0)
-42 'sqtwo' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.16a09e667f3be3@1') () 0 () () () 0 0)
-43 'sqtwo1' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.b504f333f9df18@0') () 0 () () () 0 0)
-44 'sqtwopi1' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.662114cf50d880@0') () 0 () () () 0 0)
-45 'twopi' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () (CONSTANT (
-REAL 8 0 0 0 REAL ()) 0 '0.6487ed5110b444@1') () 0 () () () 0 0)
-46 'usec1c2' 'globaldata' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (LOGICAL 4 0 0 0 LOGICAL ()) 0 0 () (
-CONSTANT (LOGICAL 4 0 0 0 LOGICAL ()) 0 1) () 0 () () () 0 0)
-47 'xceps2' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-48 'xcscale' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-49 'xcutoff' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-50 'xedni' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0 ALLOCATABLE DIMENSION) (INTEGER 4 0 0 0
-INTEGER ()) 0 0 () (1 0 DEFERRED () ()) 0 () () () 0 0)
-51 'xsplt' 'globaldata' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-)
-
-('__convert_r4_r8' 0 2 'c1c2det' 0 3 'cepss' 0 4 'cov' 0 5 'covix' 0 6
-'eps' 0 7 'eps0' 0 8 'eps2' 0 9 'epss' 0 10 'fxcepss' 0 11 'globaldata'
-0 12 'hlo' 0 13 'hup' 0 14 'index1' 0 15 'indxtd' 0 16 'mb' 0 17 'nc' 0
-18 'nd' 0 19 'ni' 0 20 'nit' 0 21 'nj' 0 22 'njj' 0 23 'nsimmax' 0 24
-'nsimmin' 0 25 'nsxdj' 0 26 'nsxtmj' 0 27 'nt' 0 28 'ntd' 0 29 'ntdc' 0
-30 'ntscis' 0 31 'nugget' 0 32 'nx' 0 33 'pi' 0 34 'pi1' 0 35 'plowgth'
-0 36 'releps' 0 37 'scis' 0 38 'sq' 0 39 'sqpi' 0 40 'sqpi1' 0 41 'sqtwo'
-0 42 'sqtwo1' 0 43 'sqtwopi1' 0 44 'twopi' 0 45 'usec1c2' 0 46 'xceps2'
-0 47 'xcscale' 0 48 'xcutoff' 0 49 'xedni' 0 50 'xsplt' 0 51)
diff --git a/pywafo/src/wafo/source/rind2007/jacobmod.mod b/pywafo/src/wafo/source/rind2007/jacobmod.mod
deleted file mode 100644
index 7ef41be..0000000
--- a/pywafo/src/wafo/source/rind2007/jacobmod.mod
+++ /dev/null
@@ -1,31 +0,0 @@
-GFORTRAN module version '10' created from jacobmod.f
-MD5:7a6067e5bb3ccfd4f42952ae9bfa1ad5 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('jacob' 'jacobmod' 2))
-
-()
-
-()
-
-()
-
-(2 'jacob' 'jacobmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 FUNCTION GENERIC IMPLICIT_PURE ALWAYS_EXPLICIT) (REAL 8 0 0
-0 REAL ()) 3 0 (4 5) () 6 () () () 0 0)
-4 'xd' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-5 'xc' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-6 'value1' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 RESULT ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 ()
-() () 0 0)
-)
-
-('jacob' 0 2)
diff --git a/pywafo/src/wafo/source/rind2007/krbvrcmod.mod b/pywafo/src/wafo/source/rind2007/krbvrcmod.mod
deleted file mode 100644
index fd1c40e..0000000
--- a/pywafo/src/wafo/source/rind2007/krbvrcmod.mod
+++ /dev/null
@@ -1,46 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:589ca1c63e3206ea8f2c160cd1272c74 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('krbvrc' 'krbvrcmod' 2))
-
-()
-
-()
-
-()
-
-(2 'krbvrc' 'krbvrcmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 3 0 (4 5 6
-7 8 9 10 11 12) () 0 () () () 0 0)
-4 'ndim' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-5 'minvls' '' '' 3 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'maxvls' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-7 'functn' '' '' 3 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY UNKNOWN
-0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 13 0 (14 15)
-() 7 () () () 0 0)
-8 'abseps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'releps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-10 'abserr' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-11 'finest' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'inform' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'n' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-15 'z' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('krbvrc' 0 2)
diff --git a/pywafo/src/wafo/source/rind2007/krobovmod.mod b/pywafo/src/wafo/source/rind2007/krobovmod.mod
deleted file mode 100644
index 8d58b44..0000000
--- a/pywafo/src/wafo/source/rind2007/krobovmod.mod
+++ /dev/null
@@ -1,46 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:26b7b13d2d0907b2794fa7eafca04d0f -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('krobov' 'krobovmod' 2))
-
-()
-
-()
-
-()
-
-(2 'krobov' 'krobovmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 3 0 (4 5 6
-7 8 9 10 11 12) () 0 () () () 0 0)
-4 'ndim' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-5 'minvls' '' '' 3 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'maxvls' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-7 'functn' '' '' 3 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY UNKNOWN
-0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 13 0 (14 15)
-() 7 () () () 0 0)
-8 'abseps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'releps' '' '' 3 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-10 'abserr' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-11 'finest' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-12 'inform' '' '' 3 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'n' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-15 'z' '' '' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('krobov' 0 2)
diff --git a/pywafo/src/wafo/source/rind2007/precisionmod.mod b/pywafo/src/wafo/source/rind2007/precisionmod.mod
deleted file mode 100644
index bf83a2a..0000000
--- a/pywafo/src/wafo/source/rind2007/precisionmod.mod
+++ /dev/null
@@ -1,28 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:05080898712bd6dd12fae55e2dee5263 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'gp' 'precisionmod' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '8') () 0 () () () 0 0)
-3 'precisionmod' 'precisionmod' '' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () ()
-0 () () () 0 0)
-4 'selected_real_kind' '(intrinsic)' '' 1 ((PROCEDURE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 FUNCTION) (UNKNOWN 0 0 0 0 UNKNOWN ())
-0 0 () () 4 () () () 0 0)
-)
-
-('gp' 0 2 'precisionmod' 0 3 'selected_real_kind' 0 4)
diff --git a/pywafo/src/wafo/source/rind2007/quad.mod b/pywafo/src/wafo/source/rind2007/quad.mod
deleted file mode 100644
index d4d13a2..0000000
--- a/pywafo/src/wafo/source/rind2007/quad.mod
+++ /dev/null
@@ -1,274 +0,0 @@
-GFORTRAN module version '10' created from rind71mod.f
-MD5:1c9b25b1c3f920c049665fe552e92643 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('gausshe0' 'quad' 2) ('gaussla0' 'quad' 3) ('gaussle0' 'quad' 4) (
-'gaussle1' 'quad' 5) ('gaussle2' 'quad' 6) ('gaussq' 'quad' 7))
-
-()
-
-()
-
-()
-
-(8 '__convert_r4_r8' '(intrinsic)' '' 1 ((PROCEDURE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 FUNCTION ELEMENTAL PURE) (REAL 8 0 0 0
-REAL ()) 0 0 () () 8 () () () 0 0)
-2 'gausshe0' 'quad' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 9 0 (10 11 12 13 14 15) () 0 () () () 0 0)
-3 'gaussla0' 'quad' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 16 0 (17 18 19 20 21 22) () 0 () () () 0 0)
-4 'gaussle0' 'quad' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 23 0 (24 25 26 27 28 29) () 0 () () () 0 0)
-5 'gaussle1' 'quad' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 30 0 (31 32 33 34 35) () 0 () () () 0 0)
-6 'gaussle2' 'quad' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC IMPLICIT_PURE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 0 UNKNOWN ()) 36 0 (37 38 39 40 41 42) () 0 () () () 0 0)
-7 'gaussq' 'quad' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 43 0 (44 45 46 47 48 49) () 0 () () () 0 0)
-50 'hebp' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-51 'heind' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (ARRAY
-(INTEGER 4 0 0 0 INTEGER ()) 1 (((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '0') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '2') ()) ((
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '5') ()) ((CONSTANT (INTEGER 4 0
-0 0 INTEGER ()) 0 '9') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '14')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '20') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '27') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '35') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '44')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '54') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '66') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '82') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '102')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '126') ())) ('14')) (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '14')) 0 () () () 0 0)
-52 'heqnr' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (ARRAY
-(INTEGER 4 0 0 0 INTEGER ()) 1 (((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '2') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '3') ()) ((
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '4') ()) ((CONSTANT (INTEGER 4 0
-0 0 INTEGER ()) 0 '5') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '6')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '7') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '8') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '9') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '10') ())
-((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '12') ()) ((CONSTANT (INTEGER
-4 0 0 0 INTEGER ()) 0 '16') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '20') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '24') ())) ('13'))
-(1 0 EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13')) 0 () () () 0 0)
-53 'hewf' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-54 'i' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-55 'labp0' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-56 'labp5' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-57 'laind' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (ARRAY
-(INTEGER 4 0 0 0 INTEGER ()) 1 (((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '0') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '2') ()) ((
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '5') ()) ((CONSTANT (INTEGER 4 0
-0 0 INTEGER ()) 0 '9') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '14')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '20') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '27') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '35') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '44')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '54') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '66') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '82') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '102')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '126') ())) ('14')) (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '14')) 0 () () () 0 0)
-58 'laqnr' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (ARRAY
-(INTEGER 4 0 0 0 INTEGER ()) 1 (((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '2') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '3') ()) ((
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '4') ()) ((CONSTANT (INTEGER 4 0
-0 0 INTEGER ()) 0 '5') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '6')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '7') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '8') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '9') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '10') ())
-((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '12') ()) ((CONSTANT (INTEGER
-4 0 0 0 INTEGER ()) 0 '16') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '20') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '24') ())) ('13'))
-(1 0 EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13')) 0 () () () 0 0)
-59 'lawf0' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-60 'lawf5' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-61 'le2qnr' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-62 'lebp' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-63 'leind' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (ARRAY
-(INTEGER 4 0 0 0 INTEGER ()) 1 (((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '0') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '2') ()) ((
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '5') ()) ((CONSTANT (INTEGER 4 0
-0 0 INTEGER ()) 0 '9') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '14')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '20') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '27') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '35') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '44')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '54') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '66') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '82') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '102')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '126') ())) ('14')) (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '14')) 0 () () () 0 0)
-64 'leqnr' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (ARRAY
-(INTEGER 4 0 0 0 INTEGER ()) 1 (((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '2') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '3') ()) ((
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '4') ()) ((CONSTANT (INTEGER 4 0
-0 0 INTEGER ()) 0 '5') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '6')
-()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '7') ()) ((CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '8') ()) ((CONSTANT (INTEGER 4 0 0 0
-INTEGER ()) 0 '9') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '10') ())
-((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '12') ()) ((CONSTANT (INTEGER
-4 0 0 0 INTEGER ()) 0 '16') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ())
-0 '20') ()) ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '24') ())) ('13'))
-(1 0 EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13')) 0 () () () 0 0)
-65 'lewf' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION DATA) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '126')) 0 () () () 0 0)
-66 'minqnr' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-67 'nhew' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13') () 0 () () () 0 0)
-68 'nint1' 'quad' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0 DIMENSION) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0
-EXPLICIT (CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13')) 0 () () () 0 0)
-69 'nlaw' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13') () 0 () () () 0 0)
-70 'nlew' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13') () 0 () () () 0 0)
-71 'pmax' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '24') () 0 () () () 0 0)
-72 'quad' 'quad' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-73 'siznint' 'quad' '' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '13') () 0 () () () 0 0)
-10 'n' '' '' 9 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-11 'wfout' '' '' 9 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-12 'bpout' '' '' 9 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-13 'xmi' '' '' 9 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-14 'xma' '' '' 9 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-15 'n0' '' '' 9 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-17 'n' '' '' 16 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-18 'wfout' '' '' 16 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-19 'bpout' '' '' 16 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-20 'xmi' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-21 'xma' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-22 'n0' '' '' 16 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-24 'n' '' '' 23 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-25 'wfout' '' '' 23 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-26 'bpout' '' '' 23 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-27 'xmi' '' '' 23 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-28 'xma' '' '' 23 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-29 'n0' '' '' 23 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-31 'n' '' '' 30 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-32 'wfout' '' '' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-33 'bpout' '' '' 30 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-34 'xmi' '' '' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-35 'xma' '' '' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-37 'n' '' '' 36 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-38 'wfout' '' '' 36 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-39 'bpout' '' '' 36 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-40 'xmi' '' '' 36 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-41 'xma' '' '' 36 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-42 'n0' '' '' 36 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-44 'n' '' '' 43 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-45 'wf' '' '' 43 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-46 'bp' '' '' 43 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-47 'xmi' '' '' 43 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-48 'xma' '' '' 43 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-49 'n0' '' '' 43 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-)
-
-('__convert_r4_r8' 0 8 'gausshe0' 0 2 'gaussla0' 0 3 'gaussle0' 0 4
-'gaussle1' 0 5 'gaussle2' 0 6 'gaussq' 0 7 'hebp' 0 50 'heind' 0 51
-'heqnr' 0 52 'hewf' 0 53 'i' 0 54 'labp0' 0 55 'labp5' 0 56 'laind' 0 57
-'laqnr' 0 58 'lawf0' 0 59 'lawf5' 0 60 'le2qnr' 0 61 'lebp' 0 62 'leind'
-0 63 'leqnr' 0 64 'lewf' 0 65 'minqnr' 0 66 'nhew' 0 67 'nint1' 0 68
-'nlaw' 0 69 'nlew' 0 70 'pmax' 0 71 'quad' 0 72 'siznint' 0 73)
diff --git a/pywafo/src/wafo/source/rind2007/rcrudemod.mod b/pywafo/src/wafo/source/rind2007/rcrudemod.mod
deleted file mode 100644
index 33f3a72..0000000
--- a/pywafo/src/wafo/source/rind2007/rcrudemod.mod
+++ /dev/null
@@ -1,44 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:07b8298075e9a9f54709398e56efc6eb -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('ranmc' 'rcrudemod' 2))
-
-()
-
-()
-
-()
-
-(2 'ranmc' 'rcrudemod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 3 0 (4 5 6
-7 8 9 10 11) () 0 () () () 0 0)
-4 'n' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-5 'maxpts' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-6 'functn' '' '' 3 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY UNKNOWN
-0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 12 0 (13 14)
-() 6 () () () 0 0)
-7 'abseps' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-8 'releps' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-9 'error' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-10 'value' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-11 'inform' '' '' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-13 'n' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'z' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('ranmc' 0 2)
diff --git a/pywafo/src/wafo/source/rind2007/rind71mod.mod b/pywafo/src/wafo/source/rind2007/rind71mod.mod
deleted file mode 100644
index 2181ff1..0000000
--- a/pywafo/src/wafo/source/rind2007/rind71mod.mod
+++ /dev/null
@@ -1,83 +0,0 @@
-GFORTRAN module version '10' created from rind71mod.f
-MD5:08e55dca717f64ecaccc2cce27eb575a -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('echo' 'rind71mod' 2) ('initdata' 'rind71mod' 3) ('rind71' 'rind71mod'
-4) ('setdata' 'rind71mod' 5))
-
-()
-
-()
-
-()
-
-(2 'echo' 'rind71mod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 6 0 (7) () 0 () () () 0 0)
-3 'initdata' 'rind71mod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 8 0 (
-9) () 0 () () () 0 0)
-4 'rind71' 'rind71mod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 10 0 (11 12 13 14 15 16 17 18) () 0 () () () 0 0)
-5 'setdata' 'rind71mod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 19 0 (20 21
-22 23 24 25 26 27 28) () 0 () () () 0 0)
-7 'array' '' '' 6 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-9 'speed' '' '' 8 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-11 'fxind' '' '' 10 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-12 'big1' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-13 'ex' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-14 'xc1' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-15 'nt1' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-16 'indi' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 ASSUMED_SHAPE
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-17 'blo' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-18 'bup' '' '' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-20 'method' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-21 'scale' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-22 'depss' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-23 'dreps' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-24 'deps2' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-25 'dnit' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-26 'dxc' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-27 'dnint' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-28 'dxsplt' '' '' 19 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('echo' 0 2 'initdata' 0 3 'rind71' 0 4 'setdata' 0 5)
diff --git a/pywafo/src/wafo/source/rind2007/rindmod.mod b/pywafo/src/wafo/source/rind2007/rindmod.mod
deleted file mode 100644
index 1cc1f55..0000000
--- a/pywafo/src/wafo/source/rind2007/rindmod.mod
+++ /dev/null
@@ -1,114 +0,0 @@
-GFORTRAN module version '10' created from rindmod.f
-MD5:65b72428787a61c0a824d8a584a49497 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('rindd' 'rindmod' 2) ('setconstants' 'rindmod' 3))
-
-()
-
-()
-
-()
-
-(4 'mabseps' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-5 'mcoveps' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-6 'mmaxpts' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-7 'mmethod' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-8 'mminpts' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-9 'mnc1c2' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-10 'mnit' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-EXPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-11 'mreleps' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-12 'msmall' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-13 'mxcscale' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-14 'mxcutoff' 'rindmod' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN EXPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-2 'rindd' 'rindmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0 UNKNOWN
-()) 15 0 (16 17 18 19 20 21 22 23 24 25 26) () 0 () () () 0 0)
-3 'setconstants' 'rindmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 27 0 (28 29 30 31 32 33 34 35 36 37) () 0 () () () 0 0)
-16 'vals' '' '' 15 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-17 'err' '' '' 15 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-18 'terr' '' '' 15 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-19 'big' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-20 'ex' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-21 'xc' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-22 'nt' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-23 'indi' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 ASSUMED_SHAPE
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-24 'blo' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-25 'bup' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (2 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') () (CONSTANT (INTEGER 4 0 0
-0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-26 'infin' '' '' 15 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () (1 0 ASSUMED_SHAPE
-(CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-28 'method' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-29 'xcscale' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-30 'abseps' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-31 'releps' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-32 'coveps' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-33 'maxpts' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-34 'minpts' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-35 'nit' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-36 'xcutoff' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-37 'nc1c2' '' '' 27 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-OPTIONAL DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-)
-
-('mabseps' 0 4 'mcoveps' 0 5 'mmaxpts' 0 6 'mmethod' 0 7 'mminpts' 0 8
-'mnc1c2' 0 9 'mnit' 0 10 'mreleps' 0 11 'msmall' 0 12 'mxcscale' 0 13
-'mxcutoff' 0 14 'rindd' 0 2 'setconstants' 0 3)
diff --git a/pywafo/src/wafo/source/rind2007/rindmod.pyd b/pywafo/src/wafo/source/rind2007/rindmod.pyd
deleted file mode 100644
index e497cd4..0000000
Binary files a/pywafo/src/wafo/source/rind2007/rindmod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/ssobolmod.mod b/pywafo/src/wafo/source/rind2007/ssobolmod.mod
deleted file mode 100644
index 9b89ec6..0000000
--- a/pywafo/src/wafo/source/rind2007/ssobolmod.mod
+++ /dev/null
@@ -1,70 +0,0 @@
-GFORTRAN module version '10' created from intmodule.f
-MD5:f5d30ff58e564e7648b2ba106d40bcd2 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () ()
-() () () ())
-
-()
-
-(('initsobol' 'ssobolmod' 2) ('sobnied' 'ssobolmod' 3) ('sobolseq'
-'ssobolmod' 4))
-
-()
-
-()
-
-()
-
-(2 'initsobol' 'ssobolmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 5 0 (
-6 7 8 9 10 11) () 0 () () () 0 0)
-3 'sobnied' 'ssobolmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE GENERIC) (UNKNOWN 0 0 0 0 UNKNOWN ()) 12 0 (13 14
-15 16 17 18 19 20 21) () 0 () () () 0 0)
-4 'sobolseq' 'ssobolmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC
-DECL UNKNOWN 0 0 SUBROUTINE GENERIC ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 0
-UNKNOWN ()) 22 0 (23 24) () 0 () () () 0 0)
-6 'inform' '' '' 5 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-7 'taus' '' '' 5 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-8 'ndim' '' '' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-9 'atmost' '' '' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-10 'numds' '' '' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-11 'iflag' '' '' 5 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-13 'ndim' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-14 'minvls' '' '' 12 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-15 'maxvls' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-16 'functn' '' '' 12 ((PROCEDURE UNKNOWN-INTENT UNKNOWN-PROC BODY
-UNKNOWN 0 0 DUMMY FUNCTION ALWAYS_EXPLICIT) (REAL 8 0 0 0 REAL ()) 25 0
-(26 27) () 16 () () () 0 0)
-17 'abseps' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-18 'releps' '' '' 12 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-19 'abserr' '' '' 12 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-20 'finest' '' '' 12 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-21 'inform' '' '' 12 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-23 'quasi' '' '' 22 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-24 'inform' '' '' 22 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-26 'n' '' '' 25 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-27 'z' '' '' 25 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DIMENSION
-DUMMY) (REAL 8 0 0 0 REAL ()) 0 0 () (1 0 ASSUMED_SHAPE (CONSTANT (
-INTEGER 4 0 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-)
-
-('initsobol' 0 2 'sobnied' 0 3 'sobolseq' 0 4)
diff --git a/pywafo/src/wafo/source/rind2007/swapmod.mod b/pywafo/src/wafo/source/rind2007/swapmod.mod
deleted file mode 100644
index fca05bb..0000000
--- a/pywafo/src/wafo/source/rind2007/swapmod.mod
+++ /dev/null
@@ -1,44 +0,0 @@
-GFORTRAN module version '10' created from swapmod.f
-MD5:825f23b27481d78d127d3a2f61a750fa -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-(('swap' 'swapmod' 2 3 4))
-
-()
-
-()
-
-()
-
-(2 'swap_c' 'swapmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 5 0 (
-6 7) () 0 () () () 0 0)
-3 'swap_i' 'swapmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 8 0 (
-9 10) () 0 () () () 0 0)
-4 'swap_r' 'swapmod' '' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN 0 0 SUBROUTINE IMPLICIT_PURE) (UNKNOWN 0 0 0 0 UNKNOWN ()) 11 0
-(12 13) () 0 () () () 0 0)
-14 'swapmod' 'swapmod' '' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () () 0 () () () 0 0)
-6 'a' '' '' 5 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-CHARACTER 1 0 0 0 CHARACTER ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1')))
-0 0 () () 0 () () () 0 0)
-7 'b' '' '' 5 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-CHARACTER 1 0 0 0 CHARACTER ((CONSTANT (INTEGER 4 0 0 0 INTEGER ()) 0 '1')))
-0 0 () () 0 () () () 0 0)
-9 'a' '' '' 8 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (
-INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-10 'b' '' '' 8 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-12 'a' '' '' 11 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-13 'b' '' '' 11 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
-(REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-)
-
-('swap_c' 0 2 'swap_i' 0 3 'swap_r' 0 4 'swapmod' 0 14)
diff --git a/pywafo/src/wafo/source/rind2007/test_fimod.exe b/pywafo/src/wafo/source/rind2007/test_fimod.exe
deleted file mode 100644
index 65adab4..0000000
Binary files a/pywafo/src/wafo/source/rind2007/test_fimod.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/test_rind71mod.exe b/pywafo/src/wafo/source/rind2007/test_rind71mod.exe
deleted file mode 100644
index 6bac866..0000000
Binary files a/pywafo/src/wafo/source/rind2007/test_rind71mod.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/test_rindmod.exe b/pywafo/src/wafo/source/rind2007/test_rindmod.exe
deleted file mode 100644
index 4df9702..0000000
Binary files a/pywafo/src/wafo/source/rind2007/test_rindmod.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/test_rindmod2007.exe b/pywafo/src/wafo/source/rind2007/test_rindmod2007.exe
deleted file mode 100644
index 8fb3712..0000000
Binary files a/pywafo/src/wafo/source/rind2007/test_rindmod2007.exe and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/test_rindmod2007.opt b/pywafo/src/wafo/source/rind2007/test_rindmod2007.opt
deleted file mode 100644
index e3e59f7..0000000
Binary files a/pywafo/src/wafo/source/rind2007/test_rindmod2007.opt and /dev/null differ
diff --git a/pywafo/src/wafo/source/rind2007/test_rindmod2007.plg b/pywafo/src/wafo/source/rind2007/test_rindmod2007.plg
deleted file mode 100644
index d4e54ce..0000000
--- a/pywafo/src/wafo/source/rind2007/test_rindmod2007.plg
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-Build Log
-
---------------------Configuration: test_rindmod2007 - Win32 Debug--------------------
-
-Command Lines
-Creating temporary file "C:\DOCUME~1\pab2\LOCALS~1\Temp\RSP391.tmp" with contents
-[
-/check:bounds /compile_only /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt /module:"Debug/" /object:"Debug/" /pdbfile:"Debug/DF60.PDB"
-"C:\pab\workspace\PYWAFO\src\wafo\src\rind2007\split\fimod.f"
-"C:\pab\workspace\PYWAFO\src\wafo\src\rind2007\split\test_rindmod2007.f"
-]
-Creating temporary file "C:\DOCUME~1\pab2\LOCALS~1\Temp\RSP392.tmp" with contents
-[
-kernel32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/test_rindmod2007.pdb" /debug /machine:I386 /out:"Debug/test_rindmod2007.exe" /pdbtype:sept
-.\Debug\erfcoremod.obj
-.\Debug\fimod.obj
-.\Debug\intmodule.obj
-.\Debug\jacobmod.obj
-.\Debug\rindmod2007.obj
-.\Debug\swapmod.obj
-.\Debug\test_rindmod2007.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\pab2\LOCALS~1\Temp\RSP392.tmp"
-Output Window
-Compiling Fortran...
-C:\pab\workspace\PYWAFO\src\wafo\src\rind2007\split\fimod.f
-C:\pab\workspace\PYWAFO\src\wafo\src\rind2007\split\test_rindmod2007.f
-Linking...
-
-
-
-Results
-test_rindmod2007.exe - 0 error(s), 0 warning(s)
-
-
-
diff --git a/pywafo/src/wafo/source/rind2007/trivariatevar.mod b/pywafo/src/wafo/source/rind2007/trivariatevar.mod
deleted file mode 100644
index 76d4bb3..0000000
--- a/pywafo/src/wafo/source/rind2007/trivariatevar.mod
+++ /dev/null
@@ -1,50 +0,0 @@
-GFORTRAN module version '10' created from fimod.f
-MD5:2d0305398ff580834095df763e4a2991 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-()
-
-(2 'ar' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-3 'h1' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-4 'h2' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-5 'h3' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-6 'nu' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (INTEGER 4 0 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-7 'r23' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-8 'rua' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-9 'rub' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-10 'ruc' 'trivariatevar' '' 1 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE 0 0) (REAL 8 0 0 0 REAL ()) 0 0 () () 0 () () () 0
-0)
-11 'trivariatevar' 'trivariatevar' '' 1 ((MODULE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0) (UNKNOWN 0 0 0 0 UNKNOWN ()) 0 0 () ()
-0 () () () 0 0)
-)
-
-('ar' 0 2 'h1' 0 3 'h2' 0 4 'h3' 0 5 'nu' 0 6 'r23' 0 7 'rua' 0 8 'rub'
-0 9 'ruc' 0 10 'trivariatevar' 0 11)
diff --git a/pywafo/src/wafo/source/test_f90/hello.mod b/pywafo/src/wafo/source/test_f90/hello.mod
deleted file mode 100644
index df2c0fe..0000000
--- a/pywafo/src/wafo/source/test_f90/hello.mod
+++ /dev/null
@@ -1,41 +0,0 @@
-GFORTRAN module created from hello.f90 on Wed Jul 15 21:22:12 2009
-MD5:e42897d3921cc8627fe4ea5bfb648729 -- If you edit this, you'll get what you deserve.
-
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'foo' 'hello' 'foo' 1 ((PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL
-UNKNOWN SUBROUTINE) (UNKNOWN 0 0 0 UNKNOWN ()) 3 0 (4) () 0 () () 0 0)
-5 'hello' 'hello' 'hello' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 () () 0 0)
-6 'intdim' 'types' 'intdim' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE) (INTEGER 4 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '4') () 0 () () 0 0)
-7 'selected_int_kind' '(intrinsic)' 'selected_int_kind' 1 ((PROCEDURE
-UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN FUNCTION) (REAL 4 0 0 REAL ())
-0 0 () () 7 () () 0 0)
-8 'to_intdim' 'types' 'to_intdim' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION) (INTEGER 4 0 0 INTEGER ()) 9 0 (10) ()
-8 () () 0 0)
-11 'types' 'types' 'types' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 () () 0 0)
-12 'wp' 'types' 'wp' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE) (INTEGER 4 0 0 INTEGER ()) 0 0 () (CONSTANT (INTEGER 4 0
-0 INTEGER ()) 0 '4') () 0 () () 0 0)
-4 'a' '' 'a' 3 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-10 'int_value' '' 'int_value' 9 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN DUMMY) (INTEGER 8 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-)
-
-('foo' 0 2 'hello' 0 5 'intdim' 0 6 'selected_int_kind' 0 7 'to_intdim'
-0 8 'types' 0 11 'wp' 0 12)
diff --git a/pywafo/src/wafo/source/test_f90/hello.pyd b/pywafo/src/wafo/source/test_f90/hello.pyd
deleted file mode 100644
index 0cd5db6..0000000
Binary files a/pywafo/src/wafo/source/test_f90/hello.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/test_f90/mymod.pyd b/pywafo/src/wafo/source/test_f90/mymod.pyd
deleted file mode 100644
index 99d5811..0000000
Binary files a/pywafo/src/wafo/source/test_f90/mymod.pyd and /dev/null differ
diff --git a/pywafo/src/wafo/source/test_f90/types.mod b/pywafo/src/wafo/source/test_f90/types.mod
deleted file mode 100644
index 54d66ad..0000000
--- a/pywafo/src/wafo/source/test_f90/types.mod
+++ /dev/null
@@ -1,34 +0,0 @@
-GFORTRAN module created from types.f90 on Wed Jul 15 21:21:44 2009
-MD5:e10521533cef217cbd18f79ca3dd5909 -- If you edit this, you'll get what you deserve.
-
-(() () () () () () () () () () () () () () () () () () () () () () () ()
-() () ())
-
-()
-
-()
-
-()
-
-()
-
-(2 'intdim' 'types' 'intdim' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN IMPLICIT-SAVE) (INTEGER 4 0 0 INTEGER ()) 0 0 () (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '4') () 0 () () 0 0)
-3 'selected_int_kind' '(intrinsic)' 'selected_int_kind' 1 ((PROCEDURE
-UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN UNKNOWN FUNCTION) (REAL 4 0 0 REAL ())
-0 0 () () 3 () () 0 0)
-4 'to_intdim' 'types' 'to_intdim' 1 ((PROCEDURE UNKNOWN-INTENT
-MODULE-PROC DECL UNKNOWN FUNCTION) (INTEGER 4 0 0 INTEGER ()) 5 0 (6) ()
-4 () () 0 0)
-7 'types' 'types' 'types' 1 ((MODULE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN) (UNKNOWN 0 0 0 UNKNOWN ()) 0 0 () () 0 () () 0 0)
-8 'wp' 'types' 'wp' 1 ((PARAMETER UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-IMPLICIT-SAVE) (INTEGER 4 0 0 INTEGER ()) 0 0 () (CONSTANT (INTEGER 4 0
-0 INTEGER ()) 0 '4') () 0 () () 0 0)
-6 'int_value' '' 'int_value' 5 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN DUMMY) (INTEGER 8 0 0 INTEGER ()) 0 0 () () 0 () () 0 0)
-)
-
-('intdim' 0 2 'selected_int_kind' 0 3 'to_intdim' 0 4 'types' 0 7 'wp' 0
-8)
diff --git a/pywafo/src/wafo/test/test_gaussian.py b/pywafo/src/wafo/test/test_gaussian.py
deleted file mode 100644
index 3f7da42..0000000
--- a/pywafo/src/wafo/test/test_gaussian.py
+++ /dev/null
@@ -1,158 +0,0 @@
-'''
-Created on 17. juli 2010
-
-@author: pab
-'''
-import numpy as np # @UnusedImport
-from numpy import pi, inf # @UnusedImport
-# @UnusedImport
-from wafo.gaussian import (Rind, prbnormtndpc, prbnormndpc, prbnormnd,
- cdfnorm2d, prbnorm2d)
-
-
-def test_rind():
- '''
- >>> Et = 0.001946 # # exact prob.
- >>> n = 5
- >>> Blo =-np.inf; Bup=-1.2; indI=[-1, n-1] # Barriers
- >>> m = np.zeros(n); rho = 0.3;
- >>> Sc =(np.ones((n,n))-np.eye(n))*rho+np.eye(n)
- >>> rind = Rind()
- >>> E0, err0, terr0 = rind(Sc,m,Blo,Bup,indI);
-
- >>> np.abs(E0-Et)< err0+terr0
- array([ True], dtype=bool)
- >>> 'E0 = %2.6f' % E0
- 'E0 = 0.001946'
-
- >>> A = np.repeat(Blo,n); B = np.repeat(Bup,n) # Integration limits
- >>> E1, err1, terr1 = rind(np.triu(Sc),m,A,B); #same as E0
- >>> np.abs(E1-Et)< err0+terr0
- array([ True], dtype=bool)
- >>> 'E1 = %2.5f' % E1
- 'E1 = 0.00195'
-
- Compute expectation E( abs(X1*X2*...*X5) )
- >>> xc = np.zeros((0,1))
- >>> infinity = 37
- >>> dev = np.sqrt(np.diag(Sc)) # std
- >>> ind = np.nonzero(indI[1:])[0]
- >>> Bup, Blo = np.atleast_2d(Bup,Blo)
- >>> Bup[0,ind] = np.minimum(Bup[0,ind] , infinity*dev[indI[ind+1]])
- >>> Blo[0,ind] = np.maximum(Blo[0,ind] ,-infinity*dev[indI[ind+1]])
- >>> rind(Sc,m,Blo,Bup,indI, xc, nt=0)
- (array([ 0.05494076]), array([ 0.00083066]), array([ 1.00000000e-10]))
-
- Compute expectation E( X1^{+}*X2^{+} ) with random
- correlation coefficient,Cov(X1,X2) = rho2.
- >>> m2 = [0, 0]
- >>> rho2 = 0.3 #np.random.rand(1)
- >>> Sc2 = [[1, rho2], [rho2 ,1]]
- >>> Blo2 = 0; Bup2 = np.inf; indI2 = [-1, 1]
- >>> rind2 = Rind(method=1)
- >>> g2 = lambda x : (x*(np.pi/2+np.arcsin(x))+np.sqrt(1-x**2))/(2*np.pi)
- >>> E2 = g2(rho2); E2 # exact value
- 0.24137214191774381
-
- >>> E3, err3, terr3 = rind(Sc2,m2,Blo2,Bup2,indI2,nt=0); E3;err3;terr3
- array([ 0.24127499])
- array([ 0.00013838])
- array([ 1.00000000e-10])
-
- >>> E4, err4, terr4 = rind2(Sc2,m2,Blo2,Bup2,indI2,nt=0); E4;err4;terr4
- array([ 0.24127499])
- array([ 0.00013838])
- array([ 1.00000000e-10])
-
- >>> E5, err5, terr5 = rind2(Sc2,m2,Blo2,Bup2,indI2,nt=0,abseps=1e-4); E5;err5;terr5
- array([ 0.24127499])
- array([ 0.00013838])
- array([ 1.00000000e-10])
- '''
-
-
-def test_prbnormtndpc():
- '''
- >>> rho2 = np.random.rand(2)
- >>> a2 = np.zeros(2)
- >>> b2 = np.repeat(np.inf,2)
- >>> [val2,err2, ift2] = prbnormtndpc(rho2,a2,b2)
- >>> g2 = lambda x : 0.25+np.arcsin(x[0]*x[1])/(2*pi)
- >>> E2 = g2(rho2) #% exact value
- >>> np.abs(E2-val2)>> rho3 = np.random.rand(3)
- >>> a3 = np.zeros(3)
- >>> b3 = np.repeat(inf,3)
- >>> [val3,err3, ift3] = prbnormtndpc(rho3,a3,b3)
- >>> g3 = lambda x : 0.5-sum(np.sort(np.arccos([x[0]*x[1],x[0]*x[2],x[1]*x[2]])))/(4*pi)
- >>> E3 = g3(rho3) # Exact value
- >>> np.abs(E3-val3)>> rho2 = np.random.rand(2)
- >>> a2 = np.zeros(2);
- >>> b2 = np.repeat(np.inf,2)
- >>> [val2,err2, ift2] = prbnormndpc(rho2,a2,b2)
- >>> g2 = lambda x : 0.25+np.arcsin(x[0]*x[1])/(2*pi)
- >>> E2 = g2(rho2) #% exact value
- >>> np.abs(E2-val2)>> rho3 = np.random.rand(3)
- >>> a3 = np.zeros(3)
- >>> b3 = np.repeat(inf,3)
- >>> [val3,err3, ift3] = prbnormndpc(rho3,a3,b3)
- >>> g3 = lambda x : 0.5-sum(np.sort(np.arccos([x[0]*x[1],x[0]*x[2],x[1]*x[2]])))/(4*pi)
- >>> E3 = g3(rho3) # Exact value
- >>> np.abs(E3-val3)>> import numpy as np
- >>> Et = 0.001946 # # exact prob.
- >>> n = 5
- >>> Blo =-np.inf; Bup=-1.2
- >>> m = np.zeros(n); rho = 0.3;
- >>> Sc =(np.ones((n,n))-np.eye(n))*rho+np.eye(n)
- >>> A = np.repeat(Blo,n)
- >>> B = np.repeat(Bup,n)-m
- >>> [val,err,inform] = prbnormnd(Sc,A,B)
- >>> np.abs(val-Et)< err
- True
- >>> 'val = %2.5f' % val
- 'val = 0.00195'
- '''
-
-
-def test_cdfnorm2d():
- '''
- >>> x = np.linspace(-3,3,3)
- >>> [b1,b2] = np.meshgrid(x,x)
- >>> r = 0.3
- >>> cdfnorm2d(b1,b2,r)
- array([[ 2.38515157e-05, 1.14504149e-03, 1.34987703e-03],
- [ 1.14504149e-03, 2.98493342e-01, 4.99795143e-01],
- [ 1.34987703e-03, 4.99795143e-01, 9.97324055e-01]])
- '''
-
-
-def test_prbnorm2d():
- '''
- >>> a = [-1, -2]
- >>> b = [1, 1]
- >>> r = 0.3
- >>> prbnorm2d(a,b,r)
- array([ 0.56659121])
- '''
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/pywafo/src/wafo/transform/models.~py b/pywafo/src/wafo/transform/models.~py
deleted file mode 100644
index 1945ba1..0000000
--- a/pywafo/src/wafo/transform/models.~py
+++ /dev/null
@@ -1,557 +0,0 @@
-#-------------------------------------------------------------------------------
-# Name: transform.models
-# Purpose:
-#
-# Author: pab
-#
-# Created: 24.11.2008
-# Copyright: (c) pab 2008
-# Licence:
-#-------------------------------------------------------------------------------
-#!/usr/bin/env python
-
-from scipy.optimize import brentq
-from scipy.integrate import trapz
-from numpy import (sqrt, atleast_1d, abs, imag, sign, where, cos, arccos, ceil,
- expm1,log1p)
-import numpy as np
-import warnings
-
-__all__=['TrHermite','TrOchi']
-class TrCommon(object):
- """
- transformation model, g, from the moments of the process.
-
- Information about the moments of the process can be obtained by site
- specific data, laboratory measurements or by resort to theoretical models.
-
- Assumption
- ----------
- The Gaussian process, Y, distributed N(0,1) is related to the
- non-Gaussian process, X, by Y = g(X).
-
- Methods
- -------
- dist2gauss : int (g(x)-xn)^2 dx where int. limits is given by X. This
- is a measure of departure from the Gaussian model.
- dat2gauss : transform non-linear data to Gaussian scale
- gauss2dat : transform Gaussian data to non-linear scale
-
- Member variables
- ----------------
- mean, sigma, skew, kurt : real, scalar
- mean, standard-deviation, skewness and kurtosis, respectively, of the
- non-Gaussian process. Default mean=0, sigma=1, skew=0.16, kurt=3.04.
- skew=kurt-3=0 for a Gaussian process.
- """
- def __init__(self,mean=0.0,var=1.0,skew=0.16,kurt=3.04,sigma=None,*args,**kwds):
- if sigma is None:
- sigma = sqrt(var)
- self.mean = mean
- self.sigma = sigma
- self.skew = skew
- self.kurt = kurt
-
- def __call__(self,x):
- return self._dat2gauss(x)
-
- def dist2gauss(self,x=None,xnmin=-5,xnmax=5,n=513):
- """ Return a measure of departure from the Gaussian model.
-
- Parameters
- ----------
- x : vector (default sigma*linspace(xnmin,xnmax,n)+mean)
- xnmin : real, scalar
- minimum on normalized scale
- xnmax : real, scalar
- maximum on normalized scale
- n : integer, scalar
- number of evaluation points
-
-
- Returns
- -------
- t0 = real, scalar
- a measure of departure from the Gaussian model calculated as
- trapz(xn,(xn-g(x))**2.) where int. limits is given by X.
- """
- if x is None:
- xn = np.linspace(xnmin,xnmax,n)
- x = self.sigma*xn+self.mean
- else:
- xn = (x-self.mean)/self.sigma
-
- g = self._dat2gauss(x)
- t0 = trapz(xn,(xn-g)**2.)
- return t0
-
- def gauss2dat(self,y):
- """ Transforms Gaussian data, y, to non-linear scale.
-
- Parameters
- ----------
- y : array-like
- input vector with Gaussian data values.
-
- Returns
- -------
- x : array-like
- transformed data to a non-linear scale
-
-
- See also
- --------
- dat2gauss
- tranproc.
- """
- return self._gauss2dat(y)
- def dat2gauss(self,x):
- """ Transforms non-linear data, x, to Gaussian scale.
-
- Parameters
- ----------
- x : array-like
- input vector with non-linear data values.
-
- Returns
- -------
- y : array-like
- transformed data to a Gaussian scale
-
- See also
- --------
- gauss2dat
- tranproc.
- """
- return self._dat2gauss(x)
-
-class TrHermite(TrCommon):
- __doc__ = TrCommon.__doc__.replace('','Hermite') + """
- pardef : scalar, integer
- 1 Winterstein et. al. (1994) parametrization [1]_ (default)
- 2 Winterstein (1988) parametrization [2]_
-
- Description
- -----------
- The hermite transformation model is monotonic cubic polynomial, calibrated
- such that the first 4 moments of the transformed model G(y)=g^-1(y) match
- the moments of the true process. The model is given as:
-
- g(x) = xn - c3(xn**2-1) - c4*(xn**3-3*xn)
-
- for kurt<3 (hardening model) where
- xn = (x-mean)/sigma
- c3 = skew/6
- c4 = (kurt-3)/24.
-
- or
- G(y) = mean + K*sigma*[ y + c3(y**2-1) + c4*(y**3-3*y) ]
-
- for kurt>=3 (softening model) where
- y = g(x) = G**-1(x)
- K = 1/sqrt(1+2*c3^2+6*c4^2)
- If pardef = 1 :
- c3 = skew/6*(1-0.015*abs(skew)+0.3*skew^2)/(1+0.2*(kurt-3))
- c4 = 0.1*((1+1.25*(kurt-3))^(1/3)-1)*c41
- c41 = (1-1.43*skew^2/(kurt-3))^(1-0.1*(kurt)^0.8)
- If pardef = 2 :
- c3 = skew/(6*(1+6*c4))
- c4 = [sqrt(1+1.5*(kurt-3))-1]/18
-
-
- Example:
- --------
- # Simulate a Transformed Gaussian process:
- Hm0=7;Tp=11;
- S = jonswap([],[Hm0 Tp]);
- g=hermitetr*Hm0/4;
- ys = spec2sdat(S,15000); % Simulated in the Gaussian world
- xs = gaus2dat(ys,g); % Transformed to the real world
-
- See also spec2skew, ochitr, lc2tr, dat2tr
-
- References
- ----------
- .. [1] Winterstein, S.R, Ude, T.C. and Kleiven, G. (1994)
- "Springing and slow drift responses:
- predicted extremes and fatigue vs. simulation"
- In Proc. 7th International behaviour of Offshore structures, (BOSS)
- Vol. 3, pp.1-15
- .. [2] Winterstein, S.R. (1988)
- 'Nonlinear vibration models for extremes and fatigue.'
- J. Engng. Mech., ASCE, Vol 114, No 10, pp 1772-1790
- """
- def __init__(self,mean=0.0,var=1.0,skew=0.16,kurt=3.04,sigma=None,pardef=0):
- if sigma==None:
- sigma = sqrt(var)
- self.sigma = sigma
- self.skew = skew
- self.kurt = kurt
- self.mean = mean
- self.pardef = pardef
- self._c3 = None
- self._c4 = None
- self._forward = None
- self._backward = None
- self._x_limit = None
- self.set_poly()
-
- def _poly_par_from_stats(self):
- skew = self.skew
- ga2 = self.kurt-3.0
- if ga2<=0:
- self._c4 = ga2/24.
- self._c3 = skew/6.
- elif self.pardef==2:
- #% Winterstein 1988 parametrization
- if skew**2>8*(ga2+3.)/9.:
- warnings.warn('Kurtosis too low compared to the skewness')
-
- self._c4 = (sqrt(1.+1.5*ga2)-1.)/18.;
- self._c3 = skew/(6.*(1+6.*c4))
- else:
- # Winterstein et. al. 1994 parametrization intended to
- # apply for the range: 0 <= ga2 < 12 and 0<= skew^2 < 2*ga2/3
- if skew**2>2*(ga2)/3:
- warnings.warn('Kurtosis too low compared to the skewness')
-
- if (ga2 < 0) or (12 < ga2):
- warnings.warn('Kurtosis must be between 0 and 12')
-
- self._c3 = skew/6*(1-0.015*abs(skew)+0.3*skew**2)/(1+0.2*ga2);
- if ga2==0.:
- self._c4=0.0;
- else:
- c41= (1.-1.43*skew**2./ga2)**(1.-0.1*(ga2+3.)**0.8);
- self._c4 = 0.1*((1.+1.25*ga2)**(1./3.)-1.)*c41;
-
- if not np.isfinite(self._c3) or not np.isfinite(self._c4):
- raise ValueError('Unable to calculate the polynomial')
- def set_poly(self):
-
- if self._c3 is None:
- self._poly_par_from_stats()
- eps = np.finfo(float).eps
- c3 = self._c3
- c4 = self._c4
- ma = self.mean
- sa = self.sigma
- if abs(c4)0:
- # Compute where it is possible to invert the polynomial
- if self.kurt<3.:
- self._x_limit = r;
- else:
- self._x_limit = sa*p(r)+ma
-
- txt1 = 'The polynomial is not a strictly increasing function.';
- txt2 = 'The derivative of g(x) is infinite at x = %g' % self._x_limit
- warnings.warn('%s \n %s ' % (txt1,txt2))
- return
- def check_forward(self,x):
- if not (self._x_limit is None):
- x00 = self._x_limit
- txt2 = 'for the given interval x = [%g, %g]' % (x[0],x[-1])
-
- if any(np.logical_and(x[0]<= x00, x00 <= x[-1])):
- cdef = 1;
- else:
- cdef = sum( np.logical_xor(x00 <= x[0] , x00 <= x[-1]));
-
- if np.mod(cdef,2):
- errtxt = 'Unable to invert the polynomial \n %s' % txt2
- raise ValueError(errtxt)
- np.disp('However, successfully inverted the polynomial\n %s' % txt2)
-
-
- def _dat2gauss(self,x):
- x = np.atleast_1d(x)
- self.check_forward(x)
-
- xn = (x-self.mean)/self.sigma
-
- if self._forward is None:
- #% Inverting the polynomial
- #%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- return self._poly_inv(self._backward,xn)
- else:
- return self._forward(xn)
-
- def _gauss2dat(self,y):
- y = np.atleast_1d(y)
- #self.check_forward(y)
-
- if self._backward is None:
- #% Inverting the polynomial
- #%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- xn = self._poly_inv(self._forward,y)
- else:
- xn = self._backward(y)
- return self.sigma*xn + self.mean
- def _poly_inv(self,p,xn):
-
- if p.order<2:
- return xn
- elif p.order==2:
- # Quadratic: Solve a*u**2+b*u+c = xn
- coefs = p.coeffs
- a = coefs[0]
- b = coefs[1]
- c = coefs[2]-xn
- t = 0.5*(b+sign(b)*sqrt(b**2-4*a*c))
- #so1 = t/a # largest solution
- so2 = -c/t # smallest solution
- return so2
- elif p.order==3:
- # Solve
- # K*(c4*u^3+c3*u^2+(1-3*c4)*u-c3) = xn = (x-ma)/sa
- # -c4*xn^3-c3*xn^2+(1+3*c4)*xn+c3 = u
- coefs = p.coeffs[1::]/p.coeffs[0]
- a = coefs[0]
- b = coefs[1]
- c = coefs[2]-xn/p.coeffs[0]
-
- x0 = a/3.
- #% substitue xn = z-x0 and divide by c4 => z^3 + 3*p1*z+2*q0 = 0
- p1 = b/3-x0**2
- #p1 = (b-a**2/3)/3
-
-
- #q0 = (c + x0*(2.*x0/3.-b))/2.
- #q0 = x0**3 -a*b/6 +c/2
- q0 = x0*(x0**2-b/2)+c/2
-## # z^3+3*p1*z+2*q0=0
-
-## c3 = self._c3
-## c4 = self._c4
-## b1 = 1./(3.*c4);
-## #x0 = c3*b1 ;
-## #% substitue u = z-x0 and divide by c4 => z^3 + 3*c*z+2*q0 = 0
-## #p1 = b1-1.-x0**2.
-## Km1 = np.sqrt(1.+2.*c3**2+6*c4**2);
-## q0 = x0**3-1.5*b1*(x0+xn*Km1)
- #q0 = x0**3-1.5*b1*(x0+xn)
- if not (self._x_limit is None): # % Three real roots
- d = sqrt(-p1);
- theta1 = arccos(-q0/d**3)/3;
- th2 = np.r_[0, -2*pi/3, 2*pi/3];
- x1 = abs(2*d*cos(theta1[ceil(len(xn)/2)] + th2)-x0);
- ix = x1.argmin() #; % choose the smallest solution
- return 2.*d*cos(theta1 + th2[ix])-x0
- else: # %Only one real root exist
- q1 = sqrt((q0)**2+p1**3);
- #% Find the real root of the monic polynomial
- A0 = (q1-q0)**(1./3.);
- B0 = -(q1+q0)**(1./3.);
- return A0+B0-x0; #% real root
- #%% The other complex roots are given by
- #%x= -(A0+B0)/2+(A0-B0)*sqrt(3)/2-x0;
- #%x=-(A0+B0)/2+(A0-B0)*sqrt(-3)/2-x0;
-
-
-class TrOchi(TrCommon):
- __doc__ = TrCommon.__doc__.replace('','Ochi') + """
-
- Description
- -----------
- The Ochi transformation model is a monotonic exponential function,
- calibrated such that the first 3 moments of the transformed model
- G(y)=g^-1(y) match the moments of the true process. However, the
- skewness is limited by ABS(SKEW)<2.82. According to Ochi it is
- appropriate for a process with very strong non-linear characteristics.
- The model is given as:
- g(x) = ((1-exp(-gamma*(x-mean)/sigma))/gamma-mean2)/sigma2
- where
- gamma = 1.28*a for x>=mean
- 3*a otherwise
- mean,
- sigma = standard deviation and mean, respectively, of the process.
- mean2,
- sigma2 = normalizing parameters in the transformed world, i.e., to
- make the gaussian process in the transformed world is N(0,1).
-
- The unknown parameters a, mean2 and sigma2 are found by solving the
- following non-linear equations:
-
- a*(sigma2^2+mean2^2)+mean2 = 0
- sigma2^2-2*a^2*sigma2^4 = 1
- 2*a*sigma2^4*(3-8*a^2*sigma2^2) = skew
-
- Note
- ----
- Transformation, g, does not have continous derivatives of 2'nd order or higher.
-
- Example
- -------
- #Simulate a Transformed Gaussian process:
- Hm0=7;Tp=11;
- S = jonswap([],[Hm0 Tp]); [sk ku ma]=spec2skew(S);
- g = ochitr([],[Hm0/4,sk,ma]); g2=[g(:,1), g(:,2)*Hm0/4];
- ys = spec2sdat(S,15000); % Simulated in the Gaussian world
- xs = gaus2dat(ys,g2); % Transformed to the real world
-
- See also
- --------
- spec2skew, hermitetr, lc2tr, dat2tr
-
- References
- ----------
- Ochi, M.K. and Ahn, K. (1994)
- 'Non-Gaussian probability distribution of coastal waves.'
- In Proc. 24th Conf. Coastal Engng, Vol. 1, pp 482-496
-
- Michel K. Ochi (1998),
- "OCEAN WAVES, The stochastic approach",
- OCEAN TECHNOLOGY series 6, Cambridge, pp 255-275.
- """
-
- def __init__(self,mean=0.0,var=1.0,skew=0.16,sigma=None):
- if sigma is None:
- sigma = sqrt(var)
- self.mean = mean
- self.sigma = sigma
- self.skew = skew
- self.phat = None
- if abs(self.skew)>2.82842712474619:
- raise ValueError('Skewness must be less than 2.82842')
-
-
- def _par_from_stats(self):
- skew = self.skew
- ma = self.mean
- sig1 = self.sigma
-
- if skew==0:
- self.phat = [0, 0, sig1, ma,1, 0];
- return
-
- #% Solve the equations to obtain the gamma parameters:
- #%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- #% a*(sig2^2+ma2^2)+ma2 = 0
- #% sig2^2-2*a^2*sig2^4 = E(y^2) % =1
- #% 2*a*sig2^4*(3-8*a^2*sig2^2) = E(y^3) % = skew
-
- #% Let x = [a sig2^2 ]
- #% Set up the 2D non-linear equations for a and sig2^2:
- #g1='[x(2)-2.*x(1).^2.*x(2).^2-P1, 2.*x(1).*x(2).^2.*(3-8.*x(1).^2.*x(2))-P2 ]';
- #% Or solve the following 1D non-linear equation for sig2^2:
- g2 = lambda x: -sqrt(abs(x-1)*2)*(3.*x-4*abs(x-1))+abs(skew)
-
-
- a1 = 1. #; % Start interval where sig2^2 is located.
- a2 = 2.
-
- sig22 = brentq(g2,a1,a2) #% smallest solution for sig22
- a = sign(skew)*sqrt(abs(sig22-1)/2/sig22**2);
-
- sig2 = sqrt(sig22);
-
- #% Solve the following 2nd order equation to obtain ma2
- #% a*(sig2^2+ma2^2)+ma2 = 0
- my2 = (-1.-sqrt(1.-4.*a**2*sig22))/a; #% Largest mean
- ma2 = a*sig22/my2 ; #% choose the smallest mean
-
- gam_a = 1.28*a
- gam_b = 3*a
- # this is valid for processes with very strong
- # nonlinear characteristics
- self.phat = [gam_a, gam_b, sig1, ma, sig2, ma2];
-
- return
-
-
-
- def _dat2gauss(self,x):
-
- if self.phat is None:
- self._par_from_stats()
-
- ga =self.phat[0];
- gb = self.phat[1]
- sigma = self.phat[2]
- ma = self.phat[3]
- sigma2 = self.phat[4]
- ma2 = self.phat[5]
-
-
-
-
- igp,=where(ma<=x);
- igm,=where(x=1.4
+numdifftools>=0.2
+scipy>=0.9
+matplotlib
+
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..305b72a
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,94 @@
+[metadata]
+name = wafo
+summary = Wave Analysis for Fatigue and Oceanography
+author = WAFO-group
+author-email = none
+license = GPLv3
+home-page = http://www.maths.lth.se/matstat/wafo/
+description-file = README.rst
+# Add here all kinds of additional classifiers as defined under
+# https://pypi.python.org/pypi?%3Aaction=list_classifiers
+classifiers = Development Status :: 4 - Beta,
+ Programming Language :: Python,
+ Programming Language :: Python :: 2.7,
+ Programming Language :: Python :: 3,
+ Programming Language :: Python :: 3.3,
+ Programming Language :: Python :: 3.4,
+ Environment :: Console,
+ Intended Audience :: Education,
+ Intended Audience :: Science/Research,
+ License :: OSI Approved :: GPL License,
+ Operating System :: OS Independent,
+ Operating System :: POSIX :: Linux,
+ Operating System :: Unix,
+ Operating System :: MacOS,
+ Operating System :: Microsoft :: Windows
+ Topic :: Scientific/Engineering :: Mathematics
+
+[entry_points]
+# Add here console scripts like:
+# console_scripts =
+# hello_world = wafo.module:function
+# as well as other entry_points.
+
+
+[files]
+# Add here 'data_files', 'packages' or 'namespace_packages'.
+# Additional data files are defined as key value pairs of source and target:
+packages =
+ wafo
+# data_files =
+# share/wafo_docs = docs/*
+
+[extras]
+# Add here additional requirements for extra features, like:
+# PDF =
+# ReportLab>=1.2
+# RXP
+
+[test]
+# py.test options when running `python setup.py test`
+addopts =
+ wafo/tests
+ wafo/covariance/tests
+ wafo/spectrum/tests
+ wafo/covariance/tests
+ wafo/transform/tests
+ wafo/wave_theory/tests
+# wafo/stats/tests
+
+[pytest]
+# Options for py.test:
+# Specify command line options as you would do when invoking py.test directly.
+# e.g. --cov-report html (or xml) for html/xml output or --junitxml junit.xml
+# in order to write a coverage file that can be read by Jenkins.
+addopts =
+ --cov wafo --cov-report term-missing
+ --verbose
+
+[aliases]
+docs = build_sphinx
+
+[bdist_wheel]
+# Use this option if your package is pure-python
+universal = 0
+
+[build_sphinx]
+source_dir = docs
+build_dir = docs/_build
+
+[pbr]
+# Let pbr run sphinx-apidoc
+autodoc_tree_index_modules = True
+# autodoc_tree_excludes = ...
+# Let pbr itself generate the apidoc
+# autodoc_index_modules = True
+# autodoc_exclude_modules = ...
+# Convert warnings to errors
+# warnerrors = True
+
+[devpi:upload]
+# Options for the devpi: PyPI serer and packaging tool
+# VCS export must be deactivated since we are using setuptools-scm
+no-vcs = 1
+format = bdist_wheel
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..f737f74
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Setup file for wafo.
+
+ This file was generated with PyScaffold 2.4.2, a tool that easily
+ puts up a scaffold for your new Python project. Learn more under:
+ http://pyscaffold.readthedocs.org/
+"""
+
+from __future__ import division, absolute_import, print_function
+
+# numpy.distutils will figure out if setuptools is available when imported
+# this allows us to combine setuptools use_pyscaffold=True and f2py extensions
+import setuptools
+from numpy.distutils.core import setup
+from numpy.distutils.misc_util import Configuration
+
+import sys
+
+
+def setup_package_pyscaffold():
+
+ config = Configuration('wafo')
+
+ # -------------------------------------------------------------------------
+ # c_library
+ config.add_extension('c_library',
+ sources=['wafo/source/c_library/c_library.pyf',
+ 'wafo/source/c_library/c_functions.c'])
+ # -------------------------------------------------------------------------
+ # mvn
+ config.add_extension('mvn',
+ sources=['wafo/source/mvn/mvn.pyf',
+ 'wafo/source/mvn/mvndst.f'])
+
+ # -------------------------------------------------------------------------
+ # mvnprdmod
+ lib_mvnprdmod_src = ['wafo/source/mvnprd/mvnprd.f',
+ 'wafo/source/mvnprd/mvnprodcorrprb.f']
+ config.add_library('_mvnprdmod', sources=lib_mvnprdmod_src)
+ config.add_extension('mvnprdmod',
+ sources=['wafo/source/mreg/cov2mmpdfreg_intfc.f'],
+ libraries=['_mvnprdmod'],
+ depends=(lib_mvnprdmod_src))
+
+ # -------------------------------------------------------------------------
+ # cov2mod
+ lib_cov2mod_src = ['wafo/source/mreg/dsvdc.f',
+ 'wafo/source/mreg/mregmodule.f',
+ 'wafo/source/mreg/intfcmod.f']
+ config.add_library('_cov2mod', sources=lib_cov2mod_src)
+ config.add_extension('cov2mod',
+ sources=['wafo/source/mreg/cov2mmpdfreg_intfc.f'],
+ libraries=['_cov2mod'],
+ include_dirs=['wafo/source/mreg/'],
+ depends=(lib_cov2mod_src))
+
+ # -------------------------------------------------------------------------
+ # rindmod
+ lib_rindmod_src = ['wafo/source/rind2007/intmodule.f',
+ 'wafo/source/rind2007/jacobmod.f',
+ 'wafo/source/rind2007/swapmod.f',
+ 'wafo/source/rind2007/fimod.f',
+ 'wafo/source/rind2007/rindmod.f',
+ 'wafo/source/rind2007/rind71mod.f']
+ config.add_library('_rindmod', sources=lib_rindmod_src)
+ config.add_extension('rindmod',
+ sources=['wafo/source/rind2007/rind_interface.f'],
+ libraries=['_rindmod'],
+ include_dirs=['wafo/source/mreg/'],
+ depends=(lib_rindmod_src))
+
+ needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
+ sphinx = ['sphinx'] if needs_sphinx else []
+ setup(setup_requires=['six', 'pyscaffold>=2.4rc1,<2.5a0'] + sphinx,
+ tests_require=['pytest_cov', 'pytest'],
+ use_pyscaffold=True,
+ **config.todict())
+
+
+if __name__ == "__main__":
+ setup_package_pyscaffold()
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..653a2fe
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,24 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27, py32, py33, py34, report
+
+[testenv]
+changedir=tests
+deps =
+ -r./requirements.txt
+ coverage
+ coveralls
+commands =
+ coverage run --source=wafo setup.py test
+
+[testenv:report]
+basepython = python2.7
+commands =
+ coverage combine
+ coverage report -m
+usedevelop = true
+
diff --git a/pywafo/src/wafo/MSO.py b/wafo/MSO.py
similarity index 100%
rename from pywafo/src/wafo/MSO.py
rename to wafo/MSO.py
diff --git a/pywafo/src/wafo/MSPPT.py b/wafo/MSPPT.py
similarity index 100%
rename from pywafo/src/wafo/MSPPT.py
rename to wafo/MSPPT.py
diff --git a/pywafo/src/wafo/SpecData1D.mm b/wafo/SpecData1D.mm
similarity index 100%
rename from pywafo/src/wafo/SpecData1D.mm
rename to wafo/SpecData1D.mm
diff --git a/pywafo/src/wafo/__init__.py b/wafo/__init__.py
similarity index 100%
rename from pywafo/src/wafo/__init__.py
rename to wafo/__init__.py
diff --git a/pywafo/src/wafo/autumn.gif b/wafo/autumn.gif
similarity index 100%
rename from pywafo/src/wafo/autumn.gif
rename to wafo/autumn.gif
diff --git a/pywafo/src/wafo/bitwise.py b/wafo/bitwise.py
similarity index 100%
rename from pywafo/src/wafo/bitwise.py
rename to wafo/bitwise.py
diff --git a/pywafo/src/wafo/containers.py b/wafo/containers.py
similarity index 96%
rename from pywafo/src/wafo/containers.py
rename to wafo/containers.py
index 4b5245b..4773601 100644
--- a/pywafo/src/wafo/containers.py
+++ b/wafo/containers.py
@@ -1,5 +1,5 @@
import warnings
-from graphutil import cltext # @UnresolvedImport
+from wafo.graphutil import cltext # @UnresolvedImport
from plotbackend import plotbackend
from time import gmtime, strftime
diff --git a/pywafo/src/wafo/covariance/__init__.py b/wafo/covariance/__init__.py
similarity index 100%
rename from pywafo/src/wafo/covariance/__init__.py
rename to wafo/covariance/__init__.py
diff --git a/pywafo/src/wafo/covariance/core.py b/wafo/covariance/core.py
similarity index 100%
rename from pywafo/src/wafo/covariance/core.py
rename to wafo/covariance/core.py
diff --git a/pywafo/src/wafo/covariance/estimation.py b/wafo/covariance/estimation.py
similarity index 100%
rename from pywafo/src/wafo/covariance/estimation.py
rename to wafo/covariance/estimation.py
diff --git a/pywafo/src/wafo/test/__init__.py b/wafo/covariance/tests/__init__.py
similarity index 100%
rename from pywafo/src/wafo/test/__init__.py
rename to wafo/covariance/tests/__init__.py
diff --git a/wafo/covariance/tests/conftest.py b/wafo/covariance/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/wafo/covariance/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/pywafo/src/wafo/covariance/test/test_covariance.py b/wafo/covariance/tests/test_covariance.py
similarity index 100%
rename from pywafo/src/wafo/covariance/test/test_covariance.py
rename to wafo/covariance/tests/test_covariance.py
diff --git a/pywafo/src/wafo/data/__init__.py b/wafo/data/__init__.py
similarity index 100%
rename from pywafo/src/wafo/data/__init__.py
rename to wafo/data/__init__.py
diff --git a/pywafo/src/wafo/data/atlantic.dat b/wafo/data/atlantic.dat
similarity index 100%
rename from pywafo/src/wafo/data/atlantic.dat
rename to wafo/data/atlantic.dat
diff --git a/pywafo/src/wafo/data/gfaks89.dat b/wafo/data/gfaks89.dat
similarity index 100%
rename from pywafo/src/wafo/data/gfaks89.dat
rename to wafo/data/gfaks89.dat
diff --git a/pywafo/src/wafo/data/gfaksr89.dat b/wafo/data/gfaksr89.dat
similarity index 100%
rename from pywafo/src/wafo/data/gfaksr89.dat
rename to wafo/data/gfaksr89.dat
diff --git a/pywafo/src/wafo/data/info.py b/wafo/data/info.py
similarity index 100%
rename from pywafo/src/wafo/data/info.py
rename to wafo/data/info.py
diff --git a/pywafo/src/wafo/data/japansea.dat b/wafo/data/japansea.dat
similarity index 100%
rename from pywafo/src/wafo/data/japansea.dat
rename to wafo/data/japansea.dat
diff --git a/pywafo/src/wafo/data/northsea.dat b/wafo/data/northsea.dat
similarity index 100%
rename from pywafo/src/wafo/data/northsea.dat
rename to wafo/data/northsea.dat
diff --git a/pywafo/src/wafo/data/sea.dat b/wafo/data/sea.dat
similarity index 100%
rename from pywafo/src/wafo/data/sea.dat
rename to wafo/data/sea.dat
diff --git a/pywafo/src/wafo/data/sea.m b/wafo/data/sea.m
similarity index 100%
rename from pywafo/src/wafo/data/sea.m
rename to wafo/data/sea.m
diff --git a/pywafo/src/wafo/data/sfa89.dat b/wafo/data/sfa89.dat
similarity index 100%
rename from pywafo/src/wafo/data/sfa89.dat
rename to wafo/data/sfa89.dat
diff --git a/pywafo/src/wafo/data/sn.dat b/wafo/data/sn.dat
similarity index 100%
rename from pywafo/src/wafo/data/sn.dat
rename to wafo/data/sn.dat
diff --git a/pywafo/src/wafo/data/wafoLogoNewWithBorder.png b/wafo/data/wafoLogoNewWithBorder.png
similarity index 100%
rename from pywafo/src/wafo/data/wafoLogoNewWithBorder.png
rename to wafo/data/wafoLogoNewWithBorder.png
diff --git a/pywafo/src/wafo/data/wafoLogoNewWithBorder.svg b/wafo/data/wafoLogoNewWithBorder.svg
similarity index 100%
rename from pywafo/src/wafo/data/wafoLogoNewWithBorder.svg
rename to wafo/data/wafoLogoNewWithBorder.svg
diff --git a/pywafo/src/wafo/data/wafoLogoNewWithoutBorder.png b/wafo/data/wafoLogoNewWithoutBorder.png
similarity index 100%
rename from pywafo/src/wafo/data/wafoLogoNewWithoutBorder.png
rename to wafo/data/wafoLogoNewWithoutBorder.png
diff --git a/pywafo/src/wafo/data/wafoLogoNewWithoutBorder.svg b/wafo/data/wafoLogoNewWithoutBorder.svg
similarity index 100%
rename from pywafo/src/wafo/data/wafoLogoNewWithoutBorder.svg
rename to wafo/data/wafoLogoNewWithoutBorder.svg
diff --git a/pywafo/src/wafo/data/wafologoWithBorder.png b/wafo/data/wafologoWithBorder.png
similarity index 100%
rename from pywafo/src/wafo/data/wafologoWithBorder.png
rename to wafo/data/wafologoWithBorder.png
diff --git a/pywafo/src/wafo/data/yura87.dat b/wafo/data/yura87.dat
similarity index 100%
rename from pywafo/src/wafo/data/yura87.dat
rename to wafo/data/yura87.dat
diff --git a/pywafo/src/wafo/dctpack.py b/wafo/dctpack.py
similarity index 100%
rename from pywafo/src/wafo/dctpack.py
rename to wafo/dctpack.py
diff --git a/pywafo/src/wafo/definitions.py b/wafo/definitions.py
similarity index 100%
rename from pywafo/src/wafo/definitions.py
rename to wafo/definitions.py
diff --git a/pywafo/src/wafo/demo_sg.py b/wafo/demo_sg.py
similarity index 100%
rename from pywafo/src/wafo/demo_sg.py
rename to wafo/demo_sg.py
diff --git a/pywafo/src/wafo/demos.py b/wafo/demos.py
similarity index 100%
rename from pywafo/src/wafo/demos.py
rename to wafo/demos.py
diff --git a/pywafo/src/wafo/doc/__init__.py b/wafo/doc/__init__.py
similarity index 100%
rename from pywafo/src/wafo/doc/__init__.py
rename to wafo/doc/__init__.py
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 1.ipynb b/wafo/doc/tutorial_scripts/WAFO Chapter 1.ipynb
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 1.ipynb
rename to wafo/doc/tutorial_scripts/WAFO Chapter 1.ipynb
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 2.ipynb b/wafo/doc/tutorial_scripts/WAFO Chapter 2.ipynb
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 2.ipynb
rename to wafo/doc/tutorial_scripts/WAFO Chapter 2.ipynb
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 3.ipynb b/wafo/doc/tutorial_scripts/WAFO Chapter 3.ipynb
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 3.ipynb
rename to wafo/doc/tutorial_scripts/WAFO Chapter 3.ipynb
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 4.ipynb b/wafo/doc/tutorial_scripts/WAFO Chapter 4.ipynb
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 4.ipynb
rename to wafo/doc/tutorial_scripts/WAFO Chapter 4.ipynb
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 5.ipynb b/wafo/doc/tutorial_scripts/WAFO Chapter 5.ipynb
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/WAFO Chapter 5.ipynb
rename to wafo/doc/tutorial_scripts/WAFO Chapter 5.ipynb
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/chapter1.py b/wafo/doc/tutorial_scripts/chapter1.py
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/chapter1.py
rename to wafo/doc/tutorial_scripts/chapter1.py
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/chapter2.py b/wafo/doc/tutorial_scripts/chapter2.py
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/chapter2.py
rename to wafo/doc/tutorial_scripts/chapter2.py
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/chapter3.py b/wafo/doc/tutorial_scripts/chapter3.py
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/chapter3.py
rename to wafo/doc/tutorial_scripts/chapter3.py
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/chapter4.py b/wafo/doc/tutorial_scripts/chapter4.py
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/chapter4.py
rename to wafo/doc/tutorial_scripts/chapter4.py
diff --git a/pywafo/src/wafo/doc/tutorial_scripts/chapter5.py b/wafo/doc/tutorial_scripts/chapter5.py
similarity index 100%
rename from pywafo/src/wafo/doc/tutorial_scripts/chapter5.py
rename to wafo/doc/tutorial_scripts/chapter5.py
diff --git a/pywafo/src/wafo/f2py_tools.py b/wafo/f2py_tools.py
similarity index 91%
rename from pywafo/src/wafo/f2py_tools.py
rename to wafo/f2py_tools.py
index 77ce15e..ab591d8 100644
--- a/pywafo/src/wafo/f2py_tools.py
+++ b/wafo/f2py_tools.py
@@ -39,16 +39,17 @@ def which(program):
def f2py_call_str():
'''Return which f2py callable is in the path regardless of platform'''
-
+
# define possible options:
# on Arch Linux, python and f2py are the calls corresponding to python 3
# and python2/f2py2 for python 2
# other Linux versions might still use python/f2py for python 2
-
+
if os.path.basename(sys.executable).endswith('2'):
options = ('f2py2', 'f2py2.6', 'f2py2.7',)
else: # on Windows and other Linux using python/f2py
- options = ('f2py.bat', 'f2py', 'f2py2.6', 'f2py2.7', 'f2py.py',)
+ options = ('f2py.exe', 'f2py.bat', 'f2py', 'f2py2.6', 'f2py2.7',
+ 'f2py.py',)
for k in options:
if which(k):
# Found the f2py path, no need to look further
@@ -62,4 +63,3 @@ def f2py_call_str():
except NameError:
raise UserWarning('Couldn\'t locate f2py. '
'Should be part of NumPy installation.')
-
diff --git a/pywafo/src/wafo/fig.py b/wafo/fig.py
similarity index 100%
rename from pywafo/src/wafo/fig.py
rename to wafo/fig.py
diff --git a/pywafo/src/wafo/gaussian.py b/wafo/gaussian.py
similarity index 98%
rename from pywafo/src/wafo/gaussian.py
rename to wafo/gaussian.py
index 2602cfc..6716148 100644
--- a/pywafo/src/wafo/gaussian.py
+++ b/wafo/gaussian.py
@@ -4,13 +4,27 @@ from numpy import (r_, minimum, maximum, atleast_1d, atleast_2d, mod, ones,
from numpy import triu
from scipy.special import ndtr as cdfnorm, ndtri as invnorm
from scipy.special import erfc
-from wafo import mvn
-import numpy as np
-import wafo.mvnprdmod as mvnprdmod
-import wafo.rindmod as rindmod
import warnings
+import numpy as np
from wafo.misc import common_shape
+try:
+ import mvn # @UnresolvedImport
+except ImportError:
+ warnings.warn('mvn not found. Check its compilation.')
+ mvn = None
+try:
+ import mvnprdmod # @UnresolvedImport
+except ImportError:
+ warnings.warn('mvnprdmod not found. Check its compilation.')
+ mvnprdmod = None
+try:
+ import rindmod # @UnresolvedImport
+except ImportError:
+ warnings.warn('rindmod not found. Check its compilation.')
+ rindmod = None
+
+
__all__ = ['Rind', 'rindmod', 'mvnprdmod', 'mvn', 'cdflomax', 'prbnormtndpc',
'prbnormndpc', 'prbnormnd', 'cdfnorm2d', 'prbnorm2d', 'cdfnorm',
'invnorm', 'test_docstring']
diff --git a/pywafo/src/wafo/graphutil.py b/wafo/graphutil.py
similarity index 98%
rename from pywafo/src/wafo/graphutil.py
rename to wafo/graphutil.py
index e88abd5..977d1f0 100644
--- a/pywafo/src/wafo/graphutil.py
+++ b/wafo/graphutil.py
@@ -244,8 +244,8 @@ def _parse_data(*args, **kwds):
return xx, yy, data
return x, y, data
-pcolor = plotbackend.pcolor
-pcolormesh = plotbackend.pcolormesh
+pcolor = getattr(plotbackend, 'pcolor', None)
+pcolormesh = getattr(plotbackend, 'pcolormesh', None)
def _find_mid_points(x):
diff --git a/pywafo/src/wafo/info.py b/wafo/info.py
similarity index 100%
rename from pywafo/src/wafo/info.py
rename to wafo/info.py
diff --git a/pywafo/src/wafo/integrate.py b/wafo/integrate.py
similarity index 92%
rename from pywafo/src/wafo/integrate.py
rename to wafo/integrate.py
index 5669a45..d1cb26d 100644
--- a/pywafo/src/wafo/integrate.py
+++ b/wafo/integrate.py
@@ -8,7 +8,7 @@ from scipy import special as sp
from wafo.plotbackend import plotbackend as plt
from scipy.integrate import simps, trapz
from wafo.demos import humps
-from pychebfun import Chebfun
+#from pychebfun import Chebfun
_EPS = np.finfo(float).eps
_POINTS_AND_WEIGHTS = {}
@@ -1424,133 +1424,133 @@ def test_docstrings():
doctest.testmod()
-def levin_integrate():
- ''' An oscillatory integral
- Sheehan Olver, December 2010
-
-
- (Chebfun example quad/LevinIntegrate.m)
-
- This example computes the highly oscillatory integral of
-
- f * exp( 1i * w * g ),
-
- over (0,1) using the Levin method [1]. This method computes the integral
- by rewriting it as an ODE
-
- u' + 1i * w * g' u = f,
-
- so that the indefinite integral of f * exp( 1i * w * g ) is
-
- u * exp( 1i * w * g ).
-
-
-
- We use as an example
-
- f = 1 / ( x + 2 );
- g = cos( x - 2 );
- w = 100000;
-
- #
- References:
-
- [1] Levin, D., Procedures for computing one and two-dimensional integrals
- of functions with rapid irregular oscillations, Maths Comp., 38 (1982) 531--538
- '''
- exp = np.exp
- domain=[0, 1]
- x = Chebfun.identity(domain=domain)
- f = 1./(x+2)
- g = np.cos(x-2)
- D = np.diff(domain)
-
-
- # Here is are plots of this integrand, with w = 100, in complex space
- w = 100;
- line_opts = dict(line_width=1.6)
- font_opts = dict(font_size= 14)
- #
-
- intg = f*exp(1j*w*g)
- xs, ys, xi, yi, d = intg.plot_data(1000)
- #intg.plot(with_interpolation_points=True)
- #xi = np.linspace(0, 1, 1024)
-# plt.plot(xs, ys) # , **line_opts)
-# plt.plot(xi, yi, 'r.')
+# def levin_integrate():
+# ''' An oscillatory integral
+# Sheehan Olver, December 2010
+#
+#
+# (Chebfun example quad/LevinIntegrate.m)
+#
+# This example computes the highly oscillatory integral of
+#
+# f * exp( 1i * w * g ),
+#
+# over (0,1) using the Levin method [1]. This method computes the integral
+# by rewriting it as an ODE
+#
+# u' + 1i * w * g' u = f,
+#
+# so that the indefinite integral of f * exp( 1i * w * g ) is
+#
+# u * exp( 1i * w * g ).
+#
+#
+#
+# We use as an example
+#
+# f = 1 / ( x + 2 );
+# g = cos( x - 2 );
+# w = 100000;
+#
+# #
+# References:
+#
+# [1] Levin, D., Procedures for computing one and two-dimensional integrals
+# of functions with rapid irregular oscillations, Maths Comp., 38 (1982) 531--538
+# '''
+# exp = np.exp
+# domain=[0, 1]
+# x = Chebfun.identity(domain=domain)
+# f = 1./(x+2)
+# g = np.cos(x-2)
+# D = np.diff(domain)
+#
+#
+# # Here is are plots of this integrand, with w = 100, in complex space
+# w = 100;
+# line_opts = dict(line_width=1.6)
+# font_opts = dict(font_size= 14)
+# #
+#
+# intg = f*exp(1j*w*g)
+# xs, ys, xi, yi, d = intg.plot_data(1000)
+# #intg.plot(with_interpolation_points=True)
+# #xi = np.linspace(0, 1, 1024)
+# # plt.plot(xs, ys) # , **line_opts)
+# # plt.plot(xi, yi, 'r.')
+# # #axis equal
+# # plt.title('Complex plot of integrand') #,**font_opts)
+# # plt.show('hold')
+# ##
+# # and of just the real part
+# # intgr = np.real(intg)
+# # xs, ys, xi, yi, d = intgr.plot_data(1000)
+# #intgr.plot()
+# # plt.plot(xs, np.real(ys)) # , **line_opts)
+# # plt.plot(xi, np.real(yi), 'r.')
# #axis equal
-# plt.title('Complex plot of integrand') #,**font_opts)
-# plt.show('hold')
- ##
- # and of just the real part
-# intgr = np.real(intg)
-# xs, ys, xi, yi, d = intgr.plot_data(1000)
- #intgr.plot()
-# plt.plot(xs, np.real(ys)) # , **line_opts)
-# plt.plot(xi, np.real(yi), 'r.')
- #axis equal
-# plt.title('Real part of integrand') #,**font_opts)
-# plt.show('hold')
-
- ##
- # The Levin method will be accurate for large and small w, and the time
- # taken is independent of w. Here we take a reasonably large value of w.
- w = 1000;
- intg = f*exp(1j*w*g)
- val0 = np.sum(intg)
- # val1 = sum(intg)
- print(val0)
- ##
- # Start timing
- #tic
-
- ##
- # Construct the operator L
- L = D + 1j*w*np.diag(g.differentiate())
-
- ##
- # From asymptotic analysis, we know that there exists a solution to the
- # equation which is non-oscillatory, though we do not know what initial
- # condition it satisfies. Thus we find a particular solution to this
- # equation with no boundary conditions.
-
- u = L / f
-
- ##
- # Because L is a differential operator with derivative order 1, \ expects
- # it to be given a boundary condition, which is why the warning message is
- # displayed. However, this doesn't cause any problems: though there are,
- # in fact, a family of solutions to the ODE without boundary conditions
- # due to the kernel
- #
- # exp(- 1i * w * g),
- #
- # it does not actually matter which particular solution is computed.
- # Non-uniqueness is also not an issue: \ in matlab is least squares, hence
- # does not require uniqueness. The existence of a non-oscillatory solution
- # ensures that \ converges to a u with length independent of w.
- #
- # One could prevent the warning by applying a boundary condition consistent
- # with the rest of the system, that is
- # L.lbc = {L(1,:),f(0)};
-
- ##
- # Now we evaluate the antiderivative at the endpoints to obtain the
- # integral.
-
- u(1)*exp(1j*w*g(1)) - u(0)*exp(1j*w*g(0))
-
- #toc
-
-
- ##
- # Here is a way to compute the integral using Clenshaw--Curtis quadrature.
- # As w becomes large, this takes an increasingly long time as the
- # oscillations must be resolved.
-
- #tic
- sum( f*exp(1j*w*g) )
- #toc
+# # plt.title('Real part of integrand') #,**font_opts)
+# # plt.show('hold')
+#
+# ##
+# # The Levin method will be accurate for large and small w, and the time
+# # taken is independent of w. Here we take a reasonably large value of w.
+# w = 1000;
+# intg = f*exp(1j*w*g)
+# val0 = np.sum(intg)
+# # val1 = sum(intg)
+# print(val0)
+# ##
+# # Start timing
+# #tic
+#
+# ##
+# # Construct the operator L
+# L = D + 1j*w*np.diag(g.differentiate())
+#
+# ##
+# # From asymptotic analysis, we know that there exists a solution to the
+# # equation which is non-oscillatory, though we do not know what initial
+# # condition it satisfies. Thus we find a particular solution to this
+# # equation with no boundary conditions.
+#
+# u = L / f
+#
+# ##
+# # Because L is a differential operator with derivative order 1, \ expects
+# # it to be given a boundary condition, which is why the warning message is
+# # displayed. However, this doesn't cause any problems: though there are,
+# # in fact, a family of solutions to the ODE without boundary conditions
+# # due to the kernel
+# #
+# # exp(- 1i * w * g),
+# #
+# # it does not actually matter which particular solution is computed.
+# # Non-uniqueness is also not an issue: \ in matlab is least squares, hence
+# # does not require uniqueness. The existence of a non-oscillatory solution
+# # ensures that \ converges to a u with length independent of w.
+# #
+# # One could prevent the warning by applying a boundary condition consistent
+# # with the rest of the system, that is
+# # L.lbc = {L(1,:),f(0)};
+#
+# ##
+# # Now we evaluate the antiderivative at the endpoints to obtain the
+# # integral.
+#
+# u(1)*exp(1j*w*g(1)) - u(0)*exp(1j*w*g(0))
+#
+# #toc
+#
+#
+# ##
+# # Here is a way to compute the integral using Clenshaw--Curtis quadrature.
+# # As w becomes large, this takes an increasingly long time as the
+# # oscillations must be resolved.
+#
+# #tic
+# sum( f*exp(1j*w*g) )
+# #toc
# aLevinTQ[omega_,a_,b_,f_,g_,nu_,wprec_,prm_,test_,basis_,np_]:=
@@ -1624,8 +1624,8 @@ def levin_integrate():
if __name__ == '__main__':
- levin_integrate()
- # test_docstrings()
+ # levin_integrate()
+ test_docstrings()
# qdemo(np.exp, 0, 3, plot_error=True)
# plt.show('hold')
# main()
diff --git a/pywafo/src/wafo/interpolate.py b/wafo/interpolate.py
similarity index 100%
rename from pywafo/src/wafo/interpolate.py
rename to wafo/interpolate.py
diff --git a/pywafo/src/wafo/kdetools.py b/wafo/kdetools.py
similarity index 100%
rename from pywafo/src/wafo/kdetools.py
rename to wafo/kdetools.py
diff --git a/pywafo/src/wafo/magic.py b/wafo/magic.py
similarity index 100%
rename from pywafo/src/wafo/magic.py
rename to wafo/magic.py
diff --git a/pywafo/src/wafo/misc.py b/wafo/misc.py
similarity index 99%
rename from pywafo/src/wafo/misc.py
rename to wafo/misc.py
index c6f1be3..b73e485 100644
--- a/pywafo/src/wafo/misc.py
+++ b/wafo/misc.py
@@ -18,11 +18,10 @@ import warnings
from time import strftime, gmtime
from plotbackend import plotbackend
from collections import OrderedDict
-
-
try:
import c_library as clib # @UnresolvedImport
-except:
+except ImportError:
+ warnings.warn('c_library not found. Check its compilation.')
clib = None
floatinfo = finfo(float)
_TINY = np.finfo(float).tiny
@@ -3300,14 +3299,14 @@ def profile_main1():
import pstats
prof = cProfile.Profile()
prof = prof.runctx("real_main()", globals(), locals())
- print ""
+ print("")
stats = pstats.Stats(prof)
stats.sort_stats("time") # Or cumulative
stats.print_stats(80) # 80 = how many to print
# The rest is optional.
# stats.print_callees()
# stats.print_callers()
- print "
"
+ print("
")
main = profile_main1
diff --git a/pywafo/src/wafo/namedtuple.py b/wafo/namedtuple.py
similarity index 100%
rename from pywafo/src/wafo/namedtuple.py
rename to wafo/namedtuple.py
diff --git a/pywafo/src/wafo/numpy_utils.py b/wafo/numpy_utils.py
similarity index 100%
rename from pywafo/src/wafo/numpy_utils.py
rename to wafo/numpy_utils.py
diff --git a/pywafo/src/wafo/objects.py b/wafo/objects.py
similarity index 100%
rename from pywafo/src/wafo/objects.py
rename to wafo/objects.py
diff --git a/pywafo/src/wafo/padua.py b/wafo/padua.py
similarity index 89%
rename from pywafo/src/wafo/padua.py
rename to wafo/padua.py
index 4aa31a2..d43f7a4 100644
--- a/pywafo/src/wafo/padua.py
+++ b/wafo/padua.py
@@ -85,8 +85,11 @@ Contents.m : Contents file for Matlab
from __future__ import division
import numpy as np
from numpy.fft import fft
+from wafo.dctpack import dct
+# from scipy.fftpack.realtransforms import dct
-class TestFunctions(object):
+
+class _ExampleFunctions(object):
'''
Computes test function in the points (x, y)
@@ -159,7 +162,8 @@ class TestFunctions(object):
def exp_fun1(x, y):
''' The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 2000,
- is 2.1234596326670683e+001 with an estimated absolute error of 7.11e-015.
+ is 2.1234596326670683e+001 with an estimated absolute error of
+ 7.11e-015.
'''
return np.exp((x - 0.5)**2 + (y - 0.5)**2)
@@ -167,7 +171,8 @@ class TestFunctions(object):
def exp_fun100(x, y):
'''The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 2000,
- is 3.1415926535849605e-002 with an estimated absolute error of 3.47e-017.
+ is 3.1415926535849605e-002 with an estimated absolute error of
+ 3.47e-017.
'''
return np.exp(-100 * ((x - 0.5)**2 + (y - 0.5)**2))
@@ -175,7 +180,8 @@ class TestFunctions(object):
def cos30(x, y):
''' The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 500,
- is 4.3386955120336568e-003 with an estimated absolute error of 2.95e-017.
+ is 4.3386955120336568e-003 with an estimated absolute error of
+ 2.95e-017.
'''
return np.cos(30 * (x + y))
@@ -194,7 +200,8 @@ class TestFunctions(object):
is up to machine precision is 5.524391382167263 (see ref. 6).
2. The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 500,
- is 5.5243913821672628e+000 with an estimated absolute error of 0.00e+000.
+ is 5.5243913821672628e+000 with an estimated absolute error of
+ 0.00e+000.
2D modification of an example by L.N.Trefethen (see ref. 7),
f(x)=exp(x).
'''
@@ -209,7 +216,8 @@ class TestFunctions(object):
up to machine precision, is 0.597388947274307 (see ref. 6).
The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 500,
- is 5.9738894727430725e-001 with an estimated absolute error of 0.00e+000.
+ is 5.9738894727430725e-001 with an estimated absolute error of
+ 0.00e+000.
2D modification of an example by L.N.Trefethen (see ref. 7),
f(x)=1/(1+16*x^2).
@@ -223,7 +231,8 @@ class TestFunctions(object):
up to machine precision, is 2.508723139534059 (see ref. 6).
The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 500,
- is 2.5087231395340579e+000 with an estimated absolute error of 0.00e+000.
+ is 2.5087231395340579e+000 with an estimated absolute error of
+ 0.00e+000.
2D modification of an example by L.N.Trefethen (see ref. 7),
f(x)=abs(x)^3.
@@ -237,7 +246,8 @@ class TestFunctions(object):
up to machine precision, is 2.230985141404135 (see ref. 6).
The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 500,
- is 2.2309851414041333e+000 with an estimated absolute error of 2.66e-015.
+ is 2.2309851414041333e+000 with an estimated absolute error of
+ 2.66e-015.
2D modification of an example by L.N.Trefethen (see ref. 7),
f(x)=exp(-x^2).
@@ -251,7 +261,8 @@ class TestFunctions(object):
up to machine precision, is 0.853358758654305 (see ref. 6).
The value of the definite integral on the square [-1,1] x [-1,1],
obtained using a Padua Points cubature formula of degree 2000,
- is 8.5335875865430544e-001 with an estimated absolute error of 3.11e-015.
+ is 8.5335875865430544e-001 with an estimated absolute error of
+ 3.11e-015.
2D modification of an example by L.N.Trefethen (see ref. 7),
f(x)=exp(-1/x^2).
@@ -269,7 +280,7 @@ class TestFunctions(object):
s.exp_fun100, s.cos30, s.constant, s.exp_xy, s.runge,
s.abs_cubed, s.gauss, s.exp_inv]
return test_function[id](x, y)
-testfunct = TestFunctions()
+example_functions = _ExampleFunctions()
def _find_m(n):
@@ -348,7 +359,6 @@ def padua_fit(Pad, fun, *args):
'''
-
N = np.shape(Pad)[1]
# recover the degree n from N = (n+1)(n+2)/2
n = int(round(-3 + np.sqrt(1 + 8 * N)) / 2)
@@ -375,54 +385,52 @@ def padua_fit(Pad, fun, *args):
return C0f, error_estimate(C0f)
+
def paduavals2coefs(f):
- useFFTwhenNisMoreThan=100
+ useFFTwhenNisMoreThan = 100
m = len(f)
- n = int(round(-1.5 + np.sqrt(.25+2*m)))
+ n = int(round(-1.5 + np.sqrt(.25 + 2 * m)))
x = padua_points(n)
idx = _find_m(n)
- w = 0*x[0] + 1./(n*(n+1))
+ w = 0 * x[0] + 1. / (n * (n + 1))
idx1 = np.all(np.abs(x) == 1, axis=0)
- w[idx1] = .5*w[idx1]
+ w[idx1] = .5 * w[idx1]
idx2 = np.all(np.abs(x) != 1, axis=0)
- w[idx2] = 2*w[idx2]
+ w[idx2] = 2 * w[idx2]
- G = np.zeros(idx.max()+1)
- G[idx] = 4*w*f
+ G = np.zeros(idx.max() + 1)
+ G[idx] = 4 * w * f
- if ( n < useFFTwhenNisMoreThan ):
- t1 = np.r_[0:n+1].reshape(-1, 1)
- Tn1 = np.cos(t1*t1.T*np.pi/n)
- t2 = np.r_[0:n+2].reshape(-1, 1)
- Tn2 = np.cos(t2*t2.T*np.pi/(n+1));
- C = np.dot(Tn2, np.dot(G,Tn1))
+ if (n < useFFTwhenNisMoreThan):
+ t1 = np.r_[0:n + 1].reshape(-1, 1)
+ Tn1 = np.cos(t1 * t1.T * np.pi / n)
+ t2 = np.r_[0:n + 2].reshape(-1, 1)
+ Tn2 = np.cos(t2 * t2.T * np.pi / (n + 1))
+ C = np.dot(Tn2, np.dot(G, Tn1))
else:
# dct = @(c) chebtech2.coeffs2vals(c);
- C = np.rot90(dct(dct(G.T).T), axis=1)
+ C = np.rot90(dct(dct(G.T).T)) #, axis=1)
- C[0] = .5*C[0]
- C[:,1] = .5*C[:, 1]
- C[0,-1] = .5*C[0, -1]
+ C[0] = .5 * C[0]
+ C[:, 1] = .5 * C[:, 1]
+ C[0, -1] = .5 * C[0, -1]
del C[-1]
# Take upper-left triangular part:
return np.fliplr(np.triu(np.fliplr(C)))
- #C = triu(C(:,end:-1:1));
- #C = C(:,end:-1:1);
+ # C = triu(C(:,end:-1:1));
+ # C = C(:,end:-1:1);
def padua_fit2(Pad, fun, *args):
N = np.shape(Pad)[1]
# recover the degree n from N = (n+1)(n+2)/2
- n = int(round(-3 + np.sqrt(1 + 8 * N)) / 2)
+ _n = int(round(-3 + np.sqrt(1 + 8 * N)) / 2)
C0f = fun(Pad[0], Pad[1], *args)
return paduavals2coefs(C0f)
-
-
-
def _compute_moments(n):
k = np.r_[0:n:2]
mom = 2 * np.sqrt(2) / (1 - k ** 2)
@@ -449,7 +457,8 @@ def padua_val(X, Y, coefficients, domain=(-1, 1, -1, 1), use_meshgrid=False):
Evaluate polynomial in padua form at X, Y.
Evaluate the interpolation polynomial defined through its coefficient
- matrix coefficients at the target points X(:,1),X(:,2) or at the meshgrid(X1,X2)
+ matrix coefficients at the target points X(:,1),X(:,2) or at the
+ meshgrid(X1,X2)
Parameters
----------
@@ -469,7 +478,7 @@ def padua_val(X, Y, coefficients, domain=(-1, 1, -1, 1), use_meshgrid=False):
'''
X, Y = np.atleast_1d(X, Y)
original_shape = X.shape
- min, max = np.minimum, np.maximum
+ min, max = np.minimum, np.maximum # @ReservedAssignment
a, b, c, d = domain
n = np.shape(coefficients)[1]
@@ -481,6 +490,12 @@ def padua_val(X, Y, coefficients, domain=(-1, 1, -1, 1), use_meshgrid=False):
TX1[1:n + 1] = TX1[1:n + 1] * np.sqrt(2)
TX2[1:n + 1] = TX2[1:n + 1] * np.sqrt(2)
if use_meshgrid:
- return np.dot(TX1.T, np.dot(coefficients, TX2)).T # eval on meshgrid points
- val = np.sum(np.dot(TX1.T, coefficients) * TX2.T, axis=1) # scattered points
+ # eval on meshgrid points
+ return np.dot(TX1.T, np.dot(coefficients, TX2)).T
+ val = np.sum(
+ np.dot(
+ TX1.T,
+ coefficients) *
+ TX2.T,
+ axis=1) # scattered points
return val.reshape(original_shape)
diff --git a/pywafo/src/wafo/plotbackend.py b/wafo/plotbackend.py
similarity index 90%
rename from pywafo/src/wafo/plotbackend.py
rename to wafo/plotbackend.py
index b120abd..30a6953 100644
--- a/pywafo/src/wafo/plotbackend.py
+++ b/wafo/plotbackend.py
@@ -3,12 +3,13 @@
"""
import warnings
verbose = False
+
if False:
try:
from scitools import easyviz as plotbackend # @UnresolvedImport
if verbose:
print('wafo: plotbackend is set to scitools.easyviz')
- except:
+ except ImportError:
warnings.warn('wafo: Unable to load scitools.easyviz as plotbackend')
plotbackend = None
else:
@@ -17,6 +18,6 @@ else:
plotbackend.interactive(True)
if verbose:
print('wafo: plotbackend is set to matplotlib.pyplot')
- except:
+ except ImportError:
warnings.warn('wafo: Unable to load matplotlib.pyplot as plotbackend')
plotbackend = None
diff --git a/pywafo/src/wafo/polynomial.py b/wafo/polynomial.py
similarity index 100%
rename from pywafo/src/wafo/polynomial.py
rename to wafo/polynomial.py
diff --git a/pywafo/src/wafo/polynomial_old.py b/wafo/polynomial_old.py
similarity index 100%
rename from pywafo/src/wafo/polynomial_old.py
rename to wafo/polynomial_old.py
diff --git a/pywafo/src/wafo/powerpoint.py b/wafo/powerpoint.py
similarity index 100%
rename from pywafo/src/wafo/powerpoint.py
rename to wafo/powerpoint.py
diff --git a/wafo/setup.py b/wafo/setup.py
new file mode 100644
index 0000000..e0a51bb
--- /dev/null
+++ b/wafo/setup.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Sun Oct 25 14:55:34 2015
+
+@author: dave
+"""
+
+def configuration(parent_package='', top_path=None):
+ from numpy.distutils.misc_util import Configuration
+ config = Configuration('wafo', parent_package, top_path)
+ config.add_subpackage('source')
+ config.make_config_py()
+ return config
+
+if __name__ == "__main__":
+ from numpy.distutils.core import setup
+ setup(**configuration(top_path='').todict())
diff --git a/pywafo/src/wafo/sg_filter.py b/wafo/sg_filter.py
similarity index 100%
rename from pywafo/src/wafo/sg_filter.py
rename to wafo/sg_filter.py
diff --git a/pywafo/src/wafo/source/c_library/build_all.py b/wafo/source/c_library/build_all.py
similarity index 100%
rename from pywafo/src/wafo/source/c_library/build_all.py
rename to wafo/source/c_library/build_all.py
diff --git a/pywafo/src/wafo/source/c_library/c_functions.c b/wafo/source/c_library/c_functions.c
similarity index 100%
rename from pywafo/src/wafo/source/c_library/c_functions.c
rename to wafo/source/c_library/c_functions.c
diff --git a/pywafo/src/wafo/source/c_library/c_library rf3 rf5 license.txt b/wafo/source/c_library/c_library rf3 rf5 license.txt
similarity index 100%
rename from pywafo/src/wafo/source/c_library/c_library rf3 rf5 license.txt
rename to wafo/source/c_library/c_library rf3 rf5 license.txt
diff --git a/pywafo/src/wafo/source/c_library/c_library.pyf b/wafo/source/c_library/c_library.pyf
similarity index 100%
rename from pywafo/src/wafo/source/c_library/c_library.pyf
rename to wafo/source/c_library/c_library.pyf
diff --git a/pywafo/src/wafo/source/c_library/c_librarymodule.c b/wafo/source/c_library/c_librarymodule.c
similarity index 100%
rename from pywafo/src/wafo/source/c_library/c_librarymodule.c
rename to wafo/source/c_library/c_librarymodule.c
diff --git a/pywafo/src/wafo/source/c_library/setup.py b/wafo/source/c_library/setup.py
similarity index 100%
rename from pywafo/src/wafo/source/c_library/setup.py
rename to wafo/source/c_library/setup.py
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2acdfb.f b/wafo/source/cov2XXXpdf/bounds/cov2acdfb.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2acdfb.f
rename to wafo/source/cov2XXXpdf/bounds/cov2acdfb.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2mmpdfb.f b/wafo/source/cov2XXXpdf/bounds/cov2mmpdfb.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2mmpdfb.f
rename to wafo/source/cov2XXXpdf/bounds/cov2mmpdfb.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2tccpdfb.f b/wafo/source/cov2XXXpdf/bounds/cov2tccpdfb.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2tccpdfb.f
rename to wafo/source/cov2XXXpdf/bounds/cov2tccpdfb.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2tthpdfb.f b/wafo/source/cov2XXXpdf/bounds/cov2tthpdfb.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/bounds/cov2tthpdfb.f
rename to wafo/source/cov2XXXpdf/bounds/cov2tthpdfb.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2acdf.f b/wafo/source/cov2XXXpdf/cov2acdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2acdf.f
rename to wafo/source/cov2XXXpdf/cov2acdf.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2mmpdf.f b/wafo/source/cov2XXXpdf/cov2mmpdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2mmpdf.f
rename to wafo/source/cov2XXXpdf/cov2mmpdf.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2mmtpdf.f b/wafo/source/cov2XXXpdf/cov2mmtpdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2mmtpdf.f
rename to wafo/source/cov2XXXpdf/cov2mmtpdf.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2tccpdf.f b/wafo/source/cov2XXXpdf/cov2tccpdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2tccpdf.f
rename to wafo/source/cov2XXXpdf/cov2tccpdf.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2tcpdf.f b/wafo/source/cov2XXXpdf/cov2tcpdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2tcpdf.f
rename to wafo/source/cov2XXXpdf/cov2tcpdf.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2thpdf.f b/wafo/source/cov2XXXpdf/cov2thpdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2thpdf.f
rename to wafo/source/cov2XXXpdf/cov2thpdf.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2thpdfalan.f b/wafo/source/cov2XXXpdf/cov2thpdfalan.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2thpdfalan.f
rename to wafo/source/cov2XXXpdf/cov2thpdfalan.f
diff --git a/pywafo/src/wafo/source/cov2XXXpdf/cov2tthpdf.f b/wafo/source/cov2XXXpdf/cov2tthpdf.f
similarity index 100%
rename from pywafo/src/wafo/source/cov2XXXpdf/cov2tthpdf.f
rename to wafo/source/cov2XXXpdf/cov2tthpdf.f
diff --git a/pywafo/src/wafo/source/mreg/build_all.py b/wafo/source/mreg/build_all.py
similarity index 100%
rename from pywafo/src/wafo/source/mreg/build_all.py
rename to wafo/source/mreg/build_all.py
diff --git a/pywafo/src/wafo/source/mreg/cov2mmpdfreg.f b/wafo/source/mreg/cov2mmpdfreg.f
similarity index 100%
rename from pywafo/src/wafo/source/mreg/cov2mmpdfreg.f
rename to wafo/source/mreg/cov2mmpdfreg.f
diff --git a/pywafo/src/wafo/source/mreg/cov2mmpdfreg_intfc.f b/wafo/source/mreg/cov2mmpdfreg_intfc.f
similarity index 100%
rename from pywafo/src/wafo/source/mreg/cov2mmpdfreg_intfc.f
rename to wafo/source/mreg/cov2mmpdfreg_intfc.f
diff --git a/pywafo/src/wafo/source/mreg/dsvdc.f b/wafo/source/mreg/dsvdc.f
similarity index 100%
rename from pywafo/src/wafo/source/mreg/dsvdc.f
rename to wafo/source/mreg/dsvdc.f
diff --git a/pywafo/src/wafo/source/mreg/intfcmod.f b/wafo/source/mreg/intfcmod.f
similarity index 100%
rename from pywafo/src/wafo/source/mreg/intfcmod.f
rename to wafo/source/mreg/intfcmod.f
diff --git a/pywafo/src/wafo/source/mreg/mregmodule.f b/wafo/source/mreg/mregmodule.f
similarity index 100%
rename from pywafo/src/wafo/source/mreg/mregmodule.f
rename to wafo/source/mreg/mregmodule.f
diff --git a/pywafo/src/wafo/source/mvn/build_all.py b/wafo/source/mvn/build_all.py
similarity index 100%
rename from pywafo/src/wafo/source/mvn/build_all.py
rename to wafo/source/mvn/build_all.py
diff --git a/pywafo/src/wafo/source/mvn/mvn.pyf b/wafo/source/mvn/mvn.pyf
similarity index 97%
rename from pywafo/src/wafo/source/mvn/mvn.pyf
rename to wafo/source/mvn/mvn.pyf
index 8a3d5f1..4db7e39 100644
--- a/pywafo/src/wafo/source/mvn/mvn.pyf
+++ b/wafo/source/mvn/mvn.pyf
@@ -1,39 +1,39 @@
-! -*- f90 -*-
-! Note: the context of this file is case sensitive.
-
-python module mvn ! in
- interface ! in :mvn
- subroutine mvnun(d,n,lower,upper,means,covar,maxpts,abseps,releps,value,inform) ! in :mvn:mvndst.f
- integer intent(hide) :: d=shape(means,0)
- integer intent(hide) :: n=shape(means,1)
- double precision dimension(d) :: lower
- double precision dimension(d) :: upper
- double precision dimension(d,n) :: means
- double precision dimension(d,d) :: covar
- integer intent(optional) :: maxpts=d*1000
- double precision intent(optional) :: abseps=1e-6
- double precision intent(optional) :: releps=1e-6
- double precision intent(out) :: value
- integer intent(out) :: inform
- end subroutine mvnun
-
- subroutine mvndst(n,lower,upper,infin,correl,maxpts,abseps,releps,error,value,inform) ! in :mvn:mvndst.f
- integer intent(hide) :: n=len(lower)
- double precision dimension(n) :: lower
- double precision dimension(n) :: upper
- integer dimension(n) :: infin
- double precision dimension(n*(n-1)/2) :: correl
- integer intent(optional) :: maxpts=2000
- double precision intent(optional) :: abseps=1e-6
- double precision intent(optional) :: releps=1e-6
- double precision intent(out) :: error
- double precision intent(out) :: value
- integer intent(out) :: inform
- integer :: ivls
- common /dkblck/ ivls
- end subroutine mvndst
- end interface
-end python module mvn
-
-! This file was auto-generated with f2py (version:2.39.235_1752).
-! See http://cens.ioc.ee/projects/f2py2e/
+! -*- f90 -*-
+! Note: the context of this file is case sensitive.
+
+python module mvn ! in
+ interface ! in :mvn
+ subroutine mvnun(d,n,lower,upper,means,covar,maxpts,abseps,releps,value,inform) ! in :mvn:mvndst.f
+ integer intent(hide) :: d=shape(means,0)
+ integer intent(hide) :: n=shape(means,1)
+ double precision dimension(d) :: lower
+ double precision dimension(d) :: upper
+ double precision dimension(d,n) :: means
+ double precision dimension(d,d) :: covar
+ integer intent(optional) :: maxpts=d*1000
+ double precision intent(optional) :: abseps=1e-6
+ double precision intent(optional) :: releps=1e-6
+ double precision intent(out) :: value
+ integer intent(out) :: inform
+ end subroutine mvnun
+
+ subroutine mvndst(n,lower,upper,infin,correl,maxpts,abseps,releps,error,value,inform) ! in :mvn:mvndst.f
+ integer intent(hide) :: n=len(lower)
+ double precision dimension(n) :: lower
+ double precision dimension(n) :: upper
+ integer dimension(n) :: infin
+ double precision dimension(n*(n-1)/2) :: correl
+ integer intent(optional) :: maxpts=2000
+ double precision intent(optional) :: abseps=1e-6
+ double precision intent(optional) :: releps=1e-6
+ double precision intent(out) :: error
+ double precision intent(out) :: value
+ integer intent(out) :: inform
+ integer :: ivls
+ common /dkblck/ ivls
+ end subroutine mvndst
+ end interface
+end python module mvn
+
+! This file was auto-generated with f2py (version:2.39.235_1752).
+! See http://cens.ioc.ee/projects/f2py2e/
diff --git a/pywafo/src/wafo/source/mvn/mvndst.f b/wafo/source/mvn/mvndst.f
similarity index 100%
rename from pywafo/src/wafo/source/mvn/mvndst.f
rename to wafo/source/mvn/mvndst.f
diff --git a/pywafo/src/wafo/source/mvnprd/build_all.py b/wafo/source/mvnprd/build_all.py
similarity index 99%
rename from pywafo/src/wafo/source/mvnprd/build_all.py
rename to wafo/source/mvnprd/build_all.py
index 5092b9d..e89b68c 100644
--- a/pywafo/src/wafo/source/mvnprd/build_all.py
+++ b/wafo/source/mvnprd/build_all.py
@@ -2,7 +2,7 @@
import os
import sys
from wafo.f2py_tools import f2py_call_str
-
+
def compile_all():
f2py_call = f2py_call_str()
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprd.dsp b/wafo/source/mvnprd/mvnprd.dsp
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/mvnprd.dsp
rename to wafo/source/mvnprd/mvnprd.dsp
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprd.dsw b/wafo/source/mvnprd/mvnprd.dsw
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/mvnprd.dsw
rename to wafo/source/mvnprd/mvnprd.dsw
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprd.f b/wafo/source/mvnprd/mvnprd.f
similarity index 94%
rename from pywafo/src/wafo/source/mvnprd/mvnprd.f
rename to wafo/source/mvnprd/mvnprd.f
index d0eb788..03f97cc 100644
--- a/pywafo/src/wafo/source/mvnprd/mvnprd.f
+++ b/wafo/source/mvnprd/mvnprd.f
@@ -748,32 +748,32 @@ C
* CONST1 = 0.180625E0, CONST2 = 1.6E0)
C
C COEFFICIENTS FOR P CLOSE TO 1/2
- PARAMETER (A0 = 3.38713 27179E0,
- * A1 = 5.04342 71938E1,
- * A2 = 1.59291 13202E2,
- * A3 = 5.91093 74720E1,
- * B1 = 1.78951 69469E1,
- * B2 = 7.87577 57664E1,
- * B3 = 6.71875 63600E1)
-C HASH SUM AB 32.31845 77772
+ PARAMETER (A0 = 3.3871327179D0,
+ * A1 = 5.0434271938D1,
+ * A2 = 1.5929113202D2,
+ * A3 = 5.9109374720D1,
+ * B1 = 1.7895169469D1,
+ * B2 = 7.8757757664D1,
+ * B3 = 6.7187563600D1)
+C HASH SUM AB 32.3184577772
C
C COEFFICIENTS FOR P NEITHER CLOSE TO 1/2 NOR 0 OR 1
- PARAMETER (C0 = 1.42343 72777E0,
- * C1 = 2.75681 53900E0,
- * C2 = 1.30672 84816E0,
- * C3 = 1.70238 21103E-1,
- * D1 = 7.37001 64250E-1,
- * D2 = 1.20211 32975E-1)
-C HASH SUM CD 15.76149 29821
+ PARAMETER (C0 = 1.4234372777D0,
+ * C1 = 2.7568153900D0,
+ * C2 = 1.3067284816D0,
+ * C3 = 1.7023821103D-1,
+ * D1 = 7.3700164250D-1,
+ * D2 = 1.2021132975D-1)
+C HASH SUM CD 15.7614929821
C
C COEFFICIENTS FOR P NEAR 0 OR 1
- PARAMETER (E0 = 6.65790 51150E0,
- * E1 = 3.08122 63860E0,
- * E2 = 4.28682 94337E-1,
- * E3 = 1.73372 03997E-2,
- * F1 = 2.41978 94225E-1,
- * F2 = 1.22582 02635E-2)
-C HASH SUM EF 19.40529 10204
+ PARAMETER (E0 = 6.6579051150E0,
+ * E1 = 3.0812263860E0,
+ * E2 = 4.2868294337E-1,
+ * E3 = 1.7337203997E-2,
+ * F1 = 2.4197894225E-1,
+ * F2 = 1.2258202635E-2)
+C HASH SUM EF 19.4052910204
C
IFAULT = 0
Q = P - HALF
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprd.pyf b/wafo/source/mvnprd/mvnprd.pyf
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/mvnprd.pyf
rename to wafo/source/mvnprd/mvnprd.pyf
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprd_interface.f b/wafo/source/mvnprd/mvnprd_interface.f
similarity index 69%
rename from pywafo/src/wafo/source/mvnprd/mvnprd_interface.f
rename to wafo/source/mvnprd/mvnprd_interface.f
index 1f0715d..93e4b3a 100644
--- a/pywafo/src/wafo/source/mvnprd/mvnprd_interface.f
+++ b/wafo/source/mvnprd/mvnprd_interface.f
@@ -2,15 +2,15 @@
subroutine prbnormtndpc(rho,a,b,NDF,N,abseps,IERC,HNC,PRB,BOUND,
* IFAULT)
double precision A(N),B(N),rho(N),D(N)
- integer INFIN(N)
- integer NDF,N,IERC
- integer IFAULT
- double precision HNC,EPS
- double precision PRB, BOUND
- double precision, parameter :: infinity = 37.0d0
-Cf2py integer, intent(hide), depend(rho) :: N = len(rho)
-Cf2py depend(N) a
-Cf2py depend(N) b
+ integer INFIN(N)
+ integer NDF,N,IERC
+ integer IFAULT
+ double precision HNC,EPS
+ double precision PRB, BOUND
+ double precision, parameter :: infinity = 37.0d0
+Cf2py integer, intent(hide), depend(rho) :: N = len(rho)
+Cf2py depend(N) a
+Cf2py depend(N) b
Cf2py integer, optional :: NDF = 0
Cf2py double precision, optional :: abseps = 0.001
Cf2py double precision, optional :: HNC = 0.24
@@ -25,17 +25,17 @@ CCf2py intent(in) INF
CCf2py intent(in) A,B,rho
-
+
* Set INFIN INTEGER, array of integration limits flags:
* if INFIN(I) < 0, Ith limits are (-infinity, infinity);
* if INFIN(I) = 0, Ith limits are [LOWER(I), infinity);
* if INFIN(I) = 1, Ith limits are (-infinity, UPPER(I)];
* if INFIN(I) = 2, Ith limits are [LOWER(I), UPPER(I)].
Ndim = 0
- DO K = 1,N
+ DO K = 1,N
Ndim = Ndim + 1
INFIN(Ndim) = 2
- D(k) = 0.0
+ D(k) = 0.0
if (A(K)-D(K).LE.-INFINITY) THEN
if (B(K)-D(K) .GE. INFINITY) THEN
Ndim = Ndim - 1
@@ -52,36 +52,36 @@ CCf2py intent(in) A,B,rho
B(Ndim) = B(K)
C D(Ndim) = D(K)
endif
- ENDDO
- CALL MVSTUD(NDF,B,A,RHO,ABSEPS,Ndim,INFIN,D,IERC,HNC,
- & PRB,BOUND,IFAULT)
+ ENDDO
+ CALL MVSTUD(NDF,B,A,RHO,ABSEPS,Ndim,INFIN,D,IERC,HNC,
+ & PRB,BOUND,IFAULT)
-C CALL MVNPRD(A, B, BPD, EPS, N, INF, IERC, HINC, PROB, BOUND,
+C CALL MVNPRD(A, B, BPD, EPS, N, INF, IERC, HINC, PROB, BOUND,
C * IFAULT)
return
end subroutine prbnormtndpc
- subroutine prbnormndpc(prb,abserr,IFT,rho,a,b,N,abseps,releps,
+ subroutine prbnormndpc(prb,abserr,IFT,rho,a,b,N,abseps,releps,
& useBreakPoints, useSimpson)
- use mvnProdCorrPrbMod, ONLY : mvnprodcorrprb
- integer :: N
+ use mvnProdCorrPrbMod, ONLY : mvnprodcorrprb
+ integer :: N
double precision,dimension(N),intent(in) :: rho,a,b
double precision,intent(in) :: abseps
- double precision,intent(in) :: releps
+ double precision,intent(in) :: releps
logical, intent(in) :: useBreakPoints
- logical, intent(in) :: useSimpson
+ logical, intent(in) :: useSimpson
double precision,intent(out) :: abserr,prb
integer, intent(out) :: IFT
-
-Cf2py integer, intent(hide), depend(rho) :: N = len(rho)
-Cf2py depend(N) a
-Cf2py depend(N) b
+
+Cf2py integer, intent(hide), depend(rho) :: N = len(rho)
+Cf2py depend(N) a
+Cf2py depend(N) b
Cf2py double precision, optional :: abseps = 0.001
Cf2py double precision, optional :: releps = 0.001
Cf2py logical, optional :: useBreakPoints =1
Cf2py logical, optional :: useSimpson = 1
-
+
CALL mvnprodcorrprb(rho,a,b,abseps,releps,useBreakPoints,
& useSimpson,abserr,IFT,prb)
-
+
end subroutine prbnormndpc
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb.f b/wafo/source/mvnprd/mvnprodcorrprb.f
similarity index 96%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb.f
rename to wafo/source/mvnprd/mvnprodcorrprb.f
index 8850562..ae000cc 100644
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb.f
+++ b/wafo/source/mvnprd/mvnprodcorrprb.f
@@ -1,16 +1,16 @@
C Does not work: f2py -m mvnprdmod -h mvnprdmod.pyf mvnprodcorrprb.f only: mvnprodcorrprb
-
-
-C gfortran -fPIC -c mvnprodcorrprb.f
+
+
+C gfortran -fPIC -c mvnprodcorrprb.f
C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --fcompiler=gnu95 --compiler=mingw32 -lmsvcr71
C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --build-dir tmp1 --fcompiler=gnu95 --compiler=mingw32 -lmsvcr71
-
+
* This is a MEX-file for MATLAB.
* and contains a mex-interface to, mvnprodcorrprb a subroutine
* for computing multivariate normal probabilities with product
* correlation structure.
-* The file should compile without errors on (Fortran90)
+* The file should compile without errors on (Fortran90)
* standard Fortran compilers.
*
* The mex-interface and mvnprodcorrprb was written by
@@ -22,7 +22,7 @@ C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --build-dir
* Email: Per.Brodtkorb@ffi.no
*
*
-* MVNPRODCORRPRBMEX Computes multivariate normal probability
+* MVNPRODCORRPRBMEX Computes multivariate normal probability
* with product correlation structure.
*
* CALL [value,error,inform]=mvnprodcorrprbmex(rho,A,B,abseps,releps,useBreakPoints);
@@ -30,7 +30,7 @@ C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --build-dir
* RHO REAL, array of coefficients defining the correlation
* coefficient by:
* correlation(I,J) = RHO(I)*RHO(J) for J/=I
-* where
+* where
* 1 <= RHO(I) <= 1
* A REAL, array of lower integration limits.
* B REAL, array of upper integration limits.
@@ -41,13 +41,13 @@ C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --build-dir
* USEBREAKPOINTS = 1 If extra integration points should be used
* around possible singularities
* 0 If no extra
-*
+*
* ERROR REAL estimated absolute error, with 99% confidence level.
* VALUE REAL estimated value for the integral
* INFORM INTEGER, termination status parameter:
* if INFORM = 0, normal completion with ERROR < EPS;
-* if INFORM = 1, completion with ERROR > EPS and MAXPTS
-* function vaules used; increase MAXPTS to
+* if INFORM = 1, completion with ERROR > EPS and MAXPTS
+* function vaules used; increase MAXPTS to
* decrease ERROR;
*
* MVNPRODCORRPRB calculates multivariate normal probability
@@ -82,19 +82,19 @@ C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --build-dir
INTERFACE CALERF
MODULE PROCEDURE CALERF
- END INTERFACE
+ END INTERFACE
INTERFACE DERF
MODULE PROCEDURE DERF
- END INTERFACE
+ END INTERFACE
INTERFACE DERFC
MODULE PROCEDURE DERFC
- END INTERFACE
+ END INTERFACE
INTERFACE DERFCX
MODULE PROCEDURE DERFCX
- END INTERFACE
+ END INTERFACE
CONTAINS
C--------------------------------------------------------------------
C
@@ -261,9 +261,9 @@ C Argonne National Laboratory
C Argonne, IL 60439
C
C Latest modification: March 19, 1990
-C Updated to F90 by pab 23.03.2003
-C Revised pab Dec 2008
-C updated parameter statements in CALERF so that it works when
+C Updated to F90 by pab 23.03.2003
+C Revised pab Dec 2008
+C updated parameter statements in CALERF so that it works when
C compiling with gfortran.
C
C------------------------------------------------------------------
@@ -292,54 +292,54 @@ C------------------------------------------------------------------
DOUBLE PRECISION, PARAMETER :: XBIG = 26.543D0
DOUBLE PRECISION, PARAMETER :: XHUGE = 6.71D7
DOUBLE PRECISION, PARAMETER :: XMAX = 2.53D307
- DOUBLE PRECISION, PARAMETER :: XINF = 1.79D308
+ DOUBLE PRECISION, PARAMETER :: XINF = 1.79D308
!---------------------------------------------------------------
! Coefficents to the rational polynomials
!--------------------------------------------------------------
C DOUBLE PRECISION, DIMENSION(5) :: A, Q
C DOUBLE PRECISION, DIMENSION(4) :: B
C DOUBLE PRECISION, DIMENSION(9) :: C
-C DOUBLE PRECISION, DIMENSION(8) :: D
+C DOUBLE PRECISION, DIMENSION(8) :: D
C DOUBLE PRECISION, DIMENSION(6) :: P
C------------------------------------------------------------------
C Coefficients for approximation to erf in first interval
-C------------------------------------------------------------------
+C------------------------------------------------------------------
DOUBLE PRECISION, PARAMETER, DIMENSION(5) ::
& A = (/ 3.16112374387056560D00,
& 1.13864154151050156D02,3.77485237685302021D02,
- & 3.20937758913846947D03, 1.85777706184603153D-1/)
+ & 3.20937758913846947D03, 1.85777706184603153D-1/)
DOUBLE PRECISION, PARAMETER, DIMENSION(4) ::
& B = (/2.36012909523441209D01,2.44024637934444173D02,
& 1.28261652607737228D03,2.84423683343917062D03/)
C------------------------------------------------------------------
C Coefficients for approximation to erfc in second interval
C------------------------------------------------------------------
- DOUBLE PRECISION, DIMENSION(9) ::
+ DOUBLE PRECISION, DIMENSION(9) ::
& C=(/5.64188496988670089D-1,8.88314979438837594D0,
1 6.61191906371416295D01,2.98635138197400131D02,
2 8.81952221241769090D02,1.71204761263407058D03,
3 2.05107837782607147D03,1.23033935479799725D03,
- 4 2.15311535474403846D-8/)
- DOUBLE PRECISION, DIMENSION(8) ::
- & D =(/1.57449261107098347D01,1.17693950891312499D02,
+ 4 2.15311535474403846D-8/)
+ DOUBLE PRECISION, DIMENSION(8) ::
+ & D =(/1.57449261107098347D01,1.17693950891312499D02,
1 5.37181101862009858D02,1.62138957456669019D03,
2 3.29079923573345963D03,4.36261909014324716D03,
3 3.43936767414372164D03,1.23033935480374942D03/)
C------------------------------------------------------------------
C Coefficients for approximation to erfc in third interval
-C------------------------------------------------------------------
- DOUBLE PRECISION, parameter,
- & DIMENSION(6) :: P =(/3.05326634961232344D-1,
+C------------------------------------------------------------------
+ DOUBLE PRECISION, parameter,
+ & DIMENSION(6) :: P =(/3.05326634961232344D-1,
& 3.60344899949804439D-1,
1 1.25781726111229246D-1,1.60837851487422766D-2,
- 2 6.58749161529837803D-4,1.63153871373020978D-2/)
- DOUBLE PRECISION, parameter,
- & DIMENSION(5) :: Q =(/2.56852019228982242D00,
+ 2 6.58749161529837803D-4,1.63153871373020978D-2/)
+ DOUBLE PRECISION, parameter,
+ & DIMENSION(5) :: Q =(/2.56852019228982242D00,
& 1.87295284992346047D00,
1 5.27905102951428412D-1,6.05183413124413191D-2,
2 2.33520497626869185D-3/)
-C------------------------------------------------------------------
-
+C------------------------------------------------------------------
+
X = ARG
Y = ABS(X)
IF (Y .LE. THRESH) THEN
@@ -377,8 +377,8 @@ C------------------------------------------------------------------
YSQ = AINT(Y*SIXTEN)/SIXTEN
DEL = (Y-YSQ)*(Y+YSQ)
RESULT = EXP(-YSQ*YSQ) * EXP(-DEL) * RESULT
- END IF
-
+ END IF
+
C------------------------------------------------------------------
C Evaluate erfc for |X| > 4.0
C------------------------------------------------------------------
@@ -441,7 +441,7 @@ C------------------------------------------------------------------
implicit none
private
public :: dqagpe,dqagp
-
+
INTERFACE dqagpe
MODULE PROCEDURE dqagpe
END INTERFACE
@@ -453,11 +453,11 @@ C------------------------------------------------------------------
INTERFACE dqelg
MODULE PROCEDURE dqelg
END INTERFACE
-
- INTERFACE dqpsrt
+
+ INTERFACE dqpsrt
MODULE PROCEDURE dqpsrt
END INTERFACE
-
+
INTERFACE dqk21
MODULE PROCEDURE dqk21
END INTERFACE
@@ -473,7 +473,7 @@ C------------------------------------------------------------------
INTERFACE d1mach
MODULE PROCEDURE d1mach
END INTERFACE
-
+
contains
subroutine dea3(E0,E1,E2,abserr,result)
!***PURPOSE Given a slowly convergent sequence, this routine attempts
@@ -481,7 +481,7 @@ C------------------------------------------------------------------
! sequence's limiting value, thus improving the rate of
! convergence. Routine is based on the epsilon algorithm
! of P. Wynn. An estimate of the absolute error is also
-! given.
+! given.
double precision, intent(in) :: E0,E1,E2
double precision, intent(out) :: abserr, result
!locals
@@ -749,9 +749,9 @@ c***end prologue dqagpe
* nint,nintp1,npts2,nres,nrmax,numrl2
logical :: extrap,noext
external f
-!
-!
-
+!
+!
+
!
!
! the dimension of rlist2 is determined by the value of
@@ -807,13 +807,13 @@ c***end prologue dqagpe
!
c***first executable statement dqagpe
epmach = d1mach(4)
- uflow = d1mach(1)
+ uflow = d1mach(1)
oflow = d1mach(2)
!
! test on validity of parameters
! -----------------------------
!
- hSplit = 0.2D0
+ hSplit = 0.2D0
ier = 0
neval = 0
last = 0
@@ -827,7 +827,7 @@ c***first executable statement dqagpe
level(1) = 0
npts2 = npts+2
if((npts2.lt.2).or.(limit.le.npts).or.
- & ((epsabs.le.0.0d+00).and.
+ & ((epsabs.le.0.0d+00).and.
& (epsrel.lt.dmax1(0.5d+02*epmach,0.5d-28)))) then
ier = 6
go to 999
@@ -841,7 +841,7 @@ c***first executable statement dqagpe
if(any(points(1:npts)<=a).or.any(b<=points(1:npts))) then
ier = 6
go to 999
- endif
+ endif
endif
!
! if any break points are provided, sort them into an
@@ -851,7 +851,7 @@ c***first executable statement dqagpe
pts(npts+2) = b
do i = 1,npts
pts(i+1) = minval(points(i:npts))
- enddo
+ enddo
!
! compute first integral and error approximations.
! ------------------------------------------------
@@ -1545,7 +1545,7 @@ c because of symmetry only the positive abscissae and their
c corresponding weights are given.
c
c xgk - abscissae of the 15-point kronrod rule
-! xgk(4), xgk(8) abscissae of the 3-point gauss rule
+! xgk(4), xgk(8) abscissae of the 3-point gauss rule
c xgk(2), xgk(4),xgk(6), xgk(8) ... abscissae of the 7-point
c kronrod rule
c xgk(1), xgk(3), ... abscissae which are optimally
@@ -1647,7 +1647,7 @@ c
resk = resk + wgk(jtwm1) * fsum
resabs = resabs + wgk(jtwm1) * (dabs(fval1) + dabs(fval2))
15 continue
-
+
reskh = resk*0.5d+00
resasc = wgk(8)*dabs(fc-reskh)
do 20 j=1,7
@@ -1669,7 +1669,7 @@ c
if(resabs.gt.uflow/(0.5d+02*epmach)) abserr = dmax1
* ((epmach*0.5d+02)*resabs,abserr)
return
-
+
end subroutine dqk9
subroutine dqkl9(f,a,b,result,abserr,resabs,resasc)
! use functionInterface
@@ -1738,7 +1738,7 @@ c because of symmetry only the positive abscissae and their
c corresponding weights are given.
c
c xgk - abscissae of the 9-point Gauss-kronrod-lobatto rule
-! xgk(1), xgk(5) abscissae of the 3-point gauss-lobatto rule
+! xgk(1), xgk(5) abscissae of the 3-point gauss-lobatto rule
c xgk(1), xgk(3),xgk(5) abscissae of the 5-point
c kronrod rule
c xgk(2), xgk(4), ... abscissae which are optimally
@@ -1834,7 +1834,7 @@ c
resk = resk + wgk(jtwm1) * fsum
resabs = resabs + wgk(jtwm1) * (dabs(fval1) + dabs(fval2))
15 continue
-
+
reskh = resk*0.5d+00
resasc = wgk(5)*dabs(fc-reskh)
do 20 j=1,4
@@ -2174,7 +2174,7 @@ c
end subroutine dqelg
DOUBLE PRECISION FUNCTION D1MACH(I)
implicit none
-C
+C
C Double-precision machine constants.
C
C D1MACH( 1) = B**(EMIN-1), the smallest positive magnitude.
@@ -2191,7 +2191,7 @@ C
C Reference: Fox P.A., Hall A.D., Schryer N.L.,"Framework for a
C Portable Library", ACM Transactions on Mathematical
C Software, Vol. 4, no. 2, June 1978, PP. 177-188.
-C
+C
INTEGER , INTENT(IN) :: I
DOUBLE PRECISION, SAVE :: DMACH(7)
DOUBLE PRECISION :: B, EPS
@@ -2203,14 +2203,14 @@ C
IF (DMACH(1) .EQ. 0.0D0) THEN
T = DIGITS(ONE)
B = DBLE(RADIX(ONE)) ! base number
- EPS = SPACING(ONE)
+ EPS = SPACING(ONE)
EMIN = MINEXPONENT(ONE)
EMAX = MAXEXPONENT(ONE)
DMACH(1) = B**(EMIN-1) !TINY(ONE)
DMACH(2) = (B**(EMAX-1)) * (B-B*EPS) !HUGE(ONE)
- DMACH(3) = EPS/B ! EPS/B
+ DMACH(3) = EPS/B ! EPS/B
DMACH(4) = EPS
- DMACH(5) = LOG10(B)
+ DMACH(5) = LOG10(B)
DMACH(6) = B**(EMAX+5) !infinity
DMACH(7) = ZERO/ZERO !nan
ENDIF
@@ -2248,7 +2248,7 @@ C
contains
DOUBLE PRECISION FUNCTION D1MACH(I)
implicit none
-C
+C
C Double-precision machine constants.
C
C D1MACH( 1) = B**(EMIN-1), the smallest positive magnitude.
@@ -2265,7 +2265,7 @@ C
C Reference: Fox P.A., Hall A.D., Schryer N.L.,"Framework for a
C Portable Library", ACM Transactions on Mathematical
C Software, Vol. 4, no. 2, June 1978, PP. 177-188.
-C
+C
INTEGER , INTENT(IN) :: I
DOUBLE PRECISION, SAVE :: DMACH(7)
DOUBLE PRECISION :: B, EPS
@@ -2277,14 +2277,14 @@ C
IF (DMACH(1) .EQ. 0.0D0) THEN
T = DIGITS(ONE)
B = DBLE(RADIX(ONE)) ! base number
- EPS = SPACING(ONE)
+ EPS = SPACING(ONE)
EMIN = MINEXPONENT(ONE)
EMAX = MAXEXPONENT(ONE)
DMACH(1) = B**(EMIN-1) !TINY(ONE)
DMACH(2) = (B**(EMAX-1)) * (B-B*EPS) !HUGE(ONE)
- DMACH(3) = EPS/B ! EPS/B
+ DMACH(3) = EPS/B ! EPS/B
DMACH(4) = EPS
- DMACH(5) = LOG10(B)
+ DMACH(5) = LOG10(B)
DMACH(6) = B**(EMAX+5) !infinity
DMACH(7) = ZERO/ZERO !nan
ENDIF
@@ -2298,7 +2298,7 @@ C
! sequence's limiting value, thus improving the rate of
! convergence. Routine is based on the epsilon algorithm
! of P. Wynn. An estimate of the absolute error is also
-! given.
+! given.
double precision, intent(in) :: E0,E1,E2
double precision, intent(out) :: abserr, result
!locals
@@ -2707,10 +2707,10 @@ C
! call AdaptiveSimpson3(f,pts(k),pts(k+1),tol,kflg,error,valk)
call dqagp(f,pts(k),pts(k+1),0,pts,tol,0.0D0,limit,valk,
* error,neval,kflg)
-
- endif
+
+ endif
abserr = abserr + abs(error)
-
+
errorEstimate = abserr + (b - pts(k+1)) * LTol
excess = epsi - errorEstimate
if (excess < 0.0D0 ) then
@@ -2765,7 +2765,7 @@ C
LTol = 0.1D0 * LTol
endif
elseif ( Lepsi < 5D0 * excess ) then
- LTol = (Lepsi + excess) / delta
+ LTol = (Lepsi + excess) / delta
endif
val = val + valk
if (kflg>0) iflg = IOR(iflg, kflg)
@@ -2808,7 +2808,7 @@ C
hmax = 0.24D0
c
-c initialize everything,
+c initialize everything,
c particularly the first column vector in the stack.
c
val = zero
@@ -2816,14 +2816,14 @@ c
iflg = 0
delta = b - a
-
- h = half * delta
+
+ h = half * delta
c = half * ( a + b )
k = 1
abar = f(a)
cbar = f(c)
bbar = f(b)
-
+
S = (abar + four * cbar + bbar) * h * onethird
v(1,1) = a
v(2,1) = h
@@ -2833,12 +2833,12 @@ c
v(6,1) = S
c
do while ((1<=k) .and. (k <= stackLimit))
-c
+c
c take the last column off the stack and process it.
c
h = half * v(2,k)
y = v(1,k) + h
- z = v(1,k) + three * h
+ z = v(1,k) + three * h
ybar = f(y)
zbar = f(z)
Star = ( v(3,k) + four * ybar + v(4,k) ) * h * onethird
@@ -2846,36 +2846,36 @@ c
SSStar = Star + SStar
Sdiff = (SSStar - v(6,k))
correction = Sdiff * zpz66666 !=0.066666... = 1/15.0D0
- localError = abs(Sdiff) * two
+ localError = abs(Sdiff) * two
! acceptError is made conservative in order to avoid premature termination
- acceptError = (localError * delta <= two* epsi * h
- & .or. localError < small)
+ acceptError = (localError * delta <= two* epsi * h
+ & .or. localError < small)
lastInStack = ( stackLimit <= k)
stepSizeOK = ( h < hMax )
stepSizeTooSmall = ( h < hMin)
- if (lastInStack .or. (stepSizeOK.and.acceptError)
+ if (lastInStack .or. (stepSizeOK.and.acceptError)
& .or. stepSizeTooSmall ) then
! Stop subdividing interval when
! 1) accuracy is sufficient, or
! 2) interval too narrow, or
! 3) subdivided too often. (stack limit reached)
-
+
! Add partial integral and take a new vector from the bottom of the stack.
- abserr = abserr + localError
+ abserr = abserr + localError
val = val + SSStar + correction
k = k - 1
c
if (.not.acceptError) then
if (lastInStack) iflg = IOR(iflg,1) ! stack limit reached
if (stepSizeTooSmall) iflg = IOR(iflg,2) ! stepSize limit reached
- endif
- if (k <= 0) then
+ endif
+ if (k <= 0) then
return
endif
else
-c Subdivide the interval and create two new vectors in the stack,
+c Subdivide the interval and create two new vectors in the stack,
c one of which overwrites the vector just processed.
vbar = v(5,k)
v(2,k) = h
@@ -2898,8 +2898,8 @@ c
! by Per A. Brodtkorb 4 June 2003
! based on psudo code in chapter 7, Kincaid and Cheney (1991).
! Added check on stepsize, i.e., hMin and hMax
-! Added an alternitive check on termination: this is more robust
-! Reference:
+! Added an alternitive check on termination: this is more robust
+! Reference:
! D.R. Kincaid & E.W. Cheney (1991)
! "Numerical Analysis"
! Brooks/Cole Publ., 1991
@@ -2933,13 +2933,13 @@ c
double precision, dimension(4) :: x, fx, Sn
double precision, dimension(5) :: d4fx
double precision, dimension(55) :: EPSTAB
- double precision :: small
+ double precision :: small
double precision :: delta, h, h8, localError, correction
double precision :: Sn1, Sn2, Sn4, Sn1e, Sn2e, Sn4e
double precision :: Sn12, Sn24, Sn124, Sn12e, Sn24e
double precision :: hmax, hmin, dhmin, val0
double precision :: Lepsi,Ltol, excess, deltaK, errorEstimate
- integer :: k, kp1, i, j,ix, numExtrap, IERR
+ integer :: k, kp1, i, j,ix, numExtrap, IERR
integer, parameter :: LIMEXP = 5
logical :: acceptError, lastInStack
logical :: stepSizeTooSmall, stepSizeOK
@@ -2957,17 +2957,17 @@ c
hmin = 1.0D-9
dhmin = 1.0D-1
c
-c initialize everything,
+c initialize everything,
c particularly the first column vector in the stack.
c
val = zero
abserr = zero
iflg = 0
-
+
delta = b - a
- h = half * delta
+ h = half * delta
Ltol = Lepsi / delta
-
+
x(1) = a
x(3) = half * ( a + b )
x(2) = half * ( a + x(3) )
@@ -2986,24 +2986,24 @@ c
v(6 ,1) = x(1)
v(7 ,1) = h
v(8:10,1) = Sn(1:3);
-
+
do while ((1<=k) .and. (k <= stackLimit))
-!
+!
! take the last column off the stack and process it.
!
- h = half * v(7,k)
+ h = half * v(7,k)
do i = 1,4
x(i) = v(6,k) + dble(2*i-1)*h
fx(i) = f(x(i))
- Sn(i) = ( v(i,k) + four * fx(i) + v(i+1,k) ) * h * onethird
+ Sn(i) = ( v(i,k) + four * fx(i) + v(i+1,k) ) * h * onethird
enddo
-
+
stepSizeOK = ( h < hMax )
- lastInStack = ( stackLimit <= k)
+ lastInStack = ( stackLimit <= k)
if (lastInStack .OR. stepSizeOK) then
- Sn1 = v(8,k)
- Sn2 = ( v(9,k) + v(10,k) )
+ Sn1 = v(8,k)
+ Sn2 = ( v(9,k) + v(10,k) )
Sn4 = Sn(1) + Sn(2) + Sn(3) + Sn(4)
if (numExtrap>0) then
Sn12 = (Sn1 - Sn2)
@@ -3012,7 +3012,7 @@ c
Sn1e = Sn2 - Sn12 * zpz66666
Sn2e = Sn4 - Sn24 * zpz66666
Sn12e = ( Sn1e - Sn2e )
-
+
Sn24e = (Sn2e - Sn4)
! Sn1e = Sn2e - Sn12e * zpz66666
! Sn12e = (Sn1e - Sn2e)
@@ -3023,12 +3023,12 @@ c
! Correction based on the assumption of slowly varying fourth derivative
correction = -Sn24 * zpz588 !
else
-! Correction based on assumption that the termination error
+! Correction based on assumption that the termination error
! is of the form: C*h^q
correction = -Sn24 * Sn24 / Sn124
endif
Sn4e = Sn4 + correction
-
+
! NEWFLG = .TRUE.
! CALL DEA(NEWFLG,Sn1,LIMEXP,val0,localError,EPSTAB,IERR)
! CALL DEA(NEWFLG,Sn2,LIMEXP,val0,localError,EPSTAB,IERR)
@@ -3036,7 +3036,7 @@ c
! CALL DEA(NEWFLG,Sn4,LIMEXP,val0,localError,EPSTAB,IERR)
! CALL DEA(NEWFLG,Sn4e,LIMEXP,val0,localError,EPSTAB,IERR)
! localError is made conservative in order to avoid premature
-! termination
+! termination
CALL DEA3(Sn1e,Sn2e,Sn4e,localError,val0)
!if (h>dhMin) then
!localError = max(localError,abs(correction))
@@ -3052,7 +3052,7 @@ c
else
acceptError = .FALSE.
endif
-
+
stepSizeTooSmall = ( h < hMin)
if (lastInStack .or.
& ( stepSizeOK .and. acceptError ) .or.
@@ -3061,17 +3061,17 @@ c
! 1) accuracy is sufficient, or
! 2) interval too narrow, or
! 3) subdivided too often. (stack limit reached)
-
+
! Add partial integral and take a new vector from the bottom of the stack.
-
+
abserr = abserr + max(localError, ten*small*val0)
- val = val + val0
+ val = val + val0
k = k - 1
if (.not.acceptError) then
if (lastInStack) iflg = IOR(iflg,1) !stack limit reached
- if (stepSizeTooSmall) iflg = IOR(iflg,2) !stepSize limit reached
- endif
- if (k <= 0) then
+ if (stepSizeTooSmall) iflg = IOR(iflg,2) !stepSize limit reached
+ endif
+ if (k <= 0) then
exit ! while loop
endif
deltaK = (v(6,k+1)-a)
@@ -3084,16 +3084,16 @@ c
LTol = 0.1D0 * LTol
endif
elseif (.true..or. Lepsi < four * excess ) then
- LTol = (Lepsi + 0.9D0 * excess) / delta
+ LTol = (Lepsi + 0.9D0 * excess) / delta
endif
else
-! Subdivide the interval and create two new vectors in the stack,
+! Subdivide the interval and create two new vectors in the stack,
! one of which overwrites the vector just processed.
!
! v(:,k) = [fx1,fx2,fx3,fx4,fx5,x1,h,S,SL,SR]
kp1 = k + 1;
! Process right interval
- v(1,kp1) = v(3,k); !fx1R
+ v(1,kp1) = v(3,k); !fx1R
v(2,kp1) = fx(3); !fx2R
v(3,kp1) = v(4,k); !fx3R
v(4,kp1) = fx(4); !fx4R
@@ -3102,7 +3102,7 @@ c
v(7,kp1) = h;
v(8,kp1) = v(10,k); ! S
v(9:10,kp1) = Sn(3:4); ! SL, SR
-! Process left interval
+! Process left interval
v(5,k) = v(3,k); ! fx5L
v(4,k) = fx(2); ! fx4L
v(3,k) = v(2,k); ! fx3L
@@ -3115,7 +3115,7 @@ c
k = kp1;
endif
enddo ! while
- if (epsi0) then
Sn12 = (Sn1 - Sn2)
@@ -3255,14 +3255,14 @@ c
! Correction based on the assumption of slowly varying fourth derivative
correction = -Sn48*zpz588 !
else
-! Correction based on assumption that the termination error
+! Correction based on assumption that the termination error
! is of the form: C*h^q
correction = -Sn24e * Sn24e / Sn124
!Sn4e = Sn4e + correction
endif
CALL DEA3(Sn1e,Sn2e,Sn4e,localError,val0)
! localError is made conservative in order to avoid premature
-! termination
+! termination
! localError = max(localError,abs(correction)*three)
! localError = abs(correction)*three
else
@@ -3278,7 +3278,7 @@ c
else
acceptError = .FALSE.
endif
-
+
stepSizeTooSmall = ( h < hMin)
if (lastInStack .or.
& ( stepSizeOK .and. acceptError ) .or.
@@ -3287,17 +3287,17 @@ c
! 1) accuracy is sufficient, or
! 2) interval too narrow, or
! 3) subdivided too often. (stack limit reached)
-
+
! Add partial integral and take a new vector from the bottom of the stack.
-
+
abserr = abserr + max(localError, ten*small*val0)
- val = val + val0
+ val = val + val0
k = k - 1
if (.not.acceptError) then
if (lastInStack) iflg = IOR(iflg,1) !stack limit reached
- if (stepSizeTooSmall) iflg = IOR(iflg,2) !stepSize limit reached
- endif
- if (k <= 0) then
+ if (stepSizeTooSmall) iflg = IOR(iflg,2) !stepSize limit reached
+ endif
+ if (k <= 0) then
exit ! while loop
endif
deltaK = (v(Nrule+1,k+1)-a)
@@ -3310,17 +3310,17 @@ c
LTol = 0.1D0 * LTol
endif
elseif (.TRUE..or. Lepsi < four * excess ) then
- LTol = (Lepsi + 0.9D0 * excess) / delta
+ LTol = (Lepsi + 0.9D0 * excess) / delta
endif
else
-! Subdivide the interval and create two new vectors in the stack,
+! Subdivide the interval and create two new vectors in the stack,
! one of which overwrites the vector just processed.
!
! v(:,k) = [fx1,fx2,..,fx8,fx9,x1,h,S,SL,SR,SL1,SL2 SR1,SR2]
kp1 = k + 1;
! Process right interval
-
- v(1,kp1) = v(5,k); !fx1R
+
+ v(1,kp1) = v(5,k); !fx1R
v(2,kp1) = fx(5); !fx2R
v(3,kp1) = v(6,k); !fx3R
v(4,kp1) = fx(6); !fx4R
@@ -3336,7 +3336,7 @@ c
v(Nrule+4,kp1) = v(Nrule+8,k); ! SL
v(Nrule+5,kp1) = v(Nrule+9,k); ! SR
v(Nrule+6:Nrule+9,kp1) = Sn(5:8); ! SL1,SL2,SR1, SR2
-! Process left interval
+! Process left interval
v(9,k) = v(5,k); ! fx9L
v(8,k) = fx(4); ! fx8L
v(7,k) = v(4,k); ! fx7L
@@ -3355,7 +3355,7 @@ c
k = kp1;
endif
enddo ! while
- if (epsistepSize) then
- Nk = floor((xup-xlo)/stepSize) + 1
+ Nk = floor((xup-xlo)/stepSize) + 1
dx = (xup-xlo)/dble(Nk)
do j=1, Nk -1
Npts = Npts + 1
@@ -3956,12 +3956,12 @@ c
! Sort the candidates
call sortre(brkPts,indices)
! Make unique list of breakpoints
-
+
do k = 1,2*n
brk = brkPts(k)
if (xlo < brk) then
if ( xup <= brk ) exit ! terminate do loop
-
+
! if (Npts>0) then
! xLow = max(xlo, breakPoints(Npts))
! else
@@ -3975,9 +3975,9 @@ c
! breakPoints(Npts) = brk + dx * dble( j )
! enddo
! endif
-
+
kU = indices(k)
-
+
!if ( xlo + distance < brk .and. brk + distance < xup )
!then
if ( den(kU) < 0.2) then
@@ -4016,7 +4016,7 @@ c
breakPoints(Npts) = z2
brkPtsVal(Npts) = integrand(z2)
indices2(Npts) = kU
- kL = kU
+ kL = kU
endif
else
val1 = 0.0d0
@@ -4045,13 +4045,13 @@ c
endif
if (val1 < z1) then
Npts = Npts + 1
- breakPoints(Npts) = z1
+ breakPoints(Npts) = z1
brkPtsVal(Npts) = brkPtsVal(Npts+Nprev)
indices2(Npts) = kU
endif
! Nprev = Nprev + 1
! breakPoints(Npts + Nprev) = brk
-
+
if ((val1< z2) .and. (z2 + distance < xup)) then
Npts = Npts + 1
breakPoints(Npts) = z2
@@ -4075,11 +4075,11 @@ c
! Locals
double precision, parameter :: zero = 0.0D0, one = 1.0D0
integer :: k
-
-! Uses the regression equation to limit the
+
+! Uses the regression equation to limit the
! integration limits zMin and zMax
-
- do k = 1,n
+
+ do k = 1,n
if (ZERO < rho(k)) then
zMax = max(zMin, min(zMax,(b(k)+den(k)*zCutOff)/rho(k)))
zMin = min(zMax, max(zMin,(a(k)-den(k)*zCutOff)/rho(k)))
@@ -4120,14 +4120,14 @@ c
do I = 1, mNdim
zRho = z * mRho(I)
! Uncomment / mDen below if mRho, mA, mB is not scaled
- xUp = ( mB(I) - zRho ) !/ mDen(I)
+ xUp = ( mB(I) - zRho ) !/ mDen(I)
xLo = ( mA(I) - zRho ) !/ mDen(I)
if (zero 37 (or XMAX)
-*
+*
IF ( Z .GT. XMAX .OR. ZABS .GT. 37) THEN
P = 0.d0
ELSE
-*
+*
* |Z| <= 37
-*
+*
Z2 = ZABS * ZABS
EXPNTL = EXP( -Z2 * 0.5D0 )
-*
+*
* |Z| < CUTOFF = 10/SQRT(2)
-*
+*
IF ( ZABS < CUTOFF ) THEN
P = EXPNTL*( (((((P6*ZABS + P5)*ZABS + P4)*ZABS + P3)*ZABS
* + P2)*ZABS + P1)*ZABS + P0)/(((((((Q7*ZABS + Q6)*ZABS
* + Q5)*ZABS + Q4)*ZABS + Q3)*ZABS + Q2)*ZABS + Q1)*ZABS
* + Q0 )
-*
+*
* |Z| >= CUTOFF.
-*
+*
ELSE
- P = EXPNTL/( ZABS + 1.d0/( ZABS + 2.d0/( ZABS + 3.d0/( ZABS
+ P = EXPNTL/( ZABS + 1.d0/( ZABS + 2.d0/( ZABS + 3.d0/( ZABS
* + 4.d0/( ZABS + 0.65D0 ) ) ) ) )/ROOTPI
END IF
END IF
@@ -4332,4 +4332,3 @@ c
END FUNCTION FI
end module mvnProdCorrPrbMod
-
\ No newline at end of file
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb_interface.f b/wafo/source/mvnprd/mvnprodcorrprb_interface.f
similarity index 66%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb_interface.f
rename to wafo/source/mvnprd/mvnprodcorrprb_interface.f
index 190f081..5e27dfd 100644
--- a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb_interface.f
+++ b/wafo/source/mvnprd/mvnprodcorrprb_interface.f
@@ -1,33 +1,33 @@
-
-C gfortran -fPIC -c mvnprodcorrprb.f
-C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --fcompiler=gnu95 --compiler=mingw32 -lmsvcr71
+
+C gfortran -fPIC -c mvnprodcorrprb.f
+C f2py -m mvnprdmod -c mvnprodcorrprb.o mvnprodcorrprb_interface.f --fcompiler=gnu95 --compiler=mingw32 -lmsvcr71
C module mvnprdmod
C contains
subroutine prbnormndpc(prb,abserr,IFT,rho,a,b,N,abseps,releps,
- & useBreakPoints, useSimpson)
- use mvnProdCorrPrbMod, ONLY : mvnprodcorrprb
- integer :: N
+ & useBreakPoints, useSimpson)
+ use mvnProdCorrPrbMod, ONLY : mvnprodcorrprb
+ integer :: N
double precision,dimension(N),intent(in) :: rho,a,b
- double precision,intent(in) :: abseps
- double precision,intent(in) :: releps
- logical, intent(in) :: useBreakPoints
- logical, intent(in) :: useSimpson
+ double precision,intent(in) :: abseps
+ double precision,intent(in) :: releps
+ logical, intent(in) :: useBreakPoints
+ logical, intent(in) :: useSimpson
double precision,intent(out) :: abserr,prb
- integer, intent(out) :: IFT
-
-Cf2py integer, intent(hide), depend(rho) :: N = len(rho)
-Cf2py depend(N) a
-Cf2py depend(N) b
-Cf2py double precision, optional :: abseps = 0.001
-Cf2py double precision, optional :: releps = 0.001
-Cf2py logical, optional :: useBreakPoints =1
-Cf2py logical, optional :: useSimpson = 1
-
-
-
+ integer, intent(out) :: IFT
+
+Cf2py integer, intent(hide), depend(rho) :: N = len(rho)
+Cf2py depend(N) a
+Cf2py depend(N) b
+Cf2py double precision, optional :: abseps = 0.001
+Cf2py double precision, optional :: releps = 0.001
+Cf2py logical, optional :: useBreakPoints =1
+Cf2py logical, optional :: useSimpson = 1
+
+
+
CALL mvnprodcorrprb(rho,a,b,abseps,releps,useBreakPoints,
- & useSimpson,abserr,IFT,prb)
-
+ & useSimpson,abserr,IFT,prb)
+
end subroutine prbnormndpc
C end module mvnprdmod
\ No newline at end of file
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/build_all.py b/wafo/source/mvnprd/old/mvnprodcorrprb/build_all.py
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/build_all.py
rename to wafo/source/mvnprd/old/mvnprodcorrprb/build_all.py
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprodcorrprb.f b/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb.f
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/mvnprodcorrprb.f
rename to wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb.f
diff --git a/pywafo/src/wafo/source/mvnprd/mvnprodcorrprb_interface.f b/wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb_interface.f
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/mvnprodcorrprb_interface.f
rename to wafo/source/mvnprd/old/mvnprodcorrprb/mvnprodcorrprb_interface.f
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/AdaptiveGaussKronrod.f90 b/wafo/source/mvnprd/old/mvnprodcorrprb/old/AdaptiveGaussKronrod.f90
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/AdaptiveGaussKronrod.f90
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/AdaptiveGaussKronrod.f90
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyf b/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyf
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyf
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/adaptivegausskronrod.pyf
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/dea.f b/wafo/source/mvnprd/old/mvnprodcorrprb/old/dea.f
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/dea.f
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/dea.f
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/deamod.pyf b/wafo/source/mvnprd/old/mvnprodcorrprb/old/deamod.pyf
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/deamod.pyf
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/deamod.pyf
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.f90 b/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.f90
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.f90
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/erfcore.f90
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f b/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f90 b/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f90
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f90
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/integration1Dmodule.f90
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.f90 b/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.f90
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.f90
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.f90
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.pyf b/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.pyf
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.pyf
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprb.pyf
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprbmod.f90 b/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprbmod.f90
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprbmod.f90
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/mvnprodcorrprbmod.f90
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsp b/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsp
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsp
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsp
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsw b/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsw
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsw
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.dsw
diff --git a/pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.f b/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.f
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.f
rename to wafo/source/mvnprd/old/mvnprodcorrprb/old/test_mvnprodcorrprb.f
diff --git a/pywafo/src/wafo/source/mvnprd/setup.py b/wafo/source/mvnprd/setup.py
similarity index 100%
rename from pywafo/src/wafo/source/mvnprd/setup.py
rename to wafo/source/mvnprd/setup.py
diff --git a/pywafo/src/wafo/source/old/dunnettprb.f b/wafo/source/old/dunnettprb.f
similarity index 100%
rename from pywafo/src/wafo/source/old/dunnettprb.f
rename to wafo/source/old/dunnettprb.f
diff --git a/pywafo/src/wafo/source/old/erfcore.f b/wafo/source/old/erfcore.f
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcore.f
rename to wafo/source/old/erfcore.f
diff --git a/pywafo/src/wafo/source/old/erfcore.pyf b/wafo/source/old/erfcore.pyf
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcore.pyf
rename to wafo/source/old/erfcore.pyf
diff --git a/pywafo/src/wafo/source/old/erfcoremod.f b/wafo/source/old/erfcoremod.f
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcoremod.f
rename to wafo/source/old/erfcoremod.f
diff --git a/pywafo/src/wafo/source/old/erfcoremod.f90 b/wafo/source/old/erfcoremod.f90
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcoremod.f90
rename to wafo/source/old/erfcoremod.f90
diff --git a/pywafo/src/wafo/source/old/erfcoremod.pyf b/wafo/source/old/erfcoremod.pyf
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcoremod.pyf
rename to wafo/source/old/erfcoremod.pyf
diff --git a/pywafo/src/wafo/source/old/erfcoremod0.f90 b/wafo/source/old/erfcoremod0.f90
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcoremod0.f90
rename to wafo/source/old/erfcoremod0.f90
diff --git a/pywafo/src/wafo/source/old/erfcoremod1.pyf b/wafo/source/old/erfcoremod1.pyf
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcoremod1.pyf
rename to wafo/source/old/erfcoremod1.pyf
diff --git a/pywafo/src/wafo/source/old/erfcoremod_interface.f90 b/wafo/source/old/erfcoremod_interface.f90
similarity index 100%
rename from pywafo/src/wafo/source/old/erfcoremod_interface.f90
rename to wafo/source/old/erfcoremod_interface.f90
diff --git a/pywafo/src/wafo/source/rind2007/.cproject b/wafo/source/rind2007/.cproject
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/.cproject
rename to wafo/source/rind2007/.cproject
diff --git a/pywafo/src/wafo/source/rind2007/.project b/wafo/source/rind2007/.project
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/.project
rename to wafo/source/rind2007/.project
diff --git a/pywafo/src/wafo/source/rind2007/Debug/makefile b/wafo/source/rind2007/Debug/makefile
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/Debug/makefile
rename to wafo/source/rind2007/Debug/makefile
diff --git a/pywafo/src/wafo/source/rind2007/Debug/objects.mk b/wafo/source/rind2007/Debug/objects.mk
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/Debug/objects.mk
rename to wafo/source/rind2007/Debug/objects.mk
diff --git a/pywafo/src/wafo/source/rind2007/Debug/sources.mk b/wafo/source/rind2007/Debug/sources.mk
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/Debug/sources.mk
rename to wafo/source/rind2007/Debug/sources.mk
diff --git a/pywafo/src/wafo/source/rind2007/Debug/subdir.mk b/wafo/source/rind2007/Debug/subdir.mk
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/Debug/subdir.mk
rename to wafo/source/rind2007/Debug/subdir.mk
diff --git a/pywafo/src/wafo/source/rind2007/build_all.py b/wafo/source/rind2007/build_all.py
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/build_all.py
rename to wafo/source/rind2007/build_all.py
diff --git a/pywafo/src/wafo/source/rind2007/erfcoremod.f b/wafo/source/rind2007/erfcoremod.f
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/erfcoremod.f
rename to wafo/source/rind2007/erfcoremod.f
diff --git a/pywafo/src/wafo/source/rind2007/fimod.f b/wafo/source/rind2007/fimod.f
similarity index 99%
rename from pywafo/src/wafo/source/rind2007/fimod.f
rename to wafo/source/rind2007/fimod.f
index ab7bd7d..83f2ebb 100644
--- a/pywafo/src/wafo/source/rind2007/fimod.f
+++ b/wafo/source/rind2007/fimod.f
@@ -7,7 +7,7 @@
!
! FIMOD contains functions for calculating 1D, 2D and 3D Normal and student T probabilites
! and 1D expectations
- MODULE FIMOD
+ MODULE FIMOD
! USE ERFCOREMOD
IMPLICIT NONE
PRIVATE
@@ -1127,7 +1127,7 @@
CALL SINCS( AR + RUC*X, R, RR )
TVTMFN = TVTMFN - RUC*PNTGND( NU, H2, H3, H1, ZRO, ZRO, R, RR )
END IF
- END FUNCTION TVTMFN
+ END FUNCTION TVTMFN
!
SUBROUTINE SINCS( X, SX, CS )
!
@@ -1234,8 +1234,8 @@
!
! Kronrod Rule
!
- DOUBLE PRECISION, intent(in) :: A, B
- DOUBLE PRECISION, intent(out) :: ERR
+ DOUBLE PRECISION, intent(in) :: A, B
+ DOUBLE PRECISION, intent(out) :: ERR
DOUBLE PRECISION T, CEN, FC, WID, RESG, RESK
!
! The abscissae and weights are given for the interval (-1,1);
@@ -1315,7 +1315,7 @@
KRNRDT = WID * RESK
ERR = ABS( WID * ( RESK - RESG ) )
END FUNCTION KRNRDT
-! END FUNCTION TVTL
+! END FUNCTION TVTL
FUNCTION GAUSINT (X1, X2, A, B, C, D) RESULT (value)
! USE GLOBALDATA,ONLY: xCutOff
diff --git a/pywafo/src/wafo/source/rind2007/intmodule.f b/wafo/source/rind2007/intmodule.f
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/intmodule.f
rename to wafo/source/rind2007/intmodule.f
diff --git a/pywafo/src/wafo/source/rind2007/jacobmod.f b/wafo/source/rind2007/jacobmod.f
similarity index 100%
rename from pywafo/src/wafo/source/rind2007/jacobmod.f
rename to wafo/source/rind2007/jacobmod.f
diff --git a/pywafo/src/wafo/source/rind2007/rind71mod.f b/wafo/source/rind2007/rind71mod.f
similarity index 83%
rename from pywafo/src/wafo/source/rind2007/rind71mod.f
rename to wafo/source/rind2007/rind71mod.f
index 8f9b9bd..16ec81f 100644
--- a/pywafo/src/wafo/source/rind2007/rind71mod.f
+++ b/wafo/source/rind2007/rind71mod.f
@@ -1,49 +1,49 @@
!****************************************************************************
! if compilation complains about too many continuation lines extend it.
-!
!
-! modules: GLOBALDATA, QUAD, RIND71MOD Version 1.0
!
-! Programs available in module RIND71MOD :
-! (NB! the GLOBALDATA and QUAD module is also used to transport the inputs)
+! modules: GLOBALDATA, QUAD, RIND71MOD Version 1.0
+!
+! Programs available in module RIND71MOD :
+! (NB! the GLOBALDATA and QUAD module is also used to transport the inputs)
!
!
! SETDATA initializes global constants explicitly:
-!
-! CALL SETDATA(EPSS,REPS,EPS2,NIT,xCutOff,NINT,XSPLT)
+!
+! CALL SETDATA(EPSS,REPS,EPS2,NIT,xCutOff,NINT,XSPLT)
!
! GLOBALDATA module :
! EPSS,CEPSS = 1.d0 - EPSS , controlling the accuracy of indicator function
! EPS2 = if conditional variance is less it is considered as zero
-! i.e., the variable is considered deterministic
+! i.e., the variable is considered deterministic
! xCutOff = 5 (standard deviations by default)
!
-! QUAD module:
+! QUAD module:
! Nint1(i) = quadrature formulae used in integration of Xd(i)
-! implicitly determining # nodes
+! implicitly determining # nodes
!
! INITDATA initializes global constants implicitly:
!
-! CALL INITDATA (speed)
+! CALL INITDATA (speed)
!
-! speed = 1,2,...,9 (1=slowest and most accurate,9=fastest,
+! speed = 1,2,...,9 (1=slowest and most accurate,9=fastest,
! but less accurate)
!
-! see the GLOBALDATA and QUAD module for other constants and default values
+! see the GLOBALDATA and QUAD module for other constants and default values
!
!
-!RIND71 computes E[Jacobian*Indicator|Condition]*f_{Xc}(xc(:,ix))
+!RIND71 computes E[Jacobian*Indicator|Condition]*f_{Xc}(xc(:,ix))
!
! where
! "Indicator" = I{ H_lo(i) < X(i) < H_up(i), i=1:Nt+Nd }
-! "Jacobian" = J(X(Nt+1),...,X(Nt+Nd+Nc)), special case is
+! "Jacobian" = J(X(Nt+1),...,X(Nt+Nd+Nc)), special case is
! "Jacobian" = |X(Nt+1)*...*X(Nt+Nd)|=|Xd(1)*Xd(2)..Xd(Nd)|
! "condition" = Xc=xc(:,ix), ix=1,...,Nx.
-! X = [Xt; Xd ;Xc], a stochastic vector of Multivariate Gaussian
+! X = [Xt; Xd ;Xc], a stochastic vector of Multivariate Gaussian
! variables where Xt,Xd and Xc have the length Nt, Nd and Nc,
-! respectively.
-! (Recommended limitations Nx, Nt<101, Nd<7 and NIT,Nc<11)
-! (RIND = Random Integration N Dimensions)
+! respectively.
+! (Recommended limitations Nx, Nt<101, Nd<7 and NIT,Nc<11)
+! (RIND = Random Integration N Dimensions)
!
!CALL RIND71(E,S,m,xc,indI,Blo,Bup,xcScale);
!
@@ -52,43 +52,43 @@
! NB!: out=conditional sorted Covariance matrix
! m = the expectation of X=[Xt;Xd;Xc] size N x 1 (in)
! xc = values to condition on size Nc x Nx (in)
-! indI = vector of indices to the different barriers in the (in)
-! indicator function, length NI, where NI = Nb+1
+! indI = vector of indices to the different barriers in the (in)
+! indicator function, length NI, where NI = Nb+1
! (NB! restriction indI(1)=0, indI(NI)=Nt+Nd )
!Blo,Bup = Lower and upper barrier coefficients used to compute the (in)
-! integration limits Hlo and Hup, respectively.
+! integration limits Hlo and Hup, respectively.
! size Mb x Nb. If Mb 0 then you must initialize the random generator before you
+! if SCIS > 0 then you must initialize the random generator before you
! call rindd by the following lines:
!
-! call random_seed(SIZE=seed_size)
-! allocate(seed(seed_size))
+! call random_seed(SIZE=seed_size)
+! allocate(seed(seed_size))
! call random_seed(GET=seed(1:seed_size)) ! get current seed
! seed(1)=seed1 ! change seed
-! call random_seed(PUT=seed(1:seed_size))
+! call random_seed(PUT=seed(1:seed_size))
! deallocate(seed)
!
-! For further description see the modules
+! For further description see the modules
!
!
! References
@@ -125,15 +125,15 @@
!
! R. Ambartzumian, A. Der Kiureghian, V. Ohanian and H.
! Sukiasian (1998)
-! "Multinormal probabilities by sequential conditioned
+! "Multinormal probabilities by sequential conditioned
! importance sampling: theory and application" (RINDSCIS, MNORMPRB,MVNFUN,MVNFUN2)
-! Probabilistic Engineering Mechanics, Vol. 13, No 4. pp 299-308
+! Probabilistic Engineering Mechanics, Vol. 13, No 4. pp 299-308
!
! Alan Genz (1992)
! 'Numerical Computation of Multivariate Normal Probabilites'
! J. computational Graphical Statistics, Vol.1, pp 141--149
!
-! William H. Press, Saul Teukolsky,
+! William H. Press, Saul Teukolsky,
! William T. Wetterling and Brian P. Flannery (1997)
! "Numerical recipes in Fortran 77", Vol. 1, pp 55-63, 299--305 (SVDCMP,SOBSEQ)
!
@@ -152,12 +152,12 @@
! Tested on: DIGITAL UNIX Fortran90 compiler
! PC pentium II with Lahey Fortran90 compiler
-! Solaris with SunSoft F90 compiler Version 1.0.1.0 (21229283)
-! History:
-! revised pab aug 2009
-! -moved c1c2 to c1c2mod
-! -removed rateLHD, useMIDP, FxCutOff, CFxCutOff from globaldata module
-! revised pab July 2007
+! Solaris with SunSoft F90 compiler Version 1.0.1.0 (21229283)
+! History:
+! revised pab aug 2009
+! -moved c1c2 to c1c2mod
+! -removed rateLHD, useMIDP, FxCutOff, CFxCutOff from globaldata module
+! revised pab July 2007
! -reordered integration methods (SCIS)
! revised pab 9 may 2004
! removed xcutoff2
@@ -172,23 +172,23 @@
! revised pab 19.01.2001
! - added a NEW BVU function
! revised pab 06.11.2000
-! - added checks in condsort2, condsort3, condsort4 telling if the matrix is
+! - added checks in condsort2, condsort3, condsort4 telling if the matrix is
! negative definit
! - changed the order of SCIS integration again.
! revised pab 07.09.2000
! - To many continuation lines in QUAD module =>
! broke them up and changed PARAMETER statements into DATA
-! statements instead.
+! statements instead.
! revised pab 22.05.2000
-! - changed order of SCIS integration: moved the less important SCIS
+! - changed order of SCIS integration: moved the less important SCIS
! revised pab 19.04.2000
! - found a bug in THL when L<-1, now fixed
! revised pab 18.04.2000
! new name rind60
-! New assumption of BIG for the conditional sorted variables:
+! New assumption of BIG for the conditional sorted variables:
! BIG(I,I)=sqrt(Var(X(I)|X(I+1)...X(N))=SQI
! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))/SQI
-! Otherwise
+! Otherwise
! BIG(I,I) = Var(X(I)|X(I+1)...X(N)
! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))
! This also affects C1C2: SQ0=sqrt(Var(X(I)|X(I+1)...X(N)) is removed from input
@@ -201,14 +201,14 @@
! - new name rind57
! - added condsort0 and condsort4 which sort the covariance matrix using the shortest
! expected integration interval => integration time is much shorter for all methods.
-! condsort and condsort3 sort by decreasing conditional variance
+! condsort and condsort3 sort by decreasing conditional variance
! revised pab 17.03.2000
! - changed argp0 so that I0 and I1 really are the indices to the minimum and the second minimum
! - changed rindnit so that norm2dprb is called whenever NITL<1 and Nsnew>=2
! - changed default parameters for initdata for speed=7,8 and 9 to increase accuracy.
! - Changed so that xCutOff varies with speed => program is much faster without loosing any accuracy it seems
! revised pab 15.03.2000
-! - changed rindscis and mnormprb: moved the actual multidimensional integration
+! - changed rindscis and mnormprb: moved the actual multidimensional integration
! into separate module, rcrudemod.f (as a consequence SVDCMP,PYTHAG and SORTRE
! are also moved into this module) => made the structure of the program simpler
! - added the possibility to use adapt, krbvrc, krobov and ranmc to integrate
@@ -224,35 +224,35 @@
! Probably there is an error somehere making variable "value" to behave badly.
!Revised by IR. 03.01.2000 Bug in C1C2 fixed and deallocation of ind in RINDNIT.
!revised by I.R. 27.12.1999, New name RIND51.f
-! I have changed assumption about deterministic variables. Those have now
+! I have changed assumption about deterministic variables. Those have now
! variances equal EPS2 not zero and have consequences for C1C2 and on some
! places in RINDND. The effect is that barriers becomes fuzzy (not sharp)
! and prevents for discountinuities due to numerical errors of order 1E-16.
-! The program RIND0 is removed making the structure of program simpler.
+! The program RIND0 is removed making the structure of program simpler.
! We have still a problem when variables in indicator become
-! deterministic before conditioning on derivatives in Xd - it needs to be solved.
+! deterministic before conditioning on derivatives in Xd - it needs to be solved.
!revised by Igor Rychlik 01.12.1999 New name RIND49.f
! - changed RINDNIT and ARGP0 in order to exclude
-! irrelevant variables (such that probability of beeing
+! irrelevant variables (such that probability of beeing
! between barriers is 1.) All computations related to NIT
-! are moved to RINDNIT (removing RIND2,RIND3). This caused some changes
-! in RIND0,RINDDND. Furthermore RINDD1 is removed and moved
-! some parts of it to RINDDND. This made program few seconds slower. The lower
+! are moved to RINDNIT (removing RIND2,RIND3). This caused some changes
+! in RIND0,RINDDND. Furthermore RINDD1 is removed and moved
+! some parts of it to RINDDND. This made program few seconds slower. The lower
! bound in older ARGP0 programs contained logical error - corrected.
!revised by Per A. Brodtkorb 08.11.1999
-! - fixed a bug in rinddnd
+! - fixed a bug in rinddnd
! new line: CmNew(Nst+1:Nsd-1)= Cm(Nst+1:Nsd-1)
!revised by Per A. Brodtkorb 28.10.1999
! - fixed a bug in rinddnd
-! - changed rindscis, mnormprb
+! - changed rindscis, mnormprb
! - added MVNFUN, MVNFUN2
-! - replaced CVaccept with RelEps
+! - replaced CVaccept with RelEps
!revised by Per A. Brodtkorb 27.10.1999
! - changed NINT to NINT1 due to naming conflict with an intrinsic of the same name
!revised by Per A. Brodtkorb 25.10.1999
-! - added an alternative FIINV for use in rindscis and mnormprb
+! - added an alternative FIINV for use in rindscis and mnormprb
!revised by Per A. Brodtkorb 13.10.1999
-! - added useMIDP for use in rindscis and mnormprb
+! - added useMIDP for use in rindscis and mnormprb
!
!revised by Per A. Brodtkorb 22.09.1999
! - removed all underscore letters due to
@@ -272,7 +272,7 @@
! - increased the default NUGGET from 1.d-12 to 1.d-8
! - also set NUGGET depending on speed in INITDATA
! revised by Per A. Brodtkorb 27.08.1999
-! - changed rindnit,rind2:
+! - changed rindnit,rind2:
! enabled option to do the integration faster/(smarter?).
! See GLOBALDATA for XSPLT
! revised by Per A. Brodtkorb 17.08.1999
@@ -289,12 +289,12 @@
! - fixed some bugs
! - added some additonal checks
! - added Hermite, Laguerre quadratures for alternative integration
-! - rewritten CONDSORT, conditional covariance matrix in upper
-! triangular.
+! - rewritten CONDSORT, conditional covariance matrix in upper
+! triangular.
! - RINDXXX routines only work on the upper triangular
! of the covariance matrix
-! - Added a Nugget effect to the covariance matrix in order
-! to ensure the conditioning is not corrupted by numerical errors
+! - Added a Nugget effect to the covariance matrix in order
+! to ensure the conditioning is not corrupted by numerical errors
! - added the option to condsort Nj variables of Xt, i.e.,
! enabling direct integration like the integration of Xd
! by Igor Rychlik 29.10.1998 (PROGRAM RIND11 --- Version 1.0)
@@ -304,33 +304,33 @@
!*********************************************************************
MODULE GLOBALDATA
- IMPLICIT NONE
+ IMPLICIT NONE
! Constants determining accuracy of integration
!-----------------------------------------------
- !if the conditional variance are less than:
- DOUBLE PRECISION :: EPS2=1.d-4 !- EPS2, the variable is
- ! considered deterministic
+ !if the conditional variance are less than:
+ DOUBLE PRECISION :: EPS2=1.d-4 !- EPS2, the variable is
+ ! considered deterministic
DOUBLE PRECISION :: EPS = 1.d-2 ! SQRT(EPS2)
DOUBLE PRECISION :: XCEPS2=1.d-16 ! if Var(Xc) is less return NaN
- DOUBLE PRECISION :: EPSS = 5.d-5 ! accuracy of Indicator
- DOUBLE PRECISION :: CEPSS=0.99995 ! accuracy of Indicator
- DOUBLE PRECISION :: EPS0 = 5.d-5 ! used in GAUSSLE1 to implicitly
- ! determ. # nodes
- DOUBLE PRECISION :: xcScale=0.d0
+ DOUBLE PRECISION :: EPSS = 5.d-5 ! accuracy of Indicator
+ DOUBLE PRECISION :: CEPSS=0.99995 ! accuracy of Indicator
+ DOUBLE PRECISION :: EPS0 = 5.d-5 ! used in GAUSSLE1 to implicitly
+ ! determ. # nodes
+ DOUBLE PRECISION :: xcScale=0.d0
DOUBLE PRECISION :: fxcEpss=1.d-20 ! if less do not compute E(...|Xc)
- DOUBLE PRECISION :: xCutOff=5.d0 ! upper/lower truncation limit of the
- ! normal CDF
- ! Nugget>0: Adds a small value to diagonal
+ DOUBLE PRECISION :: xCutOff=5.d0 ! upper/lower truncation limit of the
+ ! normal CDF
+ ! Nugget>0: Adds a small value to diagonal
! elements of the covariance matrix to ensure
- ! that the inversion is not corrupted by
- ! round off errors.
- ! Good choice might be 1e-8
+ ! that the inversion is not corrupted by
+ ! round off errors.
+ ! Good choice might be 1e-8
DOUBLE PRECISION :: NUGGET=1.d-8 ! Obs NUGGET must be smaller then EPS2
-
+
!parameters controlling the performance of RINDSCIS and MNORMPRB:
- INTEGER :: SCIS=0 !=0 integr. all by quadrature
- !=1 Integrate all by SADAPT for Ndim<9 and by KRBVRC otherwise
- !=2 Integrate all by SADAPT for Ndim<9 and by KROBOV otherwise
+ INTEGER :: SCIS=0 !=0 integr. all by quadrature
+ !=1 Integrate all by SADAPT for Ndim<9 and by KRBVRC otherwise
+ !=2 Integrate all by SADAPT for Ndim<9 and by KROBOV otherwise
!=3 Integrate all by KRBVRC (Fast and reliable)
!=4 Integrate all by KROBOV (Fast and reliable)
!=5 Integrate all by RCRUDE (Reliable)
@@ -338,16 +338,16 @@
!=7 Integrate all by DKBVRC (Ndim<1001)
INTEGER :: NSIMmax = 1000 ! maximum number of simulations per stochastic dimension
INTEGER :: NSIMmin = 10 ! minimum number of simulations per stochastic dimension
- INTEGER :: Ntscis = 0 ! Ntscis=Nt-Nj-Njj when SCIS>0 otherwise Ntscis=0
- DOUBLE PRECISION :: RelEps = 0.001 ! Relative error, i.e. if
+ INTEGER :: Ntscis = 0 ! Ntscis=Nt-Nj-Njj when SCIS>0 otherwise Ntscis=0
+ DOUBLE PRECISION :: RelEps = 0.001 ! Relative error, i.e. if
! 3.0*STD(XIND)/XIND is less we accept the estimate
! The following may be allocated outside RINDD
! if one wants the coefficient of variation, i.e.
- ! STDEV(XIND)/XIND when SCIS=2. (NB: size Nx)
+ ! STDEV(XIND)/XIND when SCIS=2. (NB: size Nx)
DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: COV
integer :: COVix ! counting variable for COV
- LOGICAL,PARAMETER :: useC1C2=.true. ! use C1C2 in rindscis,mnormprb
- LOGICAL,PARAMETER :: C1C2det=.true. ! use C1C2 only on the variables that becomes
+ LOGICAL,PARAMETER :: useC1C2=.true. ! use C1C2 in rindscis,mnormprb
+ LOGICAL,PARAMETER :: C1C2det=.true. ! use C1C2 only on the variables that becomes
! deterministic after conditioning on X(N)
! used in rinddnd rindd1 and rindscis mnormprb
@@ -355,20 +355,20 @@
! if Hup>=xCutOff AND Hlo<-XSPLT OR
! Hup>=XSPLT AND Hl0<=-xCutOff then
! do a different integration to increase speed
- ! in rind2 and rindnit. This give slightly different
+ ! in rind2 and rindnit. This give slightly different
! results
! DEFAULT 5 =xCutOff => do the same integration allways
- ! However, a resonable value is XSPLT=1.5
- DOUBLE PRECISION :: XSPLT = 5.d0 ! DEFAULT XSPLT= 5 =xCutOff
- ! weight between upper&lower limit returned by ARGP0
- DOUBLE PRECISION, PARAMETER :: Plowgth=0.d0 ! 0 => no weight to
+ ! However, a resonable value is XSPLT=1.5
+ DOUBLE PRECISION :: XSPLT = 5.d0 ! DEFAULT XSPLT= 5 =xCutOff
+ ! weight between upper&lower limit returned by ARGP0
+ DOUBLE PRECISION, PARAMETER :: Plowgth=0.d0 ! 0 => no weight to
! lower limit
INTEGER :: NIT=2 ! NIT=maximum # of iterations/integrations by
- ! quadrature used to calculate the indicator function
+ ! quadrature used to calculate the indicator function
! size information of the covariance matrix BIG
- ! Nt,Nd,....Ntd,Nx must be set before calling
- ! RINDD. NsXtmj, NsXdj is set in RINDD
+ ! Nt,Nd,....Ntd,Nx must be set before calling
+ ! RINDD. NsXtmj, NsXdj is set in RINDD
INTEGER :: Nt,Nd,Nc,Ntdc,Ntd,Nx
! Constants determines how integration is done
INTEGER :: Nj=0,Njj=0 ! Njj is not implemented yet
@@ -376,10 +376,10 @@
! Blo/Bup size Mb x NI-1
! indI vector of length NI
INTEGER :: NI,Mb ! must be set before calling RINDD
-
+
! The following is allocated in RINDD
- DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: SQ
- DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: Hlo,Hup
+ DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: SQ
+ DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: Hlo,Hup
INTEGER, DIMENSION(:), ALLOCATABLE :: index1,xedni,indXtd
INTEGER, DIMENSION(:), ALLOCATABLE :: NsXtmj, NsXdj
@@ -393,87 +393,87 @@
DOUBLE PRECISION, PARAMETER :: PI= 3.14159265358979D0 !=pi
DOUBLE PRECISION, PARAMETER :: TWOPI=6.28318530717958D0 !=2*pi
END MODULE GLOBALDATA
-
- MODULE C1C2MOD
- IMPLICIT NONE
- INTERFACE C1C2
- MODULE PROCEDURE C1C2
- END INTERFACE
+
+ MODULE C1C2MOD
+ IMPLICIT NONE
+ INTERFACE C1C2
+ MODULE PROCEDURE C1C2
+ END INTERFACE
CONTAINS
- SUBROUTINE C1C2(C1, C2, Cm, B1, SQ, ind)
+ SUBROUTINE C1C2(C1, C2, Cm, B1, SQ, ind)
! The regression equation for the conditional distr. of Y given X=x
! is equal to the conditional expectation of Y given X=x, i.e.,
-!
+!
! E(Y|X=x)=E(Y)+Cov(Y,X)/Var(X)[x-E(X)]
!
-! Let x1=(x-E(X))/SQRT(Var(X)) be zero mean, C1Hup(I) or
!
-! Since we are truncating all Gaussian variables to
-! the interval [-C,C], then if for any I
-!
-! a) Cm(I)+x1*B1(I)-C*SQ(I)>Hup(I) or
-!
-! b) Cm(I)+x1*B1(I)+C*SQ(I)0
@@ -482,9 +482,9 @@
ENDIF
IF (C1.LT.CC1) THEN
C1 = CC1 !changedLimits=1
- IF (C2.GT.CC2) C2 = CC2
+ IF (C2.GT.CC2) C2 = CC2
IF (C1.GE.C2) GO TO 112
- ELSEIF (C2.GT.CC2) THEN
+ ELSEIF (C2.GT.CC2) THEN
C2 = CC2 !changedLimits=1
IF (C1.GE.C2) GO TO 112
END IF
@@ -492,42 +492,42 @@
END DO
!IF (changedLimits.EQ.1) THEN
! PRINT *,'C1C2=',C1,C2
-!END IF
+!END IF
RETURN
112 continue
C1 = -2D0*xCutOff
- C2 = -2D0*xCutOff
-
+ C2 = -2D0*xCutOff
+
RETURN
END SUBROUTINE C1C2
END MODULE C1C2MOD
!**************************************
- MODULE FUNCMOD
+ MODULE FUNCMOD
! FUNCTION module containing constants transfeered to mvnfun and mvnfun2
- IMPLICIT NONE
+ IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(:,:), ALLOCATABLE :: BIG
DOUBLE PRECISION, DIMENSION(: ), ALLOCATABLE :: Cm,CmN,xd,xc
DOUBLE PRECISION :: Pl1,Pu1
-
+
INTERFACE MVNFUN
MODULE PROCEDURE MVNFUN
END INTERFACE
-
+
INTERFACE MVNFUN2
MODULE PROCEDURE MVNFUN2
END INTERFACE
CONTAINS
function MVNFUN(Ndim,W) RESULT (XIND)
- USE FIMOD
+ USE FIMOD
USE C1C2MOD
USE JACOBMOD
USE GLOBALDATA, ONLY : Hlo,Hup,xCutOff,Nt,Nd,Nj,Ntd,SQ,
& NsXtmj, NsXdj,indXtd,index1,useC1C2,C1C2det,EPS2
IMPLICIT NONE
- DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: W
+ DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: W
INTEGER, INTENT(in) :: Ndim
DOUBLE PRECISION :: XIND
!local variables
@@ -537,10 +537,10 @@
INTEGER :: Ndleft,Ndjleft,Ntmj
!MVNFUN Multivariate Normal integrand function
-! where the integrand is transformed from an integral
+! where the integrand is transformed from an integral
! having integration limits Hl0 and Hup to an
! integral having constant integration limits i.e.
-! Hup 1
+! Hup 1
! int jacob(xd,xc)*f(xd,xt)dxt dxd = int F2(W) dW
!Hlo 0
!
@@ -548,12 +548,12 @@
! The vector must have the length Ndim=Nst0+Ntd-Nsd0
! BIG - conditional sorted covariance matrix (IN)
! Cm = conditional mean of Xd and Xt given Xc, E(Xd,Xt|Xc)
-! CmN - local conditional mean
+! CmN - local conditional mean
! xd - variables to the jacobian variable, need no initialization
-! xc - conditional variables (IN)
+! xc - conditional variables (IN)
! Pl1 = FI(XMI) for the first integration variable (IN)
! Pu1 = FI(XMA) ------||-------------------------------
-! print *,'MVNFUN, ndim', ndim, shape(W)
+! print *,'MVNFUN, ndim', ndim, shape(W)
CmN(1:Ntd) = Cm(1:Ntd) ! initialize conditional mean
Nst = NsXtmj(Ntd+1) ! index to last stoch variable of Xt before conditioning on X(Ntd)
Ntmj=Nt-Nj
@@ -565,7 +565,7 @@
endif
Pl=Pl1
Pu=Pu1
-! IF (NDIM.LT.Nst0+Ntd-Nsd0+1) PRINT *, 'MVNFUN NDIM,',NDIM
+! IF (NDIM.LT.Nst0+Ntd-Nsd0+1) PRINT *, 'MVNFUN NDIM,',NDIM
Y=Pu-Pl
if (Nd+Nj.EQ.0) then
SQ0=SQ(1,1)
@@ -575,13 +575,13 @@
Nsd = NsXdj(Ndjleft+1) ! index to last stoch variable of Xd and Nj of Xt before conditioning on X(Ntd)
Ndleft=Nd
SQ0=SQ(Ntd,Ntd)
- !print *,'mvnfun,nst,nsd,nd,nj',nst,nsd,Nd,Nj
+ !print *,'mvnfun,nst,nsd,nd,nj',nst,nsd,Nd,Nj
!print *,'mvn start K loop'
DO K=Ntd-1,Nsd0,-1
X=FIINV(Pl+W(Ntd-K)*(Pu-Pl))
IF (index1(K+1).GT.Nt) THEN ! isXd
xd (Ndleft) = CmN(K+1)+X*SQ0
- Ndleft=Ndleft-1
+ Ndleft=Ndleft-1
END IF
Nst = NsXtmj(K+1) ! # stoch. var. of Xt before conditioning on X(K)
if (Nst.GT.0) CmN(1:Nst) =CmN(1:Nst)+X*BIG(1:Nst,K+1) !/SQ0
@@ -590,15 +590,15 @@
Ndjleft = Ndjleft-1
Nsd = NsXdj(Ndjleft+1)
SQ0 = SQ(K,K)
-
+
XMA = (Hup (K)-CmN(K))/SQ0
XMI = (Hlo (K)-CmN(K))/SQ0
-
- if (useC1C2) then ! see if we can narrow down sampling range
+
+ if (useC1C2) then ! see if we can narrow down sampling range
XMI=max(XMI,-xCutOff)
XMA=min(XMA,xCutOff)
if (C1C2det) then
- NsdN = NsXdj(Ndjleft)
+ NsdN = NsXdj(Ndjleft)
NstN = NsXtmj(K)
CALL C1C2(XMI,XMA,CmN(Nsd:NsdN-1),
& BIG(Nsd:NsdN-1,K),SQ(Nsd:NsdN-1,K),
@@ -611,12 +611,12 @@
& SQ(Nsd:K-1,Ntmj+Ndjleft),indXtd(Nsd:K-1))
CALL C1C2(XMI,XMA,CmN(1:Nst),BIG(1:Nst,K)
& ,SQ(1:Nst,Ntmj+Ndjleft),indXtd(1:Nst))
- endif
+ endif
IF (XMA.LE.XMI) goto 260
endif
Pl = FI(XMI)
Pu = FI(XMA)
- Y=Y*(Pu-Pl)
+ Y=Y*(Pu-Pl)
ENDDO ! K LOOP
X = FIINV(Pl+W(Ntd-Nsd0+1)*(Pu-Pl))
Nst = NsXtmj(Nsd0) ! # stoch. var. of Xt after conditioning on X(Nsd0)
@@ -625,15 +625,15 @@
if (Nd.gt.0) then
CmN(Nsd:Nsd0-1) = CmN(Nsd:Nsd0-1)+X*BIG(Nsd:Nsd0-1,Nsd0) !/SQ0
if (Ndleft.gt.0) then
- if (index1(Nsd0).GT.Nt) then
+ if (index1(Nsd0).GT.Nt) then
xd (Ndleft) = CmN(Nsd0)+X*SQ0
Ndleft=Ndleft-1
endif
- K=Nsd0-1
+ K=Nsd0-1
do while (Ndleft.gt.0)
if ((index1(K).GT.Nt)) THEN ! isXd
xd (Ndleft) = CmN(K)
- Ndleft=Ndleft-1
+ Ndleft=Ndleft-1
END IF
K=K-1
ENDDO
@@ -645,32 +645,32 @@
SQ0 = SQ(1,1)
XMA = MIN((Hup (1)-CmN(1))/SQ0,xCutOff)
XMI = MAX((Hlo (1)-CmN(1))/SQ0,-xCutOff)
-
+
if (C1C2det) then
- NstN = NsXtmj(1) ! # stoch. var. after conditioning
+ NstN = NsXtmj(1) ! # stoch. var. after conditioning
CALL C1C2(XMI,XMA,CmN(NstN+1:Nst),
& BIG(1,NstN+1:Nst),SQ(NstN+1:Nst,1),
& indXtd(NstN+1:Nst))
else
CALL C1C2(XMI,XMA,CmN(2:Nst),BIG(1,2:Nst),
& SQ(2:Nst,1),indXtd(2:Nst))
- endif
+ endif
IF (XMA.LE.XMI) GO TO 260
Pl = FI(XMI)
Pu = FI(XMA)
Y = Y*(Pu-Pl)
endif
- !if (COVix.gt.2) then
+ !if (COVix.gt.2) then
!print *,' mvnfun start K2 loop'
!endif
200 do K = 2,Nst0
- X = FIINV(Pl+W(Ntd-Nsd0+K)*(Pu-Pl))
+ X = FIINV(Pl+W(Ntd-Nsd0+K)*(Pu-Pl))
Nst = NsXtmj(K-1) ! index to last stoch. var. before conditioning on X(K)
CmN(K:Nst)=CmN(K:Nst)+X*BIG(K-1,K:Nst) !/SQ0
SQ0 = SQ(K,K)
XMA = MIN((Hup (K)-CmN(K))/SQ0,xCutOff)
XMI = MAX((Hlo (K)-CmN(K))/SQ0,-xCutOff)
-
+
if (C1C2det) then
NstN = NsXtmj(K) ! index to last stoch. var. after conditioning X(K)
CALL C1C2(XMI,XMA,CmN(NstN+1:Nst),
@@ -682,7 +682,7 @@
endif
IF (XMA.LE.XMI) GO TO 260
Pl = FI(XMI)
- Pu = FI(XMA)
+ Pu = FI(XMA)
Y=Y*(Pu-Pl)
enddo ! K loop
XIND = Y
@@ -694,7 +694,7 @@
END FUNCTION MVNFUN
function MVNFUN2(Ndim,W) RESULT (XIND)
- USE FIMOD
+ USE FIMOD
USE C1C2MOD
USE GLOBALDATA, ONLY : Hlo,Hup,xCutOff,Njj,Nj,Ntscis,Ntd,SQ,
& NsXtmj, NsXdj,indXtd,index1,useC1C2,C1C2det,Nt,EPS2
@@ -708,22 +708,22 @@
INTEGER :: Nst,NstN,Nst0,K
!MVNFUN2 Multivariate Normal integrand function
-! where the integrand is transformed from an integral
+! where the integrand is transformed from an integral
! having integration limits Hl0 and Hup to an
! integral having constant integration limits i.e.
-! Hup 1
+! Hup 1
! int f(xt)dxt = int F2(W) dW
!Hlo 0
!
! W - new transformed integration variables, valid range 0..1
! The vector must have the size Nst0
! BIG - conditional sorted covariance matrix (IN)
-! CmN - Local conditional mean
+! CmN - Local conditional mean
! Cm = Conditional mean E(Xt,Xd|Xc)
! Pl1 = FI(XMI) for the first integration variable
! Pu1 = FI(XMA) ------||-------------------------
-
- !print *,'MVNFUN2, ndim', ndim, shape(W)
+
+ !print *,'MVNFUN2, ndim', ndim, shape(W)
Nst0 = NsXtmj(Njj+Ntscis)
if (Njj.GT.0) then
@@ -731,24 +731,24 @@
else
Nst = NsXtmj(Ntscis+1)
endif
-! IF (NDIM.LT.Nst0+Njj) PRINT *, 'MVNFUN2 NDIM,',NDIM
+! IF (NDIM.LT.Nst0+Njj) PRINT *, 'MVNFUN2 NDIM,',NDIM
! initialize conditional mean
CmN(1:Nst)=Cm(1:Nst)
-
+
Pl = Pl1
Pu = Pu1
-
+
Y = Pu-Pl
SQ0 = SQ(1,1)
-
+
do K = 2,Nst0
- X = FIINV(Pl+W(K-1)*(Pu-Pl))
+ X = FIINV(Pl+W(K-1)*(Pu-Pl))
Nst = NsXtmj(K-1) ! index to last stoch. var. before conditioning on X(K)
CmN(K:Nst)=CmN(K:Nst)+X*BIG(K-1,K:Nst) !/SQ0
SQ0 = SQ(K,K)
XMA = MIN((Hup (K)-CmN(K))/SQ0,xCutOff)
XMI = MAX((Hlo (K)-CmN(K))/SQ0,-xCutOff)
-
+
if (C1C2det) then
NstN=NsXtmj(K) ! index to last stoch. var. after conditioning on X(K)
CALL C1C2(XMI,XMA,CmN(NstN+1:Nst),
@@ -760,7 +760,7 @@
endif
IF (XMA.LE.XMI) GO TO 260
Pl = FI(XMI)
- Pu = FI(XMA)
+ Pu = FI(XMA)
Y = Y*(Pu-Pl)
enddo ! K loop
XIND = Y
@@ -778,91 +778,91 @@
INTEGER :: minQNr=1 ! minimum quadrature number
! used in GaussLe1, Gaussle2
INTEGER :: Le2QNr=8 ! quadr. number used in rind2,rindnit
- INTEGER, DIMENSION(sizNint) :: Nint1 ! use quadr. No. Nint1(i) in
+ INTEGER, DIMENSION(sizNint) :: Nint1 ! use quadr. No. Nint1(i) in
! integration of Xd(i)
! # different quadratures stored for :
- !-------------------------------------
- INTEGER,PARAMETER :: NLeW=13 ! Legendre
- INTEGER,PARAMETER :: NHeW=13 ! Hermite
- INTEGER,PARAMETER :: NLaW=13 ! Laguerre
+ !-------------------------------------
+ INTEGER,PARAMETER :: NLeW=13 ! Legendre
+ INTEGER,PARAMETER :: NHeW=13 ! Hermite
+ INTEGER,PARAMETER :: NLaW=13 ! Laguerre
! Quadrature Number stored for :
- !-------------------------------------
- INTEGER, DIMENSION(NLeW) :: LeQNr ! Legendre
- INTEGER, DIMENSION(NHeW) :: HeQNr ! Hermite
- INTEGER, DIMENSION(NLaW) :: LaQNr ! Laguerre
+ !-------------------------------------
+ INTEGER, DIMENSION(NLeW) :: LeQNr ! Legendre
+ INTEGER, DIMENSION(NHeW) :: HeQNr ! Hermite
+ INTEGER, DIMENSION(NLaW) :: LaQNr ! Laguerre
PARAMETER (LeQNr=(/ 2,3,4,5,6,7, 8, 9, 10, 12, 16, 20, 24 /))
PARAMETER (HeQNr=(/ 2,3,4,5,6,7, 8, 9, 10, 12, 16, 20, 24 /))
PARAMETER (LaQNr=(/ 2,3,4,5,6,7, 8, 9, 10, 12, 16, 20, 24 /))
- ! The indices to the weights & nodes stored for:
+ ! The indices to the weights & nodes stored for:
!------------------------------------------------
INTEGER, DIMENSION(NLeW+1) :: LeIND !Legendre
INTEGER, DIMENSION(NHeW+1) :: HeIND !Hermite
INTEGER, DIMENSION(NLaW+1) :: LaIND !Laguerre
-
+
PARAMETER (LeIND=(/0,2,5,9,14,20,27,35,44,54,66,82,102,126/)) !Legendre
PARAMETER (HeIND=(/0,2,5,9,14,20,27,35,44,54,66,82,102,126/)) !Hermite
- PARAMETER (LaIND=(/0,2,5,9,14,20,27,35,44,54,66,82,102,126/)) !Laguerre
+ PARAMETER (LaIND=(/0,2,5,9,14,20,27,35,44,54,66,82,102,126/)) !Laguerre
!------------------------------------------------
- DOUBLE PRECISION, DIMENSION(126) :: LeBP,LeWF,HeBP,HeWF
+ DOUBLE PRECISION, DIMENSION(126) :: LeBP,LeWF,HeBP,HeWF
DOUBLE PRECISION, DIMENSION(126) :: LaBP0,LaWF0,LaBP5,LaWF5
!The Hermite Quadrature integrates an integral of the form
! inf n
! Int (exp(-x^2) F(x)) dx = Sum wf(j)*F( bp(j) )
-! -Inf j=1
+! -Inf j=1
!The Laguerre Quadrature integrates an integral of the form
! inf n
! Int (x^alpha exp(-x) F(x)) dx = Sum wf(j)*F( bp(j) )
-! 0 j=1
+! 0 j=1
! weights stored here are for alpha=0 and alpha=-0.5
! initialize Legendre weights, wf, and nodes, bp
!PARAMETER ( LeWF = (
- DATA ( LeWF(I), I = 1, 78 )
- * / 1.d0, 1.d0, 0.555555555555556d0,
- * 0.888888888888889d0, 0.555555555555556d0,
+ DATA ( LeWF(I), I = 1, 78 )
+ * / 1.d0, 1.d0, 0.555555555555556d0,
+ * 0.888888888888889d0, 0.555555555555556d0,
* 0.347854845137454d0, 0.652145154862546d0,
- * 0.652145154862546d0, 0.347854845137454d0,
- * 0.236926885056189d0, 0.478628670499366d0,
+ * 0.652145154862546d0, 0.347854845137454d0,
+ * 0.236926885056189d0, 0.478628670499366d0,
* 0.568888888888889d0, 0.478628670499366d0,
- * 0.236926885056189d0, 0.171324492379170d0,
+ * 0.236926885056189d0, 0.171324492379170d0,
* 0.360761573048139d0, 0.467913934572691d0,
* 0.467913934572691d0, 0.360761573048139d0,
- * 0.171324492379170d0, 0.129484966168870d0,
+ * 0.171324492379170d0, 0.129484966168870d0,
* 0.279705391489277d0, 0.381830050505119d0,
* 0.417959183673469d0, 0.381830050505119d0,
- * 0.279705391489277d0, 0.129484966168870d0,
- * 0.101228536290376d0, 0.222381034453374d0,
+ * 0.279705391489277d0, 0.129484966168870d0,
+ * 0.101228536290376d0, 0.222381034453374d0,
* 0.313706645877887d0, 0.362683783378362d0,
- * 0.362683783378362d0, 0.313706645877887d0,
+ * 0.362683783378362d0, 0.313706645877887d0,
* 0.222381034453374d0, 0.101228536290376d0,
* 0.081274388361574d0, 0.180648160694857d0,
- * 0.260610696402935d0, 0.312347077040003d0,
+ * 0.260610696402935d0, 0.312347077040003d0,
* 0.330239355001260d0, 0.312347077040003d0,
* 0.260610696402935d0, 0.180648160694857d0,
- * 0.081274388361574d0, 0.066671344308688d0,
+ * 0.081274388361574d0, 0.066671344308688d0,
* 0.149451349150581d0, 0.219086362515982d0,
* 0.269266719309996d0, 0.295524224714753d0,
- * 0.295524224714753d0, 0.269266719309996d0,
+ * 0.295524224714753d0, 0.269266719309996d0,
* 0.219086362515982d0, 0.149451349150581d0,
- * 0.066671344308688d0, 0.047175336386512d0,
- * 0.106939325995318d0, 0.160078328543346d0,
- * 0.203167426723066d0, 0.233492536538355d0,
+ * 0.066671344308688d0, 0.047175336386512d0,
+ * 0.106939325995318d0, 0.160078328543346d0,
+ * 0.203167426723066d0, 0.233492536538355d0,
* 0.249147048513403d0, 0.249147048513403d0,
- * 0.233492536538355d0,
- * 0.203167426723066d0, 0.160078328543346d0,
- * 0.106939325995318d0, 0.047175336386512d0,
+ * 0.233492536538355d0,
+ * 0.203167426723066d0, 0.160078328543346d0,
+ * 0.106939325995318d0, 0.047175336386512d0,
* 0.027152459411754094852d0, 0.062253523938647892863d0,
* 0.095158511682492784810d0, 0.124628971255533872052d0,
* 0.149595988816576732081d0, 0.169156519395002538189d0,
* 0.182603415044923588867d0, 0.189450610455068496285d0,
* 0.189450610455068496285d0, 0.182603415044923588867d0,
* 0.169156519395002538189d0, 0.149595988816576732081d0/
- DATA ( LeWF(I), I = 79, 126 )
+ DATA ( LeWF(I), I = 79, 126 )
* / 0.124628971255533872052d0, 0.095158511682492784810d0,
* 0.062253523938647892863d0, 0.027152459411754094852d0,
* 0.017614007139152118312d0, 0.040601429800386941331d0,
@@ -874,7 +874,7 @@
* 0.142096109318382051329d0, 0.131688638449176626898d0,
* 0.118194531961518417312d0, 0.101930119817240435037d0,
* 0.083276741576704748725d0, 0.062672048334109063570d0,
- * 0.040601429800386941331d0, 0.017614007139152118312d0,
+ * 0.040601429800386941331d0, 0.017614007139152118312d0,
* 0.012341229799987199547d0, 0.028531388628933663181d0,
* 0.044277438817419806169d0, 0.059298584915436780746d0,
* 0.073346481411080305734d0, 0.086190161531953275917d0,
@@ -891,35 +891,35 @@
DATA ( LeBP(I), I=1,77)
* / -0.577350269189626d0,0.577350269189626d0,
* -0.774596669241483d0, 0.d0,
- * 0.774596669241483d0, -0.861136311594053d0,
+ * 0.774596669241483d0, -0.861136311594053d0,
* -0.339981043584856d0, 0.339981043584856d0,
* 0.861136311594053d0, -0.906179845938664d0,
* -0.538469310105683d0, 0.d0,
- * 0.538469310105683d0, 0.906179845938664d0,
+ * 0.538469310105683d0, 0.906179845938664d0,
* -0.932469514203152d0, -0.661209386466265d0,
* -0.238619186083197d0, 0.238619186083197d0,
- * 0.661209386466265d0, 0.932469514203152d0,
+ * 0.661209386466265d0, 0.932469514203152d0,
* -0.949107912342759d0, -0.741531185599394d0,
* -0.405845151377397d0, 0.d0,
- * 0.405845151377397d0, 0.741531185599394d0,
- * 0.949107912342759d0, -0.960289856497536d0,
+ * 0.405845151377397d0, 0.741531185599394d0,
+ * 0.949107912342759d0, -0.960289856497536d0,
* -0.796666477413627d0, -0.525532409916329d0,
- * -0.183434642495650d0, 0.183434642495650d0,
+ * -0.183434642495650d0, 0.183434642495650d0,
* 0.525532409916329d0, 0.796666477413627d0,
* 0.960289856497536d0, -0.968160239507626d0,
* -0.836031107326636d0, -0.613371432700590d0,
* -0.324253423403809d0, 0.d0,
* 0.324253423403809d0, 0.613371432700590d0,
- * 0.836031107326636d0, 0.968160239507626d0,
+ * 0.836031107326636d0, 0.968160239507626d0,
* -0.973906528517172d0, -0.865063366688985d0,
- * -0.679409568299024d0, -0.433395394129247d0,
- * -0.148874338981631d0, 0.148874338981631d0,
+ * -0.679409568299024d0, -0.433395394129247d0,
+ * -0.148874338981631d0, 0.148874338981631d0,
* 0.433395394129247d0, 0.679409568299024d0,
* 0.865063366688985d0, 0.973906528517172d0,
- * -0.981560634246719d0, -0.904117256370475d0,
+ * -0.981560634246719d0, -0.904117256370475d0,
* -0.769902674194305d0, -0.587317954286617d0,
* -0.367831498198180d0, -0.125233408511469d0,
- * 0.125233408511469d0, 0.367831498198180d0,
+ * 0.125233408511469d0, 0.367831498198180d0,
* 0.587317954286617d0, 0.769902674194305d0,
* 0.904117256370475d0, 0.981560634246719d0,
* -0.989400934991649932596d0,
@@ -953,12 +953,12 @@
* 0.545421471388839535658d0, 0.648093651936975569252d0,
* 0.740124191578554364244d0, 0.820001985973902921954d0,
* 0.886415527004401034213d0, 0.938274552002732758524d0,
- * 0.974728555971309498198d0, 0.995187219997021360180d0 /
+ * 0.974728555971309498198d0, 0.995187219997021360180d0 /
- ! initialize Hermite weights in HeWF and
+ ! initialize Hermite weights in HeWF and
! nodes in HeBP
- ! NB! the relative error of these numbers
- ! are less than 10^-15
+ ! NB! the relative error of these numbers
+ ! are less than 10^-15
! PARAMETER
DATA (HeWF(I),I=1,78) / 8.8622692545275816d-1,
* 8.8622692545275816d-1,
@@ -1000,7 +1000,7 @@
* 2.8064745852853318d-1, 5.0792947901661278d-1,
* 5.0792947901661356d-1, 2.8064745852853334d-1,
* 8.3810041398985735d-2, 1.2880311535510015d-2/
- DATA (HeWF(I),I=79,126) /
+ DATA (HeWF(I),I=79,126) /
* 9.3228400862418407d-4, 2.7118600925378956d-5,
* 2.3209808448651966d-7, 2.6548074740111787d-10,
* 2.2293936455342015d-13, 4.3993409922730765d-10,
@@ -1025,7 +1025,7 @@
* 5.6886916364044037d-5, 2.1582457049023460d-6,
* 4.0189711749414963d-8, 3.0462542699876118d-10,
* 6.5846202430782225d-13, 1.6643684964889408d-16 /
-
+
!hermite nodes
! PARAMETER (HeBP = (
DATA (HeBP(I),I=1,79) / -7.07106781186547572d-1,
@@ -1068,10 +1068,10 @@
* -2.7348104613815177d-1, 2.7348104613815244d-1,
* 8.2295144914465579d-1, 1.3802585391988802d0,
* 1.9517879909162534d0, 2.5462021578474801d0/
- DATA (HeBP(I),I=80,126) /
+ DATA (HeBP(I),I=80,126) /
* 3.1769991619799565d0, 3.8694479048601265d0,
- * 4.6887389393058196d0, -5.3874808900112274d0,
- * -4.6036824495507513d0, -3.9447640401156296d0,
+ * 4.6887389393058196d0, -5.3874808900112274d0,
+ * -4.6036824495507513d0, -3.9447640401156296d0,
* -3.3478545673832154d0, -2.7888060584281300d0,
* -2.2549740020892721d0, -1.7385377121165839d0,
* -1.2340762153953209d0, -7.3747372854539361d-1,
@@ -1094,38 +1094,38 @@
* 4.6256627564237816d0, 5.2593829276680353d0,
* 6.0159255614257550d0 /
!initialize Laguerre weights and nodes (basepoints)
- ! for alpha=0
- ! NB! the relative error of these numbers
- ! are less than 10^-15
+ ! for alpha=0
+ ! NB! the relative error of these numbers
+ ! are less than 10^-15
! PARAMETER
DATA (LaWF0(I),I=1,75) / 8.5355339059327351d-1,
- * 1.4644660940672624d-1, 7.1109300992917313d-1,
- * 2.7851773356924092d-1, 1.0389256501586137d-2,
- * 6.0315410434163386d-1,
- * 3.5741869243779956d-1, 3.8887908515005364d-2,
- * 5.3929470556132730d-4, 5.2175561058280850d-1,
- * 3.9866681108317570d-1, 7.5942449681707588d-2,
- * 3.6117586799220489d-3, 2.3369972385776180d-5,
- * 4.5896467394996360d-1, 4.1700083077212080d-1,
- * 1.1337338207404497d-1, 1.0399197453149061d-2,
- * 2.6101720281493249d-4, 8.9854790642961944d-7,
- * 4.0931895170127397d-1, 4.2183127786171964d-1,
- * 1.4712634865750537d-1,
- * 2.0633514468716974d-2, 1.0740101432807480d-3,
- * 1.5865464348564158d-5, 3.1703154789955724d-8,
- * 3.6918858934163773d-1, 4.1878678081434328d-1,
- * 1.7579498663717152d-1, 3.3343492261215649d-2,
- * 2.7945362352256712d-3, 9.0765087733581999d-5,
- * 8.4857467162725493d-7, 1.0480011748715038d-9,
- * 3.3612642179796304d-1, 4.1121398042398466d-1,
- * 1.9928752537088576d0, 4.7460562765651609d-2,
- * 5.5996266107945772d-3, 3.0524976709321133d-4,
- * 6.5921230260753743d-6, 4.1107693303495271d-8,
- * 3.2908740303506941d-11,
- * 3.0844111576502009d-1, 4.0111992915527328d-1,
- * 2.1806828761180935d-1, 6.2087456098677683d-2,
- * 9.5015169751810902d-3, 7.5300838858753855d-4,
- * 2.8259233495995652d-5, 4.2493139849626742d-7,
+ * 1.4644660940672624d-1, 7.1109300992917313d-1,
+ * 2.7851773356924092d-1, 1.0389256501586137d-2,
+ * 6.0315410434163386d-1,
+ * 3.5741869243779956d-1, 3.8887908515005364d-2,
+ * 5.3929470556132730d-4, 5.2175561058280850d-1,
+ * 3.9866681108317570d-1, 7.5942449681707588d-2,
+ * 3.6117586799220489d-3, 2.3369972385776180d-5,
+ * 4.5896467394996360d-1, 4.1700083077212080d-1,
+ * 1.1337338207404497d-1, 1.0399197453149061d-2,
+ * 2.6101720281493249d-4, 8.9854790642961944d-7,
+ * 4.0931895170127397d-1, 4.2183127786171964d-1,
+ * 1.4712634865750537d-1,
+ * 2.0633514468716974d-2, 1.0740101432807480d-3,
+ * 1.5865464348564158d-5, 3.1703154789955724d-8,
+ * 3.6918858934163773d-1, 4.1878678081434328d-1,
+ * 1.7579498663717152d-1, 3.3343492261215649d-2,
+ * 2.7945362352256712d-3, 9.0765087733581999d-5,
+ * 8.4857467162725493d-7, 1.0480011748715038d-9,
+ * 3.3612642179796304d-1, 4.1121398042398466d-1,
+ * 1.9928752537088576d0, 4.7460562765651609d-2,
+ * 5.5996266107945772d-3, 3.0524976709321133d-4,
+ * 6.5921230260753743d-6, 4.1107693303495271d-8,
+ * 3.2908740303506941d-11,
+ * 3.0844111576502009d-1, 4.0111992915527328d-1,
+ * 2.1806828761180935d-1, 6.2087456098677683d-2,
+ * 9.5015169751810902d-3, 7.5300838858753855d-4,
+ * 2.8259233495995652d-5, 4.2493139849626742d-7,
* 1.8395648239796174d-9, 9.9118272196090085d-13,
& 2.6473137105544342d-01,
& 3.7775927587313773d-01, 2.4408201131987739d-01,
@@ -1166,33 +1166,33 @@
& 2.4518188458785009d-26, 4.0883015936805334d-30,
& 5.5753457883284229d-35 /
! PARAMETER (LaBP0=(/
- DATA (LaBP0(I),I=1,78) /5.8578643762690485d-1,
- * 3.4142135623730949d+00, 4.1577455678347897d-1,
- * 2.2942803602790409d0, 6.2899450829374803d0,
- * 3.2254768961939217d-1, 1.7457611011583465d0,
- * 4.5366202969211287d0, 9.3950709123011364d0,
- * 2.6356031971814076d-1, 1.4134030591065161d0,
- * 3.5964257710407206d0, 7.0858100058588356d0,
- * 1.2640800844275784d+01, 2.2284660417926061d-1,
- * 1.1889321016726229d0, 2.9927363260593141d+00,
- * 5.7751435691045128d0, 9.8374674183825839d0,
- * 1.5982873980601699d+01, 1.9304367656036231d-1,
- * 1.0266648953391919d0, 2.5678767449507460d0,
- * 4.9003530845264844d0, 8.1821534445628572d0,
- * 1.2734180291797809d+01, 1.9395727862262543d+01,
- * 1.7027963230510107d-1, 9.0370177679938035d-1,
- * 2.2510866298661316d0, 4.2667001702876597d0,
- * 7.0459054023934673d0, 1.0758516010180994d+01,
- * 1.5740678641278004d+01, 2.2863131736889272d+01,
- * 1.5232222773180798d-1, 8.0722002274225590d-1,
- * 2.0051351556193473d0, 3.7834739733312328d0,
- * 6.2049567778766175d0, 9.3729852516875773d0,
- * 1.3466236911092089d+01, 1.8833597788991703d+01,
- * 2.6374071890927389d+01, 1.3779347054049221d-1,
- * 7.2945454950317090d-1, 1.8083429017403163d0,
- * 3.4014336978548996d0,
- * 5.5524961400638029d0, 8.3301527467644991d0,
- * 1.1843785837900066d+01, 1.6279257831378107d+01,
+ DATA (LaBP0(I),I=1,78) /5.8578643762690485d-1,
+ * 3.4142135623730949d+00, 4.1577455678347897d-1,
+ * 2.2942803602790409d0, 6.2899450829374803d0,
+ * 3.2254768961939217d-1, 1.7457611011583465d0,
+ * 4.5366202969211287d0, 9.3950709123011364d0,
+ * 2.6356031971814076d-1, 1.4134030591065161d0,
+ * 3.5964257710407206d0, 7.0858100058588356d0,
+ * 1.2640800844275784d+01, 2.2284660417926061d-1,
+ * 1.1889321016726229d0, 2.9927363260593141d+00,
+ * 5.7751435691045128d0, 9.8374674183825839d0,
+ * 1.5982873980601699d+01, 1.9304367656036231d-1,
+ * 1.0266648953391919d0, 2.5678767449507460d0,
+ * 4.9003530845264844d0, 8.1821534445628572d0,
+ * 1.2734180291797809d+01, 1.9395727862262543d+01,
+ * 1.7027963230510107d-1, 9.0370177679938035d-1,
+ * 2.2510866298661316d0, 4.2667001702876597d0,
+ * 7.0459054023934673d0, 1.0758516010180994d+01,
+ * 1.5740678641278004d+01, 2.2863131736889272d+01,
+ * 1.5232222773180798d-1, 8.0722002274225590d-1,
+ * 2.0051351556193473d0, 3.7834739733312328d0,
+ * 6.2049567778766175d0, 9.3729852516875773d0,
+ * 1.3466236911092089d+01, 1.8833597788991703d+01,
+ * 2.6374071890927389d+01, 1.3779347054049221d-1,
+ * 7.2945454950317090d-1, 1.8083429017403163d0,
+ * 3.4014336978548996d0,
+ * 5.5524961400638029d0, 8.3301527467644991d0,
+ * 1.1843785837900066d+01, 1.6279257831378107d+01,
* 2.1996585811980765d+01, 2.9920697012273894d+01 ,
& 1.1572211735802050d-01, 6.1175748451513112d-01,
& 1.5126102697764183d+00, 2.8337513377435077d+00,
@@ -1275,7 +1275,7 @@
& 8.9550013377233881e+00, 1.1677033673975952e+01,
& 1.4851431341801243e+01, 1.8537743178606682e+01,
& 2.2821300693525199e+01, 2.7831438211328681e+01/
- DATA (LaBP5(I),I=80,126) /
+ DATA (LaBP5(I),I=80,126) /
& 3.3781970488226136e+01, 4.1081666525491165e+01,
& 5.0777223877537075e+01, 3.0463239279482423e-02,
& 2.7444471579285024e-01, 7.6388755844391365e-01,
@@ -1300,7 +1300,7 @@
& 4.6376979557540103e+01, 5.2795432527283602e+01,
& 6.0206666963057259e+01, 6.9068601975304347e+01,
& 8.0556280819950416e+01/
-
+
! PARAMETER (LaWF5 = (/
DATA (LaWF5(I),I=1,79) / 1.6098281800110255e+00,
& 1.6262567089449037e-01, 1.4492591904487846e+00,
@@ -1379,18 +1379,18 @@
INTERFACE GAUSSHE0
MODULE PROCEDURE GAUSSHE0
END INTERFACE
-
+
INTERFACE GAUSSLE1
- MODULE PROCEDURE GAUSSLE1
+ MODULE PROCEDURE GAUSSLE1
END INTERFACE
INTERFACE GAUSSLE2
- MODULE PROCEDURE GAUSSLE2
+ MODULE PROCEDURE GAUSSLE2
END INTERFACE
INTERFACE GAUSSQ
- MODULE PROCEDURE GAUSSQ
+ MODULE PROCEDURE GAUSSQ
END INTERFACE
CONTAINS
@@ -1409,38 +1409,38 @@
! The subroutine picks the lowest Gauss-Legendre
! quadrature needed to integrate the test function
- ! gaussint to the specified accuracy, EPS0.
+ ! gaussint to the specified accuracy, EPS0.
! The nodes and weights between the integration
- ! limits XMI and XMA (all normalized) are returned.
+ ! limits XMI and XMA (all normalized) are returned.
! Note that the weights are multiplied with
- ! 1/sqrt(2*pi)*exp(.5*bpout^2)
+ ! 1/sqrt(2*pi)*exp(.5*bpout^2)
IF (XMA.LE.XMI) THEN
! PRINT * , 'Warning XMIN>=XMAX in GAUSSLE1 !',XMI,XMA
RETURN
ENDIF
-
- DO I = minQnr, NLeW
+
+ DO I = minQnr, NLeW
NN = N !initialize
DO J = LeIND(I)+1, LeIND(I+1)
BPOUT (NN+1) = 0.5d0*(LeBP(J)*(XMA-XMI)+XMA+XMI)
Z1 = BPOUT (NN+1) * BPOUT (NN+1)
!IF (Z1.LE.xCutOff2) THEN
NN=NN+1
- WFout (NN) = 0.5d0 * SQTWOPI1 * (XMA - XMI) *
- & LeWF(J) *EXP ( - 0.5d0* Z1 )
+ WFout (NN) = 0.5d0 * SQTWOPI1 * (XMA - XMI) *
+ & LeWF(J) *EXP ( - 0.5d0* Z1 )
!ENDIF
ENDDO
-
+
SDOT = GAUSINT (XMI, XMA, - 2.5d0, 2.d0, 2.5d0, 2.d0)
SDOT1 = 0.d0
-
+
DO k = N+1, NN
- SDOT1 = SDOT1+WFout(k)*(-2.5d0+2.d0*BPOUT(k) )*
- & (2.5d0 + 2.d0 * BPOUT (k) )
+ SDOT1 = SDOT1+WFout(k)*(-2.5d0+2.d0*BPOUT(k) )*
+ & (2.5d0 + 2.d0 * BPOUT (k) )
ENDDO
DIFF1 = ABS (SDOT - SDOT1)
-
+
IF (EPS0.GT.DIFF1) THEN
N=NN
! PRINT * ,'gaussle1, XMI,XMA,NN',XMI,XMA,NN
@@ -1450,76 +1450,76 @@
RETURN
END SUBROUTINE GAUSSLE1
- SUBROUTINE GAUSSLE0 (N, wfout, bpout, XMI, XMA, N0)
+ SUBROUTINE GAUSSLE0 (N, wfout, bpout, XMI, XMA, N0)
USE GLOBALDATA, ONLY : EPSS
! USE QUAD, ONLY : LeBP,LeWF,NLeW,LeIND
IMPLICIT NONE
- INTEGER, INTENT(in) :: N0
+ INTEGER, INTENT(in) :: N0
INTEGER, INTENT(inout) :: N
- DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
- DOUBLE PRECISION, INTENT(in) :: XMI,XMA
+ DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
+ DOUBLE PRECISION, INTENT(in) :: XMI,XMA
! Local variables
DOUBLE PRECISION,PARAMETER :: SQTWOPI1 = 0.39894228040143D0 !=1/sqrt(2*pi)
- DOUBLE PRECISION :: Z1
+ DOUBLE PRECISION :: Z1
INTEGER :: J
! The subroutine computes Gauss-Legendre
! nodes and weights between
- ! the (normalized) integration limits XMI and XMA
+ ! the (normalized) integration limits XMI and XMA
! Note that the weights are multiplied with
! 1/sqrt(2*pi)*exp(.5*bpout^2) so that
! b
! int f(x)*exp(-x^2/2)/sqrt(2*pi)dx=sum f(bp(j))*wf(j)
! a j
- IF (XMA.LE.XMI) THEN
+ IF (XMA.LE.XMI) THEN
!PRINT * , 'Warning XMIN>=XMAX in GAUSSLE0 !',XMI,XMA
RETURN ! no more nodes added
ENDIF
IF ((XMA-XMI).LT.EPSS) THEN
N=N+1
BPout (N) = 0.5d0 * (XMA + XMI)
- Z1 = BPOUT (N) * BPOUT (N)
- WFout (N) = SQTWOPI1 * (XMA - XMI) *EXP ( - 0.5d0* Z1 )
+ Z1 = BPOUT (N) * BPOUT (N)
+ WFout (N) = SQTWOPI1 * (XMA - XMI) *EXP ( - 0.5d0* Z1 )
RETURN
ENDIF
- IF (N0.GT.NLeW) THEN
- !PRINT * , 'error in GAUSSLE0, quadrature not available'
- STOP
- ENDIF
- !print *, 'GAUSSLE0',N0
-
- !print *, N
- DO J = LeIND(N0)+1, LeIND(N0+1)
-
+ IF (N0.GT.NLeW) THEN
+ !PRINT * , 'error in GAUSSLE0, quadrature not available'
+ STOP
+ ENDIF
+ !print *, 'GAUSSLE0',N0
+
+ !print *, N
+ DO J = LeIND(N0)+1, LeIND(N0+1)
+
BPout (N+1) = 0.5d0 * (LeBP(J) * (XMA - XMI) + XMA + XMI)
Z1 = BPOUT (N+1) * BPOUT (N+1)
! IF (Z1.LE.xCutOff2) THEN
N=N+1 ! add a new node and weight
- WFout (N) = 0.5d0 * SQTWOPI1 * (XMA - XMI) *
- & LeWF(J) *EXP ( - 0.5d0* Z1 )
- ! ENDIF
+ WFout (N) = 0.5d0 * SQTWOPI1 * (XMA - XMI) *
+ & LeWF(J) *EXP ( - 0.5d0* Z1 )
+ ! ENDIF
ENDDO
!print *,BPout
- RETURN
+ RETURN
END SUBROUTINE GAUSSLE0
- SUBROUTINE GAUSSLE2 (N, wfout, bpout, XMI, XMA, N0)
+ SUBROUTINE GAUSSLE2 (N, wfout, bpout, XMI, XMA, N0)
USE GLOBALDATA, ONLY : xCutOff,EPSS
! USE QUAD, ONLY : LeBP,LeWF,NLeW,LeIND,minQNr
IMPLICIT NONE
- INTEGER, INTENT(in) :: N0
+ INTEGER, INTENT(in) :: N0
INTEGER, INTENT(inout) :: N
- DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
- DOUBLE PRECISION, INTENT(in) :: XMI,XMA
+ DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
+ DOUBLE PRECISION, INTENT(in) :: XMI,XMA
! Local variables
- DOUBLE PRECISION :: Z1
+ DOUBLE PRECISION :: Z1
INTEGER :: J,N1
DOUBLE PRECISION,PARAMETER :: SQTWOPI1 = 0.39894228040143D0 !=1/sqrt(2*pi)
! The subroutine computes Gauss-Legendre
! nodes and weights between
! the (normalized) integration limits XMI and XMA
! This procedure select number of nodes
- ! depending on the length of the integration interval.
+ ! depending on the length of the integration interval.
! Note that the weights are multiplied with
! 1/sqrt(2*pi)*exp(.5*bpout^2) so that
! b
@@ -1533,28 +1533,28 @@
! IF (XMA.LT.XMI+EPSS) THEN
! N=N+1
! BPout (N) = 0.65d0 * (XMA + XMI)
-! Z1 = BPOUT (N) * BPOUT (N)
-! WFout (N) = SQTWOPI1 * (XMA - XMI) *EXP ( - 0.5d0* Z1 )
+! Z1 = BPOUT (N) * BPOUT (N)
+! WFout (N) = SQTWOPI1 * (XMA - XMI) *EXP ( - 0.5d0* Z1 )
! RETURN
! ENDIF
IF (N0.GT.NLeW) THEN
- !PRINT * , 'Warning in GAUSSLE2, quadrature not available'
- ENDIF
- !print *, 'GAUSSLE2',N0
-
- !print *, N
+ !PRINT * , 'Warning in GAUSSLE2, quadrature not available'
+ ENDIF
+ !print *, 'GAUSSLE2',N0
+
+ !print *, N
N1=CEILING(0.5d0*(XMA-XMI)*DBLE(N0)/xCutOff) !0.65d0
N1=MAX(MIN(N1,NLew),minQNr)
-
- DO J = LeIND(N1)+1, LeIND(N1+1)
-
+
+ DO J = LeIND(N1)+1, LeIND(N1+1)
+
BPout (N+1) = 0.5d0 * (LeBP(J) * (XMA - XMI) + XMA + XMI)
Z1 = BPOUT (N+1) * BPOUT (N+1)
! IF (Z1.LE.xCutOff2) THEN
N=N+1 ! add a new node and weight
- WFout (N) = 0.5d0 * SQTWOPI1 * (XMA - XMI) *
- & LeWF(J) *EXP ( - 0.5d0* Z1 )
- ! ENDIF
+ WFout (N) = 0.5d0 * SQTWOPI1 * (XMA - XMI) *
+ & LeWF(J) *EXP ( - 0.5d0* Z1 )
+ ! ENDIF
ENDDO
!PRINT * ,'gaussle2, XMI,XMA,N',XMI,XMA,N
!print *,BPout
@@ -1564,17 +1564,17 @@
SUBROUTINE GAUSSHE0 (N, WFout, BPout, XMI, XMA, N0)
! USE QUAD, ONLY : HeBP,HeWF,HeIND,NHeW
IMPLICIT NONE
- INTEGER, INTENT(in) :: N0
+ INTEGER, INTENT(in) :: N0
INTEGER, INTENT(inout) :: N
- DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
- DOUBLE PRECISION, INTENT(in) :: XMI,XMA
+ DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
+ DOUBLE PRECISION, INTENT(in) :: XMI,XMA
! Local variables
DOUBLE PRECISION, PARAMETER :: SQPI1= 5.6418958354776D-1 !=1/sqrt(pi)
DOUBLE PRECISION, PARAMETER :: SQTWO= 1.41421356237310D0 !=sqrt(2)
INTEGER :: J
! The subroutine returns modified Gauss-Hermite
! nodes and weights between
- ! the integration limits XMI and XMA
+ ! the integration limits XMI and XMA
! for the chosen number of nodes
! implicitly assuming that the integrand
! goes smoothly towards zero as its approach XMI or XMA
@@ -1583,41 +1583,41 @@
! Inf
! int f(x)*exp(-x^2/2)/sqrt(2*pi)dx=sum f(bp(j))*wf(j)
! -Inf j
-
- IF (XMA.LE.XMI) THEN
- !PRINT * , 'Warning XMIN>=XMAX in GAUSSHE0 !',XMI,XMA
+
+ IF (XMA.LE.XMI) THEN
+ !PRINT * , 'Warning XMIN>=XMAX in GAUSSHE0 !',XMI,XMA
RETURN ! no more nodes added
ENDIF
- IF (N0.GT.NHeW) THEN
+ IF (N0.GT.NHeW) THEN
!PRINT * , 'error in GAUSSHE0, quadrature not available'
- STOP
- ENDIF
-
+ STOP
+ ENDIF
+
DO J = HeIND(N0)+1, HeIND(N0+1)
- BPout (N+1) = HeBP (J) * SQTWO
+ BPout (N+1) = HeBP (J) * SQTWO
IF (BPout (N+1).GT.XMA) THEN
RETURN
- END IF
+ END IF
IF (BPout (N+1).GE.XMI) THEN
N=N+1 ! add the node
- WFout (N) = HeWF (J) * SQPI1
+ WFout (N) = HeWF (J) * SQPI1
END IF
ENDDO
- RETURN
- END SUBROUTINE GAUSSHE0
+ RETURN
+ END SUBROUTINE GAUSSHE0
SUBROUTINE GAUSSLA0 (N, WFout, BPout, XMI, XMA, N0)
USE GLOBALDATA, ONLY : SQPI1
! USE QUAD, ONLY : LaBP5,LaWF5,LaIND,NLaW
IMPLICIT NONE
- INTEGER, INTENT(in) :: N0
+ INTEGER, INTENT(in) :: N0
INTEGER, INTENT(inout) :: N
- DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
+ DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wfout,bpout
DOUBLE PRECISION, INTENT(in) :: XMI, XMA
INTEGER :: J
! The subroutine returns modified Gauss-Laguerre
! nodes and weights for alpha=-0.5 between
- ! the integration limits XMI and XMA
+ ! the integration limits XMI and XMA
! for the chosen number of nodes
! implicitly assuming the integrand
! goes smoothly towards zero as its approach XMI or XMA
@@ -1626,69 +1626,69 @@
! Inf
! int f(x)*exp(-x^2/2)/sqrt(2*pi)dx=sum f(bp(j))*wf(j)
! 0 j
-
- IF (XMA.LE.XMI) THEN
- !PRINT * , 'Warning XMIN>=XMAX in GAUSSLA0 !',XMI,XMA
+
+ IF (XMA.LE.XMI) THEN
+ !PRINT * , 'Warning XMIN>=XMAX in GAUSSLA0 !',XMI,XMA
RETURN !no more nodes added
ENDIF
- IF (N0.GT.NLaW) THEN
+ IF (N0.GT.NLaW) THEN
!PRINT * , 'error in GAUSSLA0, quadrature not available'
- STOP
- ENDIF
-
+ STOP
+ ENDIF
+
DO J = LaIND(N0)+1, LaIND(N0+1)
IF (XMA.LE.0.d0) THEN
BPout (N+1) = -SQRT(2.d0*LaBP5(J))
ELSE
- BPout (N+1) = SQRT(2.d0*LaBP5(J))
+ BPout (N+1) = SQRT(2.d0*LaBP5(J))
END IF
IF (BPout (N+1).GT.XMA) THEN
RETURN
- END IF
+ END IF
IF (BPout (N+1).GE.XMI) THEN
- N=N+1 ! add the node
+ N=N+1 ! add the node
WFout (N) = LaWF5 (J)*0.5d0*SQPI1
END IF
ENDDO
!PRINT *,'gaussla0, bp',LaBP5(LaIND(N0)+1:LaIND(N0+1))
!PRINT *,'gaussla0, wf',LaWF5(LaIND(N0)+1:LaIND(N0+1))
- RETURN
- END SUBROUTINE GAUSSLA0
+ RETURN
+ END SUBROUTINE GAUSSLA0
- SUBROUTINE GAUSSQ(N, WF, BP, XMI, XMA, N0)
+ SUBROUTINE GAUSSQ(N, WF, BP, XMI, XMA, N0)
USE GLOBALDATA, ONLY : xCutOff
! USE QUAD , ONLY : minQNr
IMPLICIT NONE
- INTEGER, INTENT(in) :: N0
+ INTEGER, INTENT(in) :: N0
INTEGER, INTENT(inout) :: N
- DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wf,bp
+ DOUBLE PRECISION, DIMENSION(:), INTENT(out) :: wf,bp
DOUBLE PRECISION, INTENT(in) :: XMI,XMA
INTEGER :: N1
- ! The subroutine returns
+ ! The subroutine returns
! nodes and weights between
- ! the integration limits XMI and XMA
+ ! the integration limits XMI and XMA
! for the chosen number of nodes
! Note that the nodes and weights are modified
! according to
! Inf
! int f(x)*exp(-x^2/2)/sqrt(2*pi)dx=sum f(bp(j))*wf(j)
! 0 j
-
- !IF (XMA.LE.XMI) THEN
- ! PRINT * , 'Warning XMIN>=XMAX in GAUSSQ !',XMI,XMA
+
+ !IF (XMA.LE.XMI) THEN
+ ! PRINT * , 'Warning XMIN>=XMAX in GAUSSQ !',XMI,XMA
! RETURN !no more nodes added
- !ENDIF
- CALL GAUSSLE0(N,WF,BP,XMI,XMA,N0)
- RETURN
+ !ENDIF
+ CALL GAUSSLE0(N,WF,BP,XMI,XMA,N0)
+ RETURN
IF ((XMA.GE.xCutOff).AND.(XMI.LE.-xCutOff)) THEN
- CALL GAUSSHE0(N,WF,BP,XMI,XMA,N0)
+ CALL GAUSSHE0(N,WF,BP,XMI,XMA,N0)
ELSE
- CALL GAUSSLE2(N,WF,BP,XMI,XMA,N0)
+ CALL GAUSSLE2(N,WF,BP,XMI,XMA,N0)
RETURN
IF (((XMA.LT.xCutOff).AND.(XMI.GT.-xCutOff)).OR.(.TRUE.)
- & .OR.(XMI.GT.0.d0).OR.(XMA.LT.0.d0)) THEN
+ & .OR.(XMI.GT.0.d0).OR.(XMA.LT.0.d0)) THEN
! Grid by Gauss-LegENDre quadrature
- CALL GAUSSLE2(N,WF,BP,XMI,XMA,N0)
+ CALL GAUSSLE2(N,WF,BP,XMI,XMA,N0)
ELSE
! this does not work well
!PRINT *,'N0',N0,N
@@ -1702,7 +1702,7 @@
IF (XMA.GT.0.d0) THEN
CALL GAUSSLE2 (N, WF,BP,0.d0,XMA,N0)
ENDIF
- CALL GAUSSLA0 (N, WF,BP,XMI,0.d0, N1)
+ CALL GAUSSLA0 (N, WF,BP,XMI,0.d0, N1)
END IF
END IF
ENDIF
@@ -1711,12 +1711,12 @@
RETURN
END SUBROUTINE GAUSSQ
END MODULE QUAD
-
+
MODULE RIND71MOD
IMPLICIT NONE
PRIVATE
PUBLIC :: RIND71, INITDATA, SETDATA,ECHO
-
+
INTERFACE
FUNCTION MVNFUN(N,Z) result (VAL)
DOUBLE PRECISION,DIMENSION(:), INTENT(IN) :: Z
@@ -1731,7 +1731,7 @@
INTEGER, INTENT(IN) :: N
DOUBLE PRECISION :: VAL
END FUNCTION MVNFUN2
- END INTERFACE
+ END INTERFACE
INTERFACE
FUNCTION FI( Z ) RESULT (VALUE)
@@ -1746,7 +1746,7 @@
DOUBLE PRECISION :: VALUE
END FUNCTION FIINV
END INTERFACE
-
+
INTERFACE
FUNCTION JACOB(XD,XC) RESULT (VALUE)
DOUBLE PRECISION, DIMENSION(:), INTENT(in) :: XD,XC
@@ -1769,7 +1769,7 @@
INTERFACE ARGP0
MODULE PROCEDURE ARGP0
END INTERFACE
-
+
INTERFACE RINDDND
MODULE PROCEDURE RINDDND
END INTERFACE
@@ -1781,12 +1781,12 @@
INTERFACE RINDNIT
MODULE PROCEDURE RINDNIT
END INTERFACE
-
- INTERFACE BARRIER
+
+ INTERFACE BARRIER
MODULE PROCEDURE BARRIER
END INTERFACE
- INTERFACE echo
+ INTERFACE echo
MODULE PROCEDURE echo
END INTERFACE
@@ -1805,12 +1805,12 @@
INTERFACE CONDSORT0
MODULE PROCEDURE CONDSORT0
END INTERFACE
-
+
INTERFACE CONDSORT
MODULE PROCEDURE CONDSORT
END INTERFACE
-
+
INTERFACE CONDSORT2
MODULE PROCEDURE CONDSORT2
END INTERFACE
@@ -1824,18 +1824,18 @@
END INTERFACE
CONTAINS
- SUBROUTINE SETDATA(method,scale, dEPSS,dREPS,dEPS2,
- & dNIT,dXc, dNINT,dXSPLT)
+ SUBROUTINE SETDATA(method,scale, dEPSS,dREPS,dEPS2,
+ & dNIT,dXc, dNINT,dXSPLT)
USE GLOBALDATA
USE FIMOD
USE QUAD, ONLY: sizNint,Nint1,minQnr,Le2Qnr
IMPLICIT NONE
- DOUBLE PRECISION , INTENT(in) :: scale, dEPSS,dREPS
+ DOUBLE PRECISION , INTENT(in) :: scale, dEPSS,dREPS
DOUBLE PRECISION , INTENT(in) :: dEPS2,dXc, dXSPLT
!INTEGER, DIMENSION(:), INTENT(in) :: dNINT
INTEGER, INTENT(in) :: method,dNINT,dNIT
INTEGER :: N=1
-
+
!N=SIZE(dNINT)
IF (sizNint.LT.N) THEN
!PRINT *,'Error in setdata, Nint too large'
@@ -1843,24 +1843,24 @@
ENDIF
NINT1(1:N)=dNINT !(1:N) ! quadrature formulae for the Xd variables
IF (N.LT.sizNint) THEN
- NINT1(N:sizNint)=NINT1(N)
- END IF
+ NINT1(N:sizNint)=NINT1(N)
+ END IF
minQnr = 1
Le2Qnr = NINT1(1)
-
- SCIS = method
+
+ SCIS = method
XcScale = scale
RelEps = dREPS
- EPSS = dEPSS ! accuracy of integration
- CEPSS = 1.d0 - EPSS
- EPS2 = dEPS2 ! Constants controlling
+ EPSS = dEPSS ! accuracy of integration
+ CEPSS = 1.d0 - EPSS
+ EPS2 = dEPS2 ! Constants controlling
EPS = SQRT(EPS2)
- xCutOff = dXc
- XSPLT = dXSPLT
+ xCutOff = dXc
+ XSPLT = dXSPLT
NIT = dNIT
-
+
IF (Nc.LT.1) NUGGET=0.d0 ! Nugget is not needed when Nc=0
-
+
IF (EPSS.LE.1e-4) NsimMax=2000
IF (EPSS.LE.1e-5) NsimMax=4000
IF (EPSS.LE.1e-6) NsimMax=8000
@@ -1874,30 +1874,30 @@
PRINT *,'SCIS = 1 SADAPT if NDIM<9 otherwise by KRBVRC'
CASE (2)
PRINT *,'SCIS = 2 SADAPT if NDIM<20 otherwise by KRBVRC'
- CASE (3)
+ CASE (3)
PRINT *,'SCIS = 3 KRBVRC (Ndim<101)'
CASE (4)
PRINT *,'SCIS = 4 KROBOV (Ndim<101)'
CASE (5)
PRINT *,'SCIS = 5 RCRUDE (Ndim<1001)'
- CASE (6)
- PRINT *,'SCIS = 6 SOBNIED (Ndim<1041)'
- CASE (7:)
- PRINT *,'SCIS = 7 DKBVRC (Ndim<1001)'
+ CASE (6)
+ PRINT *,'SCIS = 6 SOBNIED (Ndim<1041)'
+ CASE (7:)
+ PRINT *,'SCIS = 7 DKBVRC (Ndim<1001)'
END SELECT
PRINT *,'EPSS = ', EPSS, ' RELEPS = ' ,RELEPS
PRINT *,'EPS2 = ',EPS2, ' xCutOff = ',xCutOff
PRINT *,'NsimMax = ',NsimMax !,FIINV(EPSS)
ENDIF
- RETURN
+ RETURN
END SUBROUTINE SETDATA
-
- SUBROUTINE INITDATA (speed)
+
+ SUBROUTINE INITDATA (speed)
USE GLOBALDATA
USE FIMOD
USE QUAD, ONLY: sizNint,Nint1,minQnr,Le2Qnr
IMPLICIT NONE
- INTEGER , INTENT(in) :: speed
+ INTEGER , INTENT(in) :: speed
SELECT CASE (speed)
CASE (9:)
NINT1 (1) = 2
@@ -1906,7 +1906,7 @@
CASE (8)
NINT1 (1) = 3
NINT1 (2) = 4
- NINT1 (3) = 5
+ NINT1 (3) = 5
CASE (7)
NINT1 (1) = 4
NINT1 (2) = 5
@@ -1924,11 +1924,11 @@
NINT1 (2) = 8 ! use quadr. form. No. 7 in integration of Xd(2)
NINT1 (3) = 9 ! use quadr. form. No. 8 in integration of Xd(3)
CASE (3)
- NINT1 (1) = 8
- NINT1 (2) = 9
+ NINT1 (1) = 8
+ NINT1 (2) = 9
NINT1 (3) = 10
CASE (2)
- NINT1 (1) = 9
+ NINT1 (1) = 9
NINT1 (2) = 10
NINT1 (3) = 11
CASE (:1)
@@ -1936,75 +1936,75 @@
NINT1 (2) = 12
NINT1 (3) = 13
END SELECT
- NsimMax=1000*abs(10-min(speed,9))
+ NsimMax=1000*abs(10-min(speed,9))
NsimMin=0
SELECT case (speed)
CASE (11:)
- EPSS = 1d-1
+ EPSS = 1d-1
CASE (10)
- EPSS = 1d-2
- CASE (7:9)
- EPSS = 1d-3
+ EPSS = 1d-2
+ CASE (7:9)
+ EPSS = 1d-3
CASE (4:6)
EPSS = 1d-4
CASE (:3)
- EPSS = 1d-5
- END SELECT
-
-
- EPSS=EPSS*1d-1
- RELEPS = MIN(EPSS ,1.d-2)
+ EPSS = 1d-5
+ END SELECT
+
+
+ EPSS=EPSS*1d-1
+ RELEPS = MIN(EPSS ,1.d-2)
EPS2=EPSS*1.d1
!EPS2*1.d+1
!EPS2=1.d-10
!xCutOff=MIN(MAX(ABS(FIINV(EPSS)),3.5d0),5.d0)
!xCutOff=ABS(FIINV(EPSS*1.d-1)) ! this is good
xCutOff=ABS(FIINV(EPSS))
- !xCutOff=ABS(FIINV(EPSS*5.d-1))
- if (SCIS.gt.0) then
- xCutOff= MIN(MAX(xCutOff+0.5d0,4.d0),5.d0)
+ !xCutOff=ABS(FIINV(EPSS*5.d-1))
+ if (SCIS.gt.0) then
+ xCutOff= MIN(MAX(xCutOff+0.5d0,4.d0),5.d0)
! This gives approximately the same accuracy as when using RINDDND and RINDNIT
- EPSS=EPSS*1.d+2
+ EPSS=EPSS*1.d+2
!EPS2=1.d-10
endif
NINT1(1:sizNint)=NINT1(3)
- Le2Qnr=NINT1(1)
+ Le2Qnr=NINT1(1)
minQnr=1 ! minimum quadrature No. used in GaussLe1,Gaussle2
NUGGET = EPS2*1.d-1
IF (Nc.LT.1) NUGGET=0.d0 ! Nugget is not needed when Nc=0
EPS = SQRT(EPS2)
- CEPSS = 1.d0 - EPSS
-
+ CEPSS = 1.d0 - EPSS
+
! If SCIS=0 then the absolute error is usually less than EPSS*100
! otherwise absolute error is less than EPSS
return
IF (.FALSE.) THEN
- print *,'Requested parameters :'
- SELECT CASE (SCIS)
- CASE (:0)
- PRINT *,'NIT = ',NIT,' integration by quadrature'
- CASE (1)
- PRINT *,'SCIS = 1 SADAPT if NDIM<9 otherwise by KRBVRC'
- CASE (2)
- PRINT *,'SCIS = 2 SADAPT if NDIM<19 otherwise by KRBVRC'
- CASE (3)
- PRINT *,'SCIS = 3 KRBVRC (Ndim<101)'
- CASE (4)
- PRINT *,'SCIS = 4 KROBOV (Ndim<101)'
- CASE (5)
- PRINT *,'SCIS = 5 RCRUDE (Ndim<1001)'
- CASE (6)
- PRINT *,'SCIS = 6 SOBNIED (Ndim<1041)'
- CASE (7:)
- PRINT *,'SCIS = 7 DKBVRC (Ndim<1001)'
+ print *,'Requested parameters :'
+ SELECT CASE (SCIS)
+ CASE (:0)
+ PRINT *,'NIT = ',NIT,' integration by quadrature'
+ CASE (1)
+ PRINT *,'SCIS = 1 SADAPT if NDIM<9 otherwise by KRBVRC'
+ CASE (2)
+ PRINT *,'SCIS = 2 SADAPT if NDIM<19 otherwise by KRBVRC'
+ CASE (3)
+ PRINT *,'SCIS = 3 KRBVRC (Ndim<101)'
+ CASE (4)
+ PRINT *,'SCIS = 4 KROBOV (Ndim<101)'
+ CASE (5)
+ PRINT *,'SCIS = 5 RCRUDE (Ndim<1001)'
+ CASE (6)
+ PRINT *,'SCIS = 6 SOBNIED (Ndim<1041)'
+ CASE (7:)
+ PRINT *,'SCIS = 7 DKBVRC (Ndim<1001)'
END SELECT
PRINT *,'EPSS = ', EPSS, ' RELEPS = ' ,RELEPS
PRINT *,'EPS2 = ',EPS2, ' xCutOff = ',xCutOff
PRINT *,'NsimMax = ',NsimMax !,FIINV(EPSS)
ENDIF
- RETURN
+ RETURN
END SUBROUTINE INITDATA
SUBROUTINE ECHO(array)
@@ -2025,20 +2025,20 @@
USE GLOBALDATA, ONLY :Nt,Nj,Njj,Nd,Nc,Nx,Ntd,Ntdc,NsXtmj,NsXdj,
& indXtd,index1,xedni,SQ,Hlo,Hup,fxcepss,EPS2,XCEPS2,NIT,
& SQTWOPI1,xCutOff,SCIS,Ntscis,COVix,EPS, xcScale
- IMPLICIT NONE
+ IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: BIG1
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: xc1
- DOUBLE PRECISION, DIMENSION(:), INTENT(in) :: Ex
- DOUBLE PRECISION, DIMENSION(:), INTENT(out):: fxind
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo, Bup
- INTEGER, DIMENSION(:), INTENT(in) :: indI
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: xc1
+ DOUBLE PRECISION, DIMENSION(:), INTENT(in) :: Ex
+ DOUBLE PRECISION, DIMENSION(:), INTENT(out):: fxind
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo, Bup
+ INTEGER, DIMENSION(:), INTENT(in) :: indI
INTEGER, INTENT(IN) :: Nt1
! local variables
INTEGER :: J,ix,Ntdcmj,Nst,Nsd,INFORM
- DOUBLE PRECISION :: xind,SQ0,xx,fxc,quant
-! IF (.NOT.PRESENT(xcScale)) THEN
-! xcScale = 0.0d0
-! ENDIF
+ DOUBLE PRECISION :: xind,SQ0,xx,fxc,quant
+! IF (.NOT.PRESENT(xcScale)) THEN
+! xcScale = 0.0d0
+! ENDIF
Nt =Nt1
!print *,'rindd SCIS',SCIS
Nc = size(xc1,dim=1)
@@ -2047,7 +2047,7 @@
IF (Nt+Nc.GT.Ntdc) Nt=Ntdc-Nc ! make sure it does not exceed Ntdc-Nc
Nd = Ntdc - Nt - Nc
Ntd = Nt + Nd
-
+
!Initialization
!Call Initdata(speed)
Nj = MIN(Nj,MAX(Nt,0)) ! make sure Nj<=Nt
@@ -2055,26 +2055,26 @@
ALLOCATE(xc(1:Nc))
IF (Nd.GT.0) THEN
ALLOCATE(xd(1:Nd))
- xd = 0.d0
+ xd = 0.d0
END IF
If (SCIS.GT.0) then
Ntscis=Nt-Nj-Njj
- ALLOCATE(SQ(1:Ntd,1:Ntd)) ! Cond. stdev's
+ ALLOCATE(SQ(1:Ntd,1:Ntd)) ! Cond. stdev's
ALLOCATE(NsXtmj(1:Ntd+1)) ! indices to stoch. var. See condsort
else
Ntscis=0
- ALLOCATE(SQ(1:Ntd,1:max(Njj+Nj+Nd,1)) ) ! Cond. stdev's
+ ALLOCATE(SQ(1:Ntd,1:max(Njj+Nj+Nd,1)) ) ! Cond. stdev's
ALLOCATE(NsXtmj(1:Nd+Nj+Njj+1)) ! indices to stoch. var. See condsort
endif
ALLOCATE(BIG(Ntdc,Ntdc))
ALLOCATE(Cm(Ntdc),CmN(Ntd)) !Cond. mean which has the same order as local
Cm = 0.d0 !covariance matrices (after sorting) or excluding
!irrelevant variables.
-
- ALLOCATE(index1(Ntdc)) ! indices to the var. original place in BIG
+
+ ALLOCATE(index1(Ntdc)) ! indices to the var. original place in BIG
index1=(/(J,J=1,Ntdc)/) ! (before sort.)
- ALLOCATE(xedni(Ntdc)) ! indices to var. new place (after sorting),
+ ALLOCATE(xedni(Ntdc)) ! indices to var. new place (after sorting),
xedni=index1 ! eg. the point xedni(1) is the original position
! of variable with conditional mean CM(1).
ALLOCATE(Hlo(Ntd)) ! lower and upper integration limits are computed
@@ -2083,16 +2083,16 @@
Hlo = 0.d0 ! However later on some variables will be exluded
! since those are irrelevant and hence CMnew(1)
! does not to be conditional mean of the same variable
- ! as CM(1) is from the beginning. Consequently
- ALLOCATE(Hup(Ntd)) ! the order of Hup, Hlo will be unchanged. So we need
+ ! as CM(1) is from the beginning. Consequently
+ ALLOCATE(Hup(Ntd)) ! the order of Hup, Hlo will be unchanged. So we need
Hup=0.d0 ! to know where the relevant variables bounds are
! This will be given in the subroutines by a vector indS.
ALLOCATE(NsXdj(Nd+Nj+1)) ! indices to stoch. var. See condsort
NsXdj=0
- ALLOCATE(indXtd(Ntd)) ! indices to Xt and Xd as they are
+ ALLOCATE(indXtd(Ntd)) ! indices to Xt and Xd as they are
indXtd=(/(J,J=1,Ntd)/) ! sorted in Hlo and Hup
-
+
BIG = BIG1(1:Ntdc,1:Ntdc) !conditional covariance matrix BIG
@@ -2101,14 +2101,14 @@
!xc = SUM(xc1(1:Nc,1:Nx),DIM=2)/DBLE(Nx) ! average of all xc's
xc = xc1(1:Nc,max(Nx/2,1)) ! Or select the one in the middle
CALL BARRIER(xc,indI,Blo,Bup) ! compute average integrationlimits
-
+
! print *,'rindd,xcmean:',xc
! print *,'rindd,Hup:',Hup
! print *,'rindd,Hlo:',Hlo
-
- CALL CONDSORT0(BIG,Cm,xc,SQ,index1,xedni,NsXtmj,NsXdj,INFORM)
- ELSE ! sort by decreasing cond. variance
- CALL CONDSORT (BIG,SQ,index1,xedni,NsXtmj,NsXdj,INFORM)
+
+ CALL CONDSORT0(BIG,Cm,xc,SQ,index1,xedni,NsXtmj,NsXdj,INFORM)
+ ELSE ! sort by decreasing cond. variance
+ CALL CONDSORT (BIG,SQ,index1,xedni,NsXtmj,NsXdj,INFORM)
ENDIF
IF (INFORM.GT.0) GOTO 110 !Degenerated case the density can not computed
@@ -2123,36 +2123,36 @@
fxind = 0.d0 ! initialize
! Now the loop over all different values of
! variables Xc (the one one is conditioning on)
- DO ix = 1, Nx ! is started. The density f_{Xc}(xc(:,ix))
+ DO ix = 1, Nx ! is started. The density f_{Xc}(xc(:,ix))
COVix = ix ! will be computed and denoted by fxc.
- xind = 0.d0
+ xind = 0.d0
fxc = 1.d0
! Cm = Ex (1:Ntdc)
-! index1=(/(J,J=1,Ntdc)/)
+! index1=(/(J,J=1,Ntdc)/)
! xedni=index1
-! BIG = BIG1(1:Ntdc,1:Ntdc)
-! CALL BARRIER(xc1(1:Nc,ix),indI,Blo,Bup) ! integrationlimits
+! BIG = BIG1(1:Ntdc,1:Ntdc)
+! CALL BARRIER(xc1(1:Nc,ix),indI,Blo,Bup) ! integrationlimits
! CALL CONDSORT0 (BIG,Cm,xc1(:,ix),SQ, index1,
! & xedni, NsXtmj,NsXdj)
-
+
! Set the original means of the variables
Cm =Ex (index1(1:Ntdc)) ! Cm(1:Ntdc) =Ex (index1(1:Ntdc))
quant = 0.0d0
- DO J = 1, Nc !Recursive conditioning on the last Nc variables
+ DO J = 1, Nc !Recursive conditioning on the last Nc variables
Ntdcmj=Ntdc-J
SQ0 = BIG(Ntdcmj+1,Ntdcmj+1) ! SQRT(var(X(i)|X(i+1),X(i+2),...,X(Ntdc)))
! i=Ntdc-J+1 (J=1 var(X(Ntdc))
-
+
xx = (xc1(index1(Ntdcmj+1)-Ntd,ix)-Cm(Ntdcmj+1))/SQ0
!Trick to calculate
- !fxc = fxc*SQTWPI1*EXP(-0.5*(XX**2))/SQ0
+ !fxc = fxc*SQTWPI1*EXP(-0.5*(XX**2))/SQ0
quant = quant - 0.5d0 * xx * xx + LOG(SQTWOPI1) - LOG(SQ0)
-
- ! conditional mean (expectation)
- ! E(X(1:i-1)|X(i),X(i+1),...,X(Ntdc))
- Cm(1:Ntdcmj) = Cm(1:Ntdcmj)+xx*BIG (1:Ntdcmj,Ntdcmj+1)
- ENDDO
-! fxc probability density for i=Ntdc-J+1,
+
+ ! conditional mean (expectation)
+ ! E(X(1:i-1)|X(i),X(i+1),...,X(Ntdc))
+ Cm(1:Ntdcmj) = Cm(1:Ntdcmj)+xx*BIG (1:Ntdcmj,Ntdcmj+1)
+ ENDDO
+! fxc probability density for i=Ntdc-J+1,
! fXc=f(X(i)|X(i+1),X(i+2)...X(Ntdc))*
! f(X(i+1)|X(i+2)...X(Ntdc))*..*f(X(Ntdc))
@@ -2161,21 +2161,21 @@
!PRINT *, 'Rindd, Cm=',Cm(xedni(max(1,Nt-5):Ntdc))
!PRINT *, 'Rindd, Cm=',Cm(xedni(1:Ntdc))
- !IF (fxc .LT.fxcEpss) print *,'small, fxc=',fxc
+ !IF (fxc .LT.fxcEpss) print *,'small, fxc=',fxc
IF (fxc .LT.fxcEpss) GOTO 100 ! Small probability don't bother calculating it
- !set the global integration limits Hlo,Hup
+ !set the global integration limits Hlo,Hup
CALL BARRIER(xc1(1:Nc,ix),indI,Blo,Bup)
-
+
Nst = NsXtmj(Ntscis+Njj+Nd+Nj+1)
- Nsd = NsXdj(Nd+Nj+1)
- IF (any((Cm(Nst+1:Nsd-1) .GT.Hup(Nst+1:Nsd-1)+EPS ).OR.
- * (Cm (Nst+1:Nsd-1)+EPS .LT.Hlo (Nst+1:Nsd-1)))) GO TO 100 !degenerate case
- !mean of deterministic variable(s) is
- ! outside the barriers
-
+ Nsd = NsXdj(Nd+Nj+1)
+ IF (any((Cm(Nst+1:Nsd-1) .GT.Hup(Nst+1:Nsd-1)+EPS ).OR.
+ * (Cm (Nst+1:Nsd-1)+EPS .LT.Hlo (Nst+1:Nsd-1)))) GO TO 100 !degenerate case
+ !mean of deterministic variable(s) is
+ ! outside the barriers
+
!PRINT *,'RINDD SCIS',SCIS
IF (SCIS.GE.1.AND.SCIS.LE.9) then ! integrate all by SCIS
XIND=RINDSCIS(xc1(:,ix))
@@ -2186,33 +2186,33 @@
CASE (:0)
IF (SCIS.NE.0) then ! integrate all by SCIS
XIND=MNORMPRB(Cm(1:Nst))
- ELSE
+ ELSE
XIND=RINDNIT(BIG,SQ(1:Nst,1),Cm,indXtd(1:Nst),NIT)
- END IF
+ END IF
CASE (1:)
- xind=RINDDND(BIG,Cm,xd,xc1(:,ix),Nd,Nj)
+ xind=RINDDND(BIG,Cm,xd,xc1(:,ix),Nd,Nj)
END SELECT
- 100 fxind(ix)=xind*fxc
+ 100 fxind(ix)=xind*fxc
!IF (fxc .LT.fxcEpss) print *,'small, fxc, xind',fxc,xind
!PRINT *, 'Rindd, Cm=',Cm(xedni(1:Ntdc))
ENDDO !ix
! PRINT *, 'Rindd, Cm=',Cm(xedni(1:Ntdc))
110 CONTINUE
- IF (ALLOCATED(xc)) DEALLOCATE(xc)
- IF (ALLOCATED(xd)) DEALLOCATE(xd)
+ IF (ALLOCATED(xc)) DEALLOCATE(xc)
+ IF (ALLOCATED(xd)) DEALLOCATE(xd)
IF (ALLOCATED(SQ)) DEALLOCATE(SQ)
IF (ALLOCATED(NsXtmj)) DEALLOCATE(NsXtmj)
- IF (ALLOCATED(Cm)) DEALLOCATE(Cm)
- IF (ALLOCATED(CmN)) DEALLOCATE(CmN)
- IF (ALLOCATED(BIG)) DEALLOCATE(BIG)
+ IF (ALLOCATED(Cm)) DEALLOCATE(Cm)
+ IF (ALLOCATED(CmN)) DEALLOCATE(CmN)
+ IF (ALLOCATED(BIG)) DEALLOCATE(BIG)
IF (ALLOCATED(index1)) DEALLOCATE(index1)
IF (ALLOCATED(xedni)) DEALLOCATE(xedni)
! print *,'before dealocation',Ntd,size(Hup),size(Hlo)
IF (ALLOCATED(Hlo)) DEALLOCATE(Hlo)
- IF (ALLOCATED(Hup)) DEALLOCATE(Hup)
+ IF (ALLOCATED(Hup)) DEALLOCATE(Hup)
IF (ALLOCATED(NsXdj)) DEALLOCATE(NsXdj)
- IF (ALLOCATED(indXtd)) DEALLOCATE(indXtd)
- RETURN
+ IF (ALLOCATED(indXtd)) DEALLOCATE(indXtd)
+ RETURN
END SUBROUTINE RIND71
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -2248,47 +2248,47 @@
I1 = 1
Plo = 0.d0
Nind = 0
-
- DO I = 1,Nstoc,1
+
+ DO I = 1,Nstoc,1
Xup = xCutOff
Xlo =-xCutOff
IF (SQ(I).GE.EPS2) THEN
Xup = MIN( (Hup (indS(I)) - Cm (I))/ SQ(I),Xup)
Xlo = MAX( (Hlo (indS(I)) - Cm (I))/ SQ(I),Xlo)
- ELSE
+ ELSE
IF (Hup(indS(I))+EPS.LT.Cm (I)) Xup = Xlo
IF (Hlo(indS(I)).GT.Cm (I)+EPS) Xlo = Xup
!PRINT *,'argpo',Xlo,Xup
- END IF
+ END IF
IF (Xup.LE.Xlo+EPSS) THEN ! +EPSS
P0 = 0.d0
Plo = 0.d0
ind(1) = I
I0 = 1
Nind = 1
- RETURN
+ RETURN
ENDIF
IF ((Xup+EPSS.LT.xCutOff).or.(Xlo+xCutOff.GT.EPSS)) THEN
Nind = Nind+1
ind(Nind) = I
- ! this procedure calculates
+ ! this procedure calculates
Prb = FI(Xup)-FI(Xlo)
Plo = Plo+Prb
- IF (Prb.LT.P0) THEN
+ IF (Prb.LT.P0) THEN
I1 = I0
- I0 = Nind
- P1 = P0 ! Prob(I0)=Prob(XMA>X(i0)>XMI)=
+ I0 = Nind
+ P1 = P0 ! Prob(I0)=Prob(XMA>X(i0)>XMI)=
P0 = Prb ! min Prob(Hup(i)> X(i)>Hlo(i))
IF (P0.LT.EPSS) THEN
Plo=0.d0
- RETURN
+ RETURN
ENDIF
ELSEIF (Prb.LT.P1) THEN
I1 = Nind
- P1 = Prb
+ P1 = Prb
ENDIF
- ENDIF
+ ENDIF
ENDDO
Plo = MAX(0.d0,1.d0-DBLE(Nind)+Plo)
@@ -2296,13 +2296,13 @@
! print *,'ARGP0',Nstoc,Nind,P0,Plo,I0,I1,CM(ind(I0))
RETURN
END SUBROUTINE ARGP0
-
-
+
+
!Ntmj is the number of elements in indicator
!since Nj points of process valeus (Nt) have
!been moved to the jacobian.
-!index1 contains the original
+!index1 contains the original
!positions of variables in the
!covaraince matrix before condsort
!and that why if index(Ntmj+1)>Nt
@@ -2317,16 +2317,16 @@
! ******************* RINDDND ****************************************
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
- RECURSIVE FUNCTION RINDDND (BIG,Cm,xd,xc,Ndleft,Njleft)
- & RESULT (xind)
+
+ RECURSIVE FUNCTION RINDDND (BIG,Cm,xd,xc,Ndleft,Njleft)
+ & RESULT (xind)
USE JACOBMOD
USE GLOBALDATA, ONLY :SQPI1, SQTWOPI1,Hup,Hlo,Nt,Nj,Njj,Nd,
& NsXtmj,NsXdj,EPS2,NIT,xCutOff,EPSS,CEPSS,index1,
& indXtd,SQ,SQTWO,SQTWO1,SCIS,Ntscis,C1C2det,EPS
- USE FIMOD
+ USE FIMOD
USE C1C2MOD
- USE QUAD
+ USE QUAD
IMPLICIT NONE
INTEGER,INTENT(in) :: Ndleft,Njleft ! # DIMENSIONs to integrate
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: BIG
@@ -2336,40 +2336,40 @@
!local variables
DOUBLE PRECISION :: xind
DOUBLE PRECISION :: xind1
- DOUBLE PRECISION, DIMENSION(PMAX) :: WXdi, Xdi !weights/nodes
+ DOUBLE PRECISION, DIMENSION(PMAX) :: WXdi, Xdi !weights/nodes
DOUBLE PRECISION, DIMENSION(: ), ALLOCATABLE :: CmNEW
INTEGER :: Nrr, Nr, J, N,Ndleft1,Ndjleft,Ntmj,isXd
- INTEGER :: Nst,Nstn,Nsd,NsdN
- DOUBLE PRECISION :: SQ0,fxd,XMA,XMI
+ INTEGER :: Nst,Nstn,Nsd,NsdN
+ DOUBLE PRECISION :: SQ0,fxd,XMA,XMI
Ntmj=Nt-Nj
Ndjleft= Ndleft+Njleft
N=Ntmj+Ndjleft
-
+
IF (index1(N).GT.Nt) THEN
isXd=1
ELSE
isXd=0
END IF
- XIND = 0.d0
- SQ0 = BIG (N, N)
-! index to last stoch. variable of Xt before conditioning on X(N)
- Nst = NsXtmj(Ntscis+Njj+Ndjleft+1)
+ XIND = 0.d0
+ SQ0 = BIG (N, N)
+! index to last stoch. variable of Xt before conditioning on X(N)
+ Nst = NsXtmj(Ntscis+Njj+Ndjleft+1)
!********************************************************************************
!** Here Starts the degenerated case the remaining variables are deterministic **
!********************************************************************************
-
+
IF (SQ0.LT.EPS2) THEN
!Next is the check for the special situation
!that after conditioning on Xc all derivatives are
- !singular and not satisfying the limitations
- !(so something is generally wrong)
+ !singular and not satisfying the limitations
+ !(so something is generally wrong)
IF (any((Cm(Nst+1:N).GT.Hup(Nst+1:N)+EPS ).OR.
& (Cm(Nst+1:N)+EPS.LT.Hlo(Nst+1:N)))) THEN
- RETURN !the mean of Xd or Xt is too extreme
- ENDIF
+ RETURN !the mean of Xd or Xt is too extreme
+ ENDIF
!Here we are putting in all conditional expectations
!for the values of the "deterministic" derivatives.
IF (Nd.GT.0) THEN
@@ -2377,7 +2377,7 @@
DO WHILE (Ndleft1.GT.0)
IF (index1(N).GT.Nt) THEN ! isXd
xd (Ndleft1) = Cm (N)
- Ndleft1=Ndleft1-1
+ Ndleft1=Ndleft1-1
END IF
N=N-1
ENDDO
@@ -2386,7 +2386,7 @@
fxd = 1.d0 ! XIND = FxCutOff???
END IF
- XIND=fxd
+ XIND=fxd
IF (Nst.le.0) RETURN
IF (SCIS.ne.0) then
XIND=fxd*MNORMPRB(Cm(1:Nst))
@@ -2396,30 +2396,30 @@
END IF
RETURN
ENDIF
-
+
!***** Here Starts the conditioning on the last variable (nondeterministic) *
!****************************************************************************
- ! SQ0 = SQ(N,Ntscis+Njj+Ndjleft) !SQRT (SS0)
+ ! SQ0 = SQ(N,Ntscis+Njj+Ndjleft) !SQRT (SS0)
!print *,'RINDD SQO', SQ0,SQ(N,Ntscis+Njj+Ndjleft) !SQ(1:N,Ndjleft)
-
+
XMA=MIN((Hup (indXtd(N))-Cm (N))/SQ0, xCutOff)
XMI=MAX((Hlo (indXtd(N))-Cm (N))/SQ0,-xCutOff)
! See if we can narrow down integration range
! index to first stoch. variable of Xd before conditioning on X(N)
- Nsd = NsXdj(Ndjleft+1)
+ Nsd = NsXdj(Ndjleft+1)
! index to last stoch. variable of Xt after cond. on X(N)
- NstN = NsXtmj(Ntscis+Njj+Ndjleft)
-
+ NstN = NsXtmj(Ntscis+Njj+Ndjleft)
+
!PRINT *,xmi,xma
! print *,Ntscis+Njj+Ndjleft
! print *,'CM=',Cm(1:N-1)
! print *,'SQ=', SQ(1:N-1,Ntscis+Njj+Ndjleft)
- if (C1C2det) then ! checking only on the variables that becomes deterministic
+ if (C1C2det) then ! checking only on the variables that becomes deterministic
! index to first stoch. variable of Xd after conditioning on X(N)
- NsdN = NsXdj(Ndjleft)
+ NsdN = NsXdj(Ndjleft)
CALL C1C2(XMI,XMA,Cm(Nsd:NsdN-1),BIG(Nsd:NsdN-1,N),
& SQ(Nsd:NsdN-1,Ntscis+Njj+Ndjleft),indXtd(Nsd:NsdN-1))
CALL C1C2(XMI,XMA,Cm(NstN+1:Nst),BIG(NstN+1:Nst,N),
@@ -2438,62 +2438,62 @@
XIND=0.d0
RETURN
ENDIF
- Nrr = NINT1 (MIN(Ndjleft,sizNint))
- Nr=0 ! initialize # of nodes
+ Nrr = NINT1 (MIN(Ndjleft,sizNint))
+ Nr=0 ! initialize # of nodes
!print *, 'rinddnd Nrr',Nrr
!Grid the interval [XMI,XMA] by GAUSS quadr.
- CALL GAUSSLE2(Nr, WXdi, Xdi,XMI,XMA, Nrr)
+ CALL GAUSSLE2(Nr, WXdi, Xdi,XMI,XMA, Nrr)
!print *, 'Xdi',Xdi
- ALLOCATE(CmNEW(1:N-1))
- ! The following variables are independent of X(N)
+ ALLOCATE(CmNEW(1:N-1))
+ ! The following variables are independent of X(N)
! because BIG(Nst+1:Nsd-1,N) is set to 0 in condsrort.
! Thus the mean is not changed for these variables
! in order to avoid numerical problems
! The following if test is necessary on Solaris F90 compiler.
- if (Nst+1.LT.Nsd) CmNEW(Nst+1:Nsd-1)=Cm(Nst+1:Nsd-1)
+ if (Nst+1.LT.Nsd) CmNEW(Nst+1:Nsd-1)=Cm(Nst+1:Nsd-1)
! print *,Ndjleft,N,NstN+1,Nsd-1
! print *,BIG(Nst+1:Nsd-1,N)
! print *,'Cm=',Cm(NstN+1:Nsd-1)
- DO J = 1, Nr
+ DO J = 1, Nr
! IF (Wxdi(J).GT.(CFxCutOff)) GO TO 100 !THEN ! EPSS???
IF (isXd.EQ.1) xd (Ndleft) = Xdi (J)*SQ0 + Cm (N)
-
- ! Here we start with the case when there
+
+ ! Here we start with the case when there
! some derivatives left to integrate.
! The following if test is necessary on Solaris F90 compiler.
- if (1.LE.Nst) CmNEW(1:Nst) = Cm(1:Nst)+Xdi(J)*BIG(1:Nst,N)
+ if (1.LE.Nst) CmNEW(1:Nst) = Cm(1:Nst)+Xdi(J)*BIG(1:Nst,N)
if (Nsd.LT.N) CmNEW(Nsd:(N-1)) = Cm(Nsd:(N-1))+
- & Xdi(J)*BIG(Nsd:(N-1),N)
+ & Xdi(J)*BIG(Nsd:(N-1),N)
!print *,'CmNew=',N-1,Ndjleft,CmNew(1:N-1)
fxd = Wxdi(J)
IF (Ndjleft.GT.1) THEN
XIND1=RINDDND(BIG,CmNEW,xd,xc,Ndleft-isXd,Njleft-1+isXd)
ELSE ! Here all is conditioned on
! and we wish to compute the
- ! conditional probability that
+ ! conditional probability that
! variables in indicator stays between barriers.
XIND1 = 1.d0
- !if there are derivatives we need
- !to compute the jacobian, jacob(xd,xc)
- IF (Nd.GT.0) fxd = fxd *jacob(xd(1:Nd),xc)
- !If there are no derivatives
+ !if there are derivatives we need
+ !to compute the jacobian, jacob(xd,xc)
+ IF (Nd.GT.0) fxd = fxd *jacob(xd(1:Nd),xc)
+ !If there are no derivatives
!then we assume that jacob(xc)=1
-
+
IF (NstN.LT.1) GOTO 100 !Here there are no points in indicator
!left to integrate and hence XIND1=1.
- !integrate by Monte Carlo - SCIS
+ !integrate by Monte Carlo - SCIS
IF (SCIS.NE.0) XIND1 = MNORMPRB(CmNEW)
- !integrate by quadrature
+ !integrate by quadrature
IF (SCIS.EQ.0) XIND1 = RINDNIT(BIG,
& SQ(:,Ntscis+Njj+1),CmNEW,indXtd(1:NstN),NIT)
!print *,'jacobian',xind,xind1,xind+fxd*xind1
END IF
- 100 CONTINUE
+ 100 CONTINUE
XIND = XIND+XIND1 * fxd !END IF
ENDDO
-
- DEALLOCATE(CmNEW)
+
+ DEALLOCATE(CmNEW)
RETURN
END FUNCTION RINDDND
@@ -2501,18 +2501,18 @@
! ******************* RINDNIT ****************************************
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- ! old procedure rind2-6
+ ! old procedure rind2-6
RECURSIVE FUNCTION RINDNIT(R,SQ,Cm,indS,NITL) RESULT (xind)
USE GLOBALDATA, ONLY : Hlo,Hup,EPS2, EPSS,CEPSS
& ,xCutOff,Plowgth,XSPLT
- USE FIMOD
+ USE FIMOD
USE C1C2MOD
USE QUAD
IMPLICIT NONE
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: R
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: R
DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: SQ
DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: Cm
- DOUBLE PRECISION :: xind
+ DOUBLE PRECISION :: xind
INTEGER, DIMENSION(: ), INTENT(in) :: indS
INTEGER, INTENT(in) :: NITL
! local variables
@@ -2527,7 +2527,7 @@
DOUBLE PRECISION, DIMENSION(2) :: XMI, XMA
INTEGER, DIMENSION(2) :: INFIN
DOUBLE PRECISION :: SGN,P0,Plo,rho
- INTEGER :: Ns,Nsnew,row,r1,r2,J,N1
+ INTEGER :: Ns,Nsnew,row,r1,r2,J,N1
! Assumption is that there is at least one variable X in the indicator,
! LNIT nonegative integer.
@@ -2545,13 +2545,13 @@
! the global variables Hlo and Hup
! Ns = size of indS =# of variables in indicator before conditioning
! Nsnew = # of relevant variables in indicator before conditioning
-! I0,I1 = indicies to minimum prob. and next minimal, respectively
-! ..NEW = the var. above after conditioning on X(I0) or used in recursion
+! I0,I1 = indicies to minimum prob. and next minimal, respectively
+! ..NEW = the var. above after conditioning on X(I0) or used in recursion
! ind = temp. variable storing indices
Ns=SIZE(indS) !=# stochastic variables before conditioning
XIND=1.d0
-
+
if (Ns.lt.1) return
ALLOCATE(ind(1:Ns))
@@ -2571,14 +2571,14 @@
! Now CEPSS>P0>EPSS+Plo and there are more than one relevant variable (NSnew>1)
! Those have indices ind(I0), ind(I1).
! Hence we have nondegenerated case.
-
+
SS0 = R (ind(I0) ,ind(I0))
- SQ0 = SQRT(SS0)
+ SQ0 = SQRT(SS0)
r1=indS(ind(I0))
! print *,'P0-Plo,SS0,Sq0',P0-Plo,SS0,Sq0
XMA(1) = MIN((Hup (r1)-Cm (ind(I0)))/SQ0,xCutOff)
- XMI(1) = MAX((Hlo (r1)-Cm (ind(I0)))/SQ0,-xCutOff)
-
+ XMI(1) = MAX((Hlo (r1)-Cm (ind(I0)))/SQ0,-xCutOff)
+
!If NSnew = 2 then we can compute the probability exactly and recursion stops.
IF ((NSnew.EQ.2).OR.(NITL.LT.1)) THEN !.OR.(NITL.LT.1)
! Not necessary any longer:
@@ -2587,21 +2587,21 @@
! if (I0.eq.I1) print *,'rindnit, I1,I0:',I1,I0
SS1 = R (ind(I1) ,ind(I1))
SQ1 = SQRT(SS1)
-
+
IF (ind(I0).LT.ind(I1)) THEN
SS=R(ind(I0),ind(I1))
ELSE
SS=R(ind(I1),ind(I0))
ENDIF
rho= SS/(SQ0*SQ1)
-
+
r2=indS(ind(I1))
XMA(2) = MIN((Hup (r2)-Cm (ind(I1)))/SQ1,xCutOff)
XMI(2) = MAX((Hlo (r2)-Cm (ind(I1)))/SQ1,-xCutOff)
IF (ABS(rho).gt.1.d0+EPSS) THEN
!print *,'rindnit, Correlation > 1, rho=',rho
IF (ABS(rho).gt.1.d0+EPSS) GO TO 300
- rho = sign(1.D0,rho)
+ rho = sign(1.D0,rho)
! print *,'rindnit, P0,Plo',P0,Plo,XIND
! print *,'rindnit I0,I1:',I0,I1
! print *,'rindnit XMI,XMA,XMI1,XMA1:',XMI(1),XMA(1),
@@ -2617,14 +2617,14 @@
* if INFIN(I) = 0, Ith limits are (-infinity, UPPER(I)];
* if INFIN(I) = 1, Ith limits are [LOWER(I), infinity);
* if INFIN(I) = 2, Ith limits are [LOWER(I), UPPER(I)].
-! INFIN = 2
+! INFIN = 2
IF (XMI(1).LE.-xCutOff) INFIN(1)=0
IF (XMI(2).LE.-xCutOff) INFIN(2)=0
IF (XMA(1).GE. xCutOff) INFIN(1)=1
IF (XMA(2).GE. xCutOff) INFIN(2)=1
!print *,'rindnit, xind,xind2=', XIND, BVNMVN(XMI,XMA,INFIN,rho)
- XIND = BVNMVN(XMI,XMA,INFIN,rho)
+ XIND = BVNMVN(XMI,XMA,INFIN,rho)
! print *,xind
GOTO 300
END IF
@@ -2658,8 +2658,8 @@
ALLOCATE(CMnew(1:NSnew-1))
ALLOCATE(SQnew(1:NSnew-1))
ALLOCATE(B(1:NSnew-1))
- !This DO loop is divided in two parts in order
- !to only work on the upper triangular of R
+ !This DO loop is divided in two parts in order
+ !to only work on the upper triangular of R
DO row=1,I0-1
r1=ind(row)
Rnew(row,row:I0-1)=R(r1,ind(row:I0-1))
@@ -2675,19 +2675,19 @@
DO row=I0+1,NSnew
ind(row-1)=ind(row)
enddo
-
-
+
+
CMnew=CM(ind(1:NSnew-1))
SQnew=SQ(ind(1:NSnew-1))
indSnew=indS(ind(1:NSnew-1))
-
+
!USE the XSPLIT variant
IF (SGN.LT.0.d0) XIND2 = RINDNIT(Rnew,SQnew,CMnew,indSnew,NITL-1)
! Perform conditioning on X(I0)
NSnew=NSnew-1
N1=0
- DO row = 1, NSnew
+ DO row = 1, NSnew
Rnew(row,row:NSnew) = Rnew(row,row:NSnew) -
& B(row)*B(row:NSnew) !/SS0)
SS = RNEW(row,row)
@@ -2698,29 +2698,29 @@
N1=N1+1 ! count number of deterministic variables
END IF
ENDDO
-
+
!See if we can Narrow down the limits
- CALL C1C2(XMI(1),XMA(1),CmNew,B,SQNEW,indSnew)
+ CALL C1C2(XMI(1),XMA(1),CmNew,B,SQNEW,indSnew)
XIND = (FI (XMA(1)) - FI (XMI(1)))
- ! if Nsnew<=N1 then PRB = XIND almost always
+ ! if Nsnew<=N1 then PRB = XIND almost always
! if this check is not performed then
! the numerical integration may currupt the answer due
! to the limited number of nodes used in the integration
IF (XIND.LT.EPSS.OR.Nsnew.LT.N1+1) GOTO 200
-
- ! print *,'rindnit gaussle2'
- N1=0 ! computing nodes for num. integration.
- CALL GAUSSLE2 (N1, H1, XX1, XMI(1), XMA(1),LE2Qnr)
+
+ ! print *,'rindnit gaussle2'
+ N1=0 ! computing nodes for num. integration.
+ CALL GAUSSLE2 (N1, H1, XX1, XMI(1), XMA(1),LE2Qnr)
! new conditional covariance
XIND = 0.d0
-! print *,'rindnit for loop',N1
+! print *,'rindnit for loop',N1
DO J = 1, N1
- !IF (H1(J).GT.CFxCutOff) THEN
- CMnew=Cm(ind(1:NSnew)) + XX1(J)*B !/ SQ0)
- XIND1=RINDNIT(Rnew,SQnew,CMnew,indSnew,NITL-1)
+ !IF (H1(J).GT.CFxCutOff) THEN
+ CMnew=Cm(ind(1:NSnew)) + XX1(J)*B !/ SQ0)
+ XIND1=RINDNIT(Rnew,SQnew,CMnew,indSnew,NITL-1)
XIND = XIND+XIND1 * H1 (J)
- !END IF
+ !END IF
ENDDO
200 CONTINUE
XIND=XIND2+SGN*XIND
@@ -2741,31 +2741,31 @@
if (allocated(SQNEW)) DEALLOCATE(SQNEW)
if (allocated(B)) DEALLOCATE(B)
if (allocated(ind)) DEALLOCATE(ind)
-! print *,'rindnit leaving end'
- RETURN
+! print *,'rindnit leaving end'
+ RETURN
END FUNCTION RINDNIT
-
- SUBROUTINE BARRIER(xc,indI,Blo,Bup)
+
+ SUBROUTINE BARRIER(xc,indI,Blo,Bup)
USE GLOBALDATA, ONLY : Hup,Hlo,xedni,Ntd,index1
IMPLICIT NONE
INTEGER, DIMENSION(: ), INTENT(in) :: indI
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo,Bup
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo,Bup
DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: xc
INTEGER :: I, J, K, L
INTEGER :: Mb, Nb, NI, Nc
-!this procedure set Hlo,Hup according to Blo/Bup
+!this procedure set Hlo,Hup according to Blo/Bup
Mb=size(Blo,DIM=1)
Nb=size(Blo,DIM=2)
NI=size(indI,DIM=1)
Nc=size(xc,DIM=1)
-
- DO J = 2, NI
- DO I =indI (J - 1) + 1 , indI (J)
+
+ DO J = 2, NI
+ DO I =indI (J - 1) + 1 , indI (J)
L=xedni(I)
- Hlo (L) = Blo (1, J - 1)
- Hup (L) = Bup (1, J - 1)
- DO K = 1, Mb-1
+ Hlo (L) = Blo (1, J - 1)
+ Hup (L) = Bup (1, J - 1)
+ DO K = 1, Mb-1
Hlo(L) = Hlo(L)+Blo(K+1,J-1)*xc(K)
Hup(L) = Hup(L)+Bup(K+1,J-1)*xc(K)
ENDDO ! K
@@ -2775,18 +2775,18 @@
!print * ,size(Hup),Hup(xedni(1:Ntd))
!print * ,'barrier hlo:'
!print * ,size(Hlo),Hlo(xedni(1:Ntd))
- RETURN
+ RETURN
END SUBROUTINE BARRIER
function MNORMPRB(Cm1) RESULT (VALUE)
USE ADAPTMOD
USE KRBVRCMOD
USE KROBOVMOD
- USE RCRUDEMOD
- USE DKBVRCMOD
+ USE RCRUDEMOD
+ USE DKBVRCMOD
USE SSOBOLMOD
USE FUNCMOD
- USE FIMOD
+ USE FIMOD
USE C1C2MOD
USE GLOBALDATA, ONLY : Hlo,Hup,xCutOff,NUGGET,EPSS,EPS2,
& RelEps,NSIMmax,NSIMmin,Nt,Nd,Nj,Ntd,SQ,
@@ -2805,10 +2805,10 @@
! SCIS = Sequential conditioned importance sampling
! LHSCIS = Latin Hypercube Sequential Conditioned Importance Sampling
!
-! ! NB!!: R must be conditional sorted by condsort3
+! ! NB!!: R must be conditional sorted by condsort3
! works on the upper triangular part of R
!
-! References
+! References
! R. Ambartzumian, A. Der Kiureghian, V. Ohanian and H.
! Sukiasian (1998)
! Probabilistic Engineering Mechanics, Vol. 13, No 4. pp 299-308
@@ -2838,18 +2838,18 @@
if (allocated(COV)) then ! save the coefficient of variation in COV
COV(COVix)=0.d0
endif
-
+
VALUE=1.d0
return
endif
!print *,' mnormprb start calculat'
VALUE=0.d0
- Cm(1:Nst-Njj)=Cm1(Njj+1:Nst) ! initialize conditional mean
+ Cm(1:Nst-Njj)=Cm1(Njj+1:Nst) ! initialize conditional mean
SQ0 = SQ(Njj+1,Njj+1)
XMA = MIN((Hup (Njj+1)-Cm1(Njj+1))/SQ0,xCutOff)
XMI = MAX((Hlo (Njj+1)-Cm1(Njj+1))/SQ0,-xCutOff)
-
- if (useC1C2) then ! see if we can narrow down sampling range
+
+ if (useC1C2) then ! see if we can narrow down sampling range
CALL C1C2(XMI,XMA,Cm1(Njj+2:Nst),BIG(1,2:Nst),
& SQ(2:Nst,1),indXtd(2:Nst))
endif
@@ -2860,48 +2860,48 @@
MAXPTS = NSIMmax*Ndim
MINPTS = NSIMmin*Ndim
ABSEPS = EPSS
- DEF = 1 ! krbvrc is fastest
- SELECT CASE (DEF)
- CASE (:1)
- !print * ,'RINDSCIS: Ndim',Ndim
- IF (NDIM.lt.9) THEN
- CALL SADAPT(Ndim,MAXPTS,MVNFUN2,ABSEPS,
- & RELEPS,ERROR,VALUE,INFORM)
- ELSE
- CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- ENDIF
- CASE (2)
- !print * ,'RINDSCIS: Ndim',Ndim
- IF (NDIM.lt.19) THEN
- ! Call the subregion adaptive integration subroutine
- CALL SADAPT(Ndim,MAXPTS,MVNFUN2,ABSEPS,
- & RELEPS,ERROR,VALUE,INFORM)
- ELSE
- CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- ENDIF
- CASE (3)
- CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- CASE (4)
- CALL KROBOV( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- CASE (5) ! Call Crude Monte Carlo integration procedure
- CALL RANMC( NDIM, MAXPTS, MVNFUN2, ABSEPS,
- & RELEPS, ERROR, VALUE, INFORM )
- CASE (6) ! Call the scrambled Sobol sequence rule integration procedure
- CALL SOBNIED( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- CASE (7:)
- CALL DKBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- END SELECT
-
+ DEF = 1 ! krbvrc is fastest
+ SELECT CASE (DEF)
+ CASE (:1)
+ !print * ,'RINDSCIS: Ndim',Ndim
+ IF (NDIM.lt.9) THEN
+ CALL SADAPT(Ndim,MAXPTS,MVNFUN2,ABSEPS,
+ & RELEPS,ERROR,VALUE,INFORM)
+ ELSE
+ CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ ENDIF
+ CASE (2)
+ !print * ,'RINDSCIS: Ndim',Ndim
+ IF (NDIM.lt.19) THEN
+ ! Call the subregion adaptive integration subroutine
+ CALL SADAPT(Ndim,MAXPTS,MVNFUN2,ABSEPS,
+ & RELEPS,ERROR,VALUE,INFORM)
+ ELSE
+ CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ ENDIF
+ CASE (3)
+ CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ CASE (4)
+ CALL KROBOV( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ CASE (5) ! Call Crude Monte Carlo integration procedure
+ CALL RANMC( NDIM, MAXPTS, MVNFUN2, ABSEPS,
+ & RELEPS, ERROR, VALUE, INFORM )
+ CASE (6) ! Call the scrambled Sobol sequence rule integration procedure
+ CALL SOBNIED( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ CASE (7:)
+ CALL DKBVRC( NDIM, MINPTS, MAXPTS, MVNFUN2, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ END SELECT
+
if (allocated(COV)) then ! save the coefficient of variation in COV
if ((VALUE.gt.0.d0)) COV(COVix)=ERROR/VALUE/3.0d0
endif
-
+
!print *,'mnormprb, error, inform,',error,inform
!print *,'leaving mnormprb'
return
@@ -2909,12 +2909,12 @@
FUNCTION RINDSCIS(xc1) result(VALUE)
-!RINDSCIS Multivariate Normal integrals by SCIS
+!RINDSCIS Multivariate Normal integrals by SCIS
! SCIS = Sequential conditioned importance sampling
! The points can be sampled using Lattice rules, Latin Hypercube samples,
-! uniformly distributed, or using an adaptive algorithm
-!
-! References
+! uniformly distributed, or using an adaptive algorithm
+!
+! References
! R. Ambartzumian, A. Der Kiureghian, V. Ohanian and H.
! Sukiasian (1998)
! Probabilistic Engineering Mechanics, Vol. 13, No 4. pp 299-308
@@ -2925,11 +2925,11 @@
USE ADAPTMOD
USE KRBVRCMOD
USE KROBOVMOD
- USE RCRUDEMOD
- USE DKBVRCMOD
+ USE RCRUDEMOD
+ USE DKBVRCMOD
USE SSOBOLMOD
USE FUNCMOD
- USE FIMOD
+ USE FIMOD
USE C1C2MOD
USE JACOBMOD
USE GLOBALDATA, ONLY : Hlo,Hup,xCutOff,NUGGET,EPSS,EPS2,
@@ -2943,9 +2943,9 @@
INTEGER :: Ndim,Ndleft,Ntmj,NLHD
INTEGER :: MINPTS,MAXPTS, INFORM
DOUBLE PRECISION :: ABSEPS, ERROR
-
+
VALUE = 0.d0
-
+
! print *,'enter rindscis'
Nst = NsXtmj(Ntd+1)
Ntmj=Nt-Nj
@@ -2956,22 +2956,22 @@
endif
Nsd = NsXdj(Nd+Nj+1)
Nsd0 = NsXdj(1)
- Ndim = Nst0+Ntd-Nsd0+1 ! # dim. we treat stochastically
+ Ndim = Nst0+Ntd-Nsd0+1 ! # dim. we treat stochastically
MAXPTS = NSIMmax*Ndim
MINPTS = NSIMmin*Ndim
ABSEPS = EPSS
- IF (Nc.GT.0) xc=xc1
+ IF (Nc.GT.0) xc=xc1
if (Nd+Nj.gt.0) then
- IF ( BIG(Ntd,Ntd).LT.EPS2) THEN !degenerate case
+ IF ( BIG(Ntd,Ntd).LT.EPS2) THEN !degenerate case
IF (Nd.GT.0) THEN
Ndleft=Nd;K=Ntd
DO WHILE (Ndleft.GT.0)
IF (index1(K).GT.Nt) THEN ! isXd
xd (Ndleft) = Cm (K)
- Ndleft=Ndleft-1
+ Ndleft=Ndleft-1
END IF
K=K-1
ENDDO
@@ -2979,12 +2979,12 @@
ELSE
VALUE = 1.d0 ! VALUE = FxCutOff???
END IF
- !print *,'jacob,xd',VALUE,xd
+ !print *,'jacob,xd',VALUE,xd
IF (Nst.LT.1) then
if (allocated(COV)) then ! save the coefficient of variation in COV
COV(COVix)=0.d0
endif
- RETURN
+ RETURN
endif
!print *,'RINDSCIS calling MNORMPRB '
VALUE=VALUE*MNORMPRB(Cm(1:Nst))
@@ -2995,17 +2995,17 @@
if (allocated(COV)) then ! save the coefficient of variation in COV
COV(COVix)=0.d0
endif
-
+
VALUE=1.d0
return
endif
-
+
if (Nd+Nj.gt.0) then
SQ0=SQ(Ntd,Ntd)
XMA = MIN((Hup (Ntd)-Cm(Ntd))/SQ0,xCutOff)
XMI = MAX((Hlo (Ntd)-Cm(Ntd))/SQ0,-xCutOff)
-
- if (useC1C2) then ! see if we can narrow down sampling range
+
+ if (useC1C2) then ! see if we can narrow down sampling range
CALL C1C2(XMI,XMA,Cm(1:Ntd-1),BIG(1:Ntd-1,Ntd),
& SQ(1:Ntd-1,Ntd),indXtd(1:Ntd-1))
endif
@@ -3013,13 +3013,13 @@
SQ0=SQ(1,1)
XMA = MIN((Hup (1)-Cm(1))/SQ0,xCutOff)
XMI = MAX((Hlo (1)-Cm(1))/SQ0,-xCutOff)
-
- if (useC1C2) then ! see if we can narrow down sampling range
+
+ if (useC1C2) then ! see if we can narrow down sampling range
CALL C1C2(XMI,XMA,Cm(2:Nst),BIG(1,2:Nst),
& SQ(2:Nst,1),indXtd(2:Nst))
- endif
+ endif
endif
- IF (XMA.LE.XMI) return !PQ= Y=0 for all return
+ IF (XMA.LE.XMI) return !PQ= Y=0 for all return
Pl1 = FI(XMI)
Pu1 = FI(XMA)
IF ( Ndim .GT. 20. AND. SCIS.EQ.3) THEN
@@ -3039,30 +3039,30 @@
ENDIF
CASE (2)
!print * ,'RINDSCIS: Ndim',Ndim
- IF (NDIM.lt.19) THEN
-! Call the subregion adaptive integration subroutine
+ IF (NDIM.lt.19) THEN
+! Call the subregion adaptive integration subroutine
CALL SADAPT(Ndim,MAXPTS,MVNFUN,ABSEPS,
& RELEPS,ERROR,VALUE,INFORM)
ELSE
CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
& ERROR, VALUE, INFORM )
ENDIF
- CASE (3)
- CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- CASE (4)
- CALL KROBOV( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
+ CASE (3)
+ CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ CASE (4)
+ CALL KROBOV( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
& ERROR, VALUE, INFORM )
CASE (5) ! Call Crude Monte Carlo integration procedure
- CALL RANMC( NDIM, MAXPTS, MVNFUN, ABSEPS,
- & RELEPS, ERROR, VALUE, INFORM )
- CASE (6) ! Call the scrambled Sobol sequence rule integration procedure
- CALL SOBNIED( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- CASE (7:)
- CALL DKBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
- & ERROR, VALUE, INFORM )
- END SELECT
+ CALL RANMC( NDIM, MAXPTS, MVNFUN, ABSEPS,
+ & RELEPS, ERROR, VALUE, INFORM )
+ CASE (6) ! Call the scrambled Sobol sequence rule integration procedure
+ CALL SOBNIED( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ CASE (7:)
+ CALL DKBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, ABSEPS, RELEPS,
+ & ERROR, VALUE, INFORM )
+ END SELECT
if (allocated(COV)) then ! save the coefficient of variation in COV
if ((VALUE.gt.0.d0)) COV(COVix)=ERROR/VALUE/3.0d0
endif
@@ -3071,7 +3071,7 @@
endif
!print *,'rindscis, Ndim,MINPTS, error',Ndim,MINPTS,error
END FUNCTION RINDSCIS
-
+
!********************************************************************
SUBROUTINE CONDSORT0 (R,Cm,xcmean,CSTD,index1,xedni,NsXtmj,NsXdj
@@ -3082,9 +3082,9 @@
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: R
DOUBLE PRECISION, DIMENSION(: ), INTENT(inout) :: Cm
DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: xcmean
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(out) :: CSTD
- INTEGER, DIMENSION(: ), INTENT(inout) :: index1
- INTEGER, DIMENSION(: ), INTENT(inout) :: xedni
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(out) :: CSTD
+ INTEGER, DIMENSION(: ), INTENT(inout) :: index1
+ INTEGER, DIMENSION(: ), INTENT(inout) :: xedni
INTEGER, DIMENSION(: ), INTENT(out) :: NsXtmj
INTEGER, DIMENSION(: ), INTENT(out) :: NsXdj
INTEGER, INTENT(out) :: INFORM
@@ -3097,82 +3097,82 @@
INTEGER :: I0,I1
INTEGER :: Nstoc,Ntmp,NstoXd !,degenerate
INTEGER :: changed,m1,r1,c1,r2,c2,ix,iy,Njleft,Ntmj
-
+
! R = Input: Cov(X) where X=[Xt Xd Xc] is stochastic vector
-! Output: sorted Conditional Covar. matrix Shape N X N (N=Nt+Nd+Nc)
+! Output: sorted Conditional Covar. matrix Shape N X N (N=Nt+Nd+Nc)
! CSTD = SQRT(Var(X(1:I-1)|X(I:N)))
! conditional standard deviation. Shape Ntd X max(Nd+Nj,1)
! index1 = indices to the variables original place. Size Ntdc
! xedni = indices to the variables new place. Size Ntdc
! NsXtmj(I) = indices to the last stochastic variable
-! among Nt-Nj first of Xt after conditioning on
+! among Nt-Nj first of Xt after conditioning on
! X(Nt-Nj+I). Size Nd+Nj+Njj+Ntscis+1
! NsXdj(I) = indices to the first stochastic variable
-! among Xd+Nj of Xt after conditioning on
+! among Xd+Nj of Xt after conditioning on
! X(Nt-Nj+I). Size Nd+Nj+1
-!
+!
! R=Cov([Xt,Xd,Xc]) is a covariance matrix of the stochastic vector X=[Xt Xd Xc]
-! where the variables Xt, Xd and Xc have the size Nt, Nd and Nc, respectively.
+! where the variables Xt, Xd and Xc have the size Nt, Nd and Nc, respectively.
! Xc is (are) the conditional variable(s).
! Xd and Xt are the variables to integrate.
-! Xd + Nj variables of Xt are integrated directly by the RindDXX
+! Xd + Nj variables of Xt are integrated directly by the RindDXX
! subroutines in the order of shortest expected integration interval.
-! The remaining Nt-Nj variables of Xt are integrated in
-! increasing order of the marginal probabilities by the RindXX subroutines.
-! CONDSORT prepare and rearrange the covariance matrix
+! The remaining Nt-Nj variables of Xt are integrated in
+! increasing order of the marginal probabilities by the RindXX subroutines.
+! CONDSORT prepare and rearrange the covariance matrix
! in a special way to accomodate this strategy:
-!
-! After conditioning and sorting, the first Nt-Nj x Nt-Nj block of R
+!
+! After conditioning and sorting, the first Nt-Nj x Nt-Nj block of R
! will contain the conditional covariance matrix
-! of Xt(1:Nt-Nj) given Xt(Nt-Nj+1:Nt) Xd and Xc, i.e.,
-! Cov(Xt(1:Nt-Nj),Xt(1:Nt-Nj)|Xt(Nt-Nj+1:Nt), Xd,Xc)
+! of Xt(1:Nt-Nj) given Xt(Nt-Nj+1:Nt) Xd and Xc, i.e.,
+! Cov(Xt(1:Nt-Nj),Xt(1:Nt-Nj)|Xt(Nt-Nj+1:Nt), Xd,Xc)
! NB! for Nj>0 the order of Xd and Xt(Nt-Nj+1:Nt) may be mixed.
-! The covariances, Cov(X(1:I-1),X(I)|X(I+1:N)), needed for computation of the
-! conditional expectation, E(X(1:I-1)|X(I:N), are saved in column I of R
+! The covariances, Cov(X(1:I-1),X(I)|X(I+1:N)), needed for computation of the
+! conditional expectation, E(X(1:I-1)|X(I:N), are saved in column I of R
! for I=Nt-Nj+1:Ntdc.
-!
-! IF any of the variables have variance less than EPS2. They will be
-! be treated as deterministic and not stochastic variables by the
-! RindXXX subroutines. The deterministic variables are moved to
-! middle in the order they became deterministic in order to
+!
+! IF any of the variables have variance less than EPS2. They will be
+! be treated as deterministic and not stochastic variables by the
+! RindXXX subroutines. The deterministic variables are moved to
+! middle in the order they became deterministic in order to
! keep track of them. Their variance and covariance with
-! the remaining stochastic variables are set to zero in
+! the remaining stochastic variables are set to zero in
! order to avoid numerical difficulties.
-!
-! NsXtmj(I) is the number of variables among the Nt-Nj
-! first we treat stochastically after conditioning on X(Nt-Nj+I).
+!
+! NsXtmj(I) is the number of variables among the Nt-Nj
+! first we treat stochastically after conditioning on X(Nt-Nj+I).
! The covariance matrix is sorted so that all variables with indices
! from 1 to NsXtmj(I) are stochastic after conditioning
-! on X(Nt-Nj+I). Thus NsXtmj(I) may also be considered
+! on X(Nt-Nj+I). Thus NsXtmj(I) may also be considered
! as the index to the last stochastic variable after conditioning
! on X(Nt-Nj+I). In other words NsXtmj keeps track of the deterministic
-! and stochastic variables among the Nt-Nj first variables in each
+! and stochastic variables among the Nt-Nj first variables in each
! conditioning step.
!
! Similarly NsXdj(I) keeps track of the deterministic and stochastic
! variables among the Nd+Nj following variables in each conditioning step.
! NsXdj(I) is the index to the first stochastic variable
-! among the Nd+Nj following variables after conditioning on X(Nt-Nj+I).
+! among the Nd+Nj following variables after conditioning on X(Nt-Nj+I).
! The covariance matrix is sorted so that all variables with indices
! from NsXdj(I+1) to NsXdj(I)-1 are deterministic conditioned on
-! X(Nt-Nj+I).
+! X(Nt-Nj+I).
!
! Var(Xc(1))>Var(Xc(2)|Xc(1))>...>Var(Xc(Nc)|Xc(1),Xc(2),...,Xc(Nc)).
! If Nj=0 then
-! Var(Xd(1)|Xc)>Var(Xd(2)|Xd(1),Xc)>...>Var(Xd(Nd)|Xd(1),Xd(2),...,Xd(Nd),Xc).
-!
+! Var(Xd(1)|Xc)>Var(Xd(2)|Xd(1),Xc)>...>Var(Xd(Nd)|Xd(1),Xd(2),...,Xd(Nd),Xc).
+!
! NB!! Since R is symmetric, only the upper triangular contains the
! sorted conditional covariance. The whole matrix
-! is easily obtained by copying elements of the upper triangle to
+! is easily obtained by copying elements of the upper triangle to
! the lower or by uncommenting some lines in the end of this subroutine
!
! revised pab 18.04.2000
! new name rind60
-! New assumption of BIG for the conditional sorted variables:
+! New assumption of BIG for the conditional sorted variables:
! BIG(I,I)=sqrt(Var(X(I)|X(I+1)...X(N))=SQI
! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))/SQI
-! Otherwise
+! Otherwise
! BIG(I,I) = Var(X(I)|X(I+1)...X(N)
! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))
! This also affects C1C2: SQ0=sqrt(Var(X(I)|X(I+1)...X(N)) is removed from input
@@ -3180,33 +3180,33 @@
! Using SQ to temporarily store the diagonal of R
-! Adding a nugget effect to ensure the the inversion is
-! not corrupted by round off errors
-! good choice for nugget might be 1e-8
+! Adding a nugget effect to ensure the the inversion is
+! not corrupted by round off errors
+! good choice for nugget might be 1e-8
!call getdiag(SQ,R)
INFORM = 0
ALLOCATE(SQ(1:Ntdc))
ALLOCATE(ind(1:Ntdc))
IF (Nd+Nj+Njj+Ntscis.GT.0) THEN
ALLOCATE(CSTD2(1:Ntd,1:Nd+Nj+Njj+Ntscis))
- CSTD2=0.d0 ! initialize CSTD
+ CSTD2=0.d0 ! initialize CSTD
ENDIF
!CALL ECHO(R,Ntdc)
- DO ix = 1, Ntdc
- R(ix,ix) = R(ix,ix)+Nugget
+ DO ix = 1, Ntdc
+ R(ix,ix) = R(ix,ix)+Nugget
SQ(ix) = R(ix,ix)
- index1 (ix) = ix ! initialize index1
+ index1 (ix) = ix ! initialize index1
ENDDO
-
+
Ntmj = Nt-Nj
Njleft = Nj
NstoXd = Ntmj+1
Nstoc = Ntmj
-
-
+
+
DO ix = 1, Nc ! Condsort Xc
r1=Ntdc-ix
- m=r1+2-MAXLOC(SQ(r1+1:Ntd+1:-1))
+ m=r1+2-MAXLOC(SQ(r1+1:Ntd+1:-1))
IF (SQ(m(1)).LT.XCEPS2) THEN
INFORM = 1
!PRINT *,'Condsort0, degenerate Xc'
@@ -3219,28 +3219,28 @@
SQ(r1+1) = SQRT(SQ(m(1)))
R(index1(1:r1+1),m1) = R(index1(1:r1+1),m1)/SQ(r1+1)
R(m1,index1(1:r1)) = R(index1(1:r1),m1)
-
+
! Calculate the conditional mean
Cm(1:r1)=Cm(1:r1)+(xcmean(index1(r1+1)-Ntd)-Cm(r1+1))*
& R(index1(1:r1),m1) !/SQ(r1+1)
! sort and calculate conditional covariances
CALL CONDSORT2(R,SQ,index1,Nstoc,NstoXd,Njleft,m1,r1)
- ENDDO ! ix
+ ENDDO ! ix
! index to first stochastic variable of Xd and Nj of Xt
- NsXdj(Nd+Nj+1) = NstoXd
+ NsXdj(Nd+Nj+1) = NstoXd
! index to last stochastic variable of Nt-Nj of Xt
- NsXtmj(Nd+Nj+Njj+Ntscis+1) = Nstoc
+ NsXtmj(Nd+Nj+Njj+Ntscis+1) = Nstoc
!print *, 'condsort index1', index1
- !print *, 'condsort Xd'
+ !print *, 'condsort Xd'
!call echo(R,Ntdc)
-
+
DO ix = 1, Nd+Nj ! Condsort Xd + Nj of Xt
CALL ARGP0(I1,r2,P1,XX,SQRT(SQ(NstoXd:Ntd-ix+1)),
& Cm(NstoXd:Ntd-ix+1),index1(NstoXd:Ntd-ix+1),ind,r1)
IF (r1.NE.0) I1=ind(I1)
m = MIN(NstoXd+I1-1,Ntd-ix+1)
IF (Njleft.GT.0) THEN
-
+
CALL ARGP0(I0,r2,P0,XX,SQRT(SQ(1:Nstoc)),
& Cm(1:Nstoc),index1(1:Nstoc),ind,r1)
IF (r1.NE.0) I0=ind(I0)
@@ -3259,7 +3259,7 @@
Njleft=Njleft-1
END IF
END IF ! Njleft
- IF (SQ(m(1)).LT.EPS2) THEN
+ IF (SQ(m(1)).LT.EPS2) THEN
!PRINT *,'Condsort, degenerate Xd'
Ntmp = Nd+Nj+1-ix
NsXtmj(Ntscis+Njj+1:Ntmp+Ntscis+Njj+1) = Nstoc
@@ -3267,7 +3267,7 @@
IF (ix.EQ.1) THEN
DO iy = 1,Ntd !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
r1 = index1(iy)
- CSTD2(r1,Ntscis+Njj+1:Ntmp+Ntscis+Njj)=SQRT(SQ(iy))
+ CSTD2(r1,Ntscis+Njj+1:Ntmp+Ntscis+Njj)=SQRT(SQ(iy))
ENDDO
ELSE
DO iy=ix,Nd+Nj
@@ -3285,80 +3285,80 @@
SQ0 = SQRT(SQ(m(1)))
SQ(r1+1) = SQ0
CSTD2(m1,Nd+Nj+Ntscis+Njj+1-ix)=SQ0
-
+
R(index1(1:r1+1),m1) = R(index1(1:r1+1),m1)/SQ0
R(m1,index1(1:r1)) = R(index1(1:r1),m1)
-
+
XMA = MIN( (Hup (index1(r1+1)) - Cm (r1+1))/ SQ0,xCutOff)
XMA = MAX(XMA,-xCutOff)
- XMI = MAX( (Hlo (index1(r1+1)) - Cm (r1+1))/ SQ0,-xCutOff)
+ XMI = MAX( (Hlo (index1(r1+1)) - Cm (r1+1))/ SQ0,-xCutOff)
XMI = MIN(XMI,xCutOff)
! There is something wrong with XX
IF (P1.GT. EPSS ) THEN
- ! Calculate the normalized expected mean without the jacobian
+ ! Calculate the normalized expected mean without the jacobian
XX = SQTWOPI1*(EXP(-0.5d0*XMI*XMI)-EXP(-0.5d0*XMA*XMA))/P1
ELSE
IF ( XMI .LE. -xCutOff ) XX = XMA
IF ( XMA .GE. xCutOff ) XX = XMI
IF (XMI.GT.-xCutOff.AND.XMA.LT.xCutOff) XX=(XMI+XMA)*0.5d0
END IF
-
+
! Calculate the conditional expected mean
- Cm(1:r1) = Cm(1:r1)+XX*R(index1(1:r1),m1)
+ Cm(1:r1) = Cm(1:r1)+XX*R(index1(1:r1),m1)
- ! Calculating conditional variances
+ ! Calculating conditional variances
CALL CONDSORT2(R,SQ,index1,Nstoc,NstoXd,Njleft,m1,Ntd-ix)
! saving indices
NsXtmj(Nd+Nj+Njj+Ntscis+1-ix)=Nstoc
NsXdj(Nd+Nj+1-ix)=NstoXd
-
+
! Calculating standard deviations non-deterministic variables
DO r2=1,Nstoc
r1=index1(r2)
- CSTD2(r1,Nd+Nj+Njj+Ntscis+1-ix)=SQRT(SQ(r2)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
- ENDDO
+ CSTD2(r1,Nd+Nj+Njj+Ntscis+1-ix)=SQRT(SQ(r2)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
+ ENDDO
DO r2=NstoXd,Ntd-ix
r1=index1(r2)
- CSTD2(r1,Nd+Nj+Ntscis+Njj+1-ix)=SQRT(SQ(r2)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
+ CSTD2(r1,Nd+Nj+Ntscis+Njj+1-ix)=SQRT(SQ(r2)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
ENDDO
- ENDDO ! ix
-
-
+ ENDDO ! ix
+
+
200 IF ((SCIS.GT.0).OR. (Njj.gt.0)) THEN ! check on Njj instead
! Calculating conditional variances and sort for Nstoc of Xt
CALL CONDSORT4(R,Cm,CSTD2,SQ,index1,NsXtmj,Nstoc)
!Nst0=Nstoc
ENDIF
- IF (Nd+Nj+Njj+Ntscis.GT.0) THEN
+ IF (Nd+Nj+Njj+Ntscis.GT.0) THEN
DO r2=1,Ntd ! sorting CSTD according to index1
- r1=index1(r2)
+ r1=index1(r2)
CSTD(r2,:)= CSTD2(r1,:)
END DO
DEALLOCATE(CSTD2)
ELSE
- IF (Nc.EQ.0) THEN
- ix=1; Nstoc=Ntmj
+ IF (Nc.EQ.0) THEN
+ ix=1; Nstoc=Ntmj
DO WHILE (ix.LE.Nstoc)
IF (SQ(ix).LT.EPS2) THEN
DO WHILE ((SQ(Nstoc).LT.EPS2).AND.(ix.LT.Nstoc))
SQ(Nstoc)=0.d0 !MAX(0.d0,SQ(Nstoc))
Nstoc=Nstoc-1
- END DO
+ END DO
CALL swapint(index1(ix),index1(Nstoc)) ! swap indices
!CALL swapre(SQ(ix),SQ(Nstoc))
SQ(ix)=SQ(Nstoc);SQ(Nstoc)=0.d0
Nstoc=Nstoc-1
ENDIF
ix=ix+1
- END DO
+ END DO
ENDIF
CSTD(1:Nt,1)=SQRT(SQ(1:Nt))
NsXtmj(1)=Nstoc
- ENDIF
+ ENDIF
- changed=0
- DO r2=Ntdc,1,-1 ! sorting the upper triangular of the
+ changed=0
+ DO r2=Ntdc,1,-1 ! sorting the upper triangular of the
r1=index1(r2) ! covariance matrix according to index1
xedni(r1)=r2
!PRINT *,'condsort,xedni',xedni
@@ -3374,9 +3374,9 @@
R(r2,c2)=R(r1,c1)
END IF
END DO
- END IF
+ END IF
END DO
- ! you may sort the lower triangular according
+ ! you may sort the lower triangular according
! to index1 also, but it is not needed
! since R is symmetric. Uncomment the
! following if the whole matrix is needed
@@ -3398,8 +3398,8 @@
! PRINT 600, R
! PRINT 600, SQ
DEALLOCATE(SQ)
- IF (ALLOCATED(ind)) DEALLOCATE(ind)
- RETURN
+ IF (ALLOCATED(ind)) DEALLOCATE(ind)
+ RETURN
END SUBROUTINE CONDSORT0
@@ -3411,7 +3411,7 @@
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: R,CSTD2
DOUBLE PRECISION, DIMENSION(: ), INTENT(inout) :: Cm
DOUBLE PRECISION, DIMENSION(:), INTENT(inout) :: SQ ! diag. of R
- INTEGER, DIMENSION(: ), INTENT(inout) :: index1,NsXtmj
+ INTEGER, DIMENSION(: ), INTENT(inout) :: index1,NsXtmj
INTEGER, INTENT(inout) :: Nstoc
! local variables
DOUBLE PRECISION :: P0,Plo,XMI,XMA,SQ0,XX
@@ -3421,7 +3421,7 @@
INTEGER :: m1
INTEGER :: Nsold
INTEGER :: r1,c1,row,col,iy,ix
-! This function condsort all the Xt variables for use with RINDSCIS and
+! This function condsort all the Xt variables for use with RINDSCIS and
! MNORMPRB
!Nsoold=Nstoc
@@ -3433,7 +3433,7 @@
IF (r1.NE.0) I0=ind(I0)
m = ix-1+max(I0-1,1)
! m=ix-1+MAXLOC(SQ(ix:Nstoc))
-
+
IF (SQ(m(1)).LT.EPS2) THEN
!PRINT *,'Condsort3, error degenerate X'
NsXtmj(1:Njj+Ntscis)=0
@@ -3445,38 +3445,38 @@
CALL swapre(SQ(ix),SQ(m(1)))
SQ0=SQRT(SQ(ix))
CSTD2(m1,ix)=SQ0
-
+
R(index1(ix:Nstoc),m1) = R(index1(ix:Nstoc),m1)/SQ0
R(m1,index1(ix+1:Nstoc)) = R(index1(ix+1:Nstoc),m1)
CALL swapre(Cm(m(1)),Cm(ix))
-
-
+
+
XMA = MIN( (Hup (index1(ix)) - Cm (ix))/ SQ0,xCutOff)
- XMI = MAX( (Hlo (index1(ix)) - Cm (ix))/ SQ0,-xCutOff)
+ XMI = MAX( (Hlo (index1(ix)) - Cm (ix))/ SQ0,-xCutOff)
XMA = MAX(XMA,-xCutOff)
XMI = MIN(XMI,xCutOff)
IF (P0.GT. EPSS ) THEN
- ! Calculate the expected mean
+ ! Calculate the expected mean
XX= SQTWOPI1*(EXP(-0.5d0*XMI*XMI)-EXP(-0.5d0*XMA*XMA))/P0
ELSE
IF ( XMI .LE. -xCutOff ) XX = XMA
IF ( XMA .GE. xCutOff ) XX = XMI
IF (XMI.GT.-xCutOff.AND.XMA.LT.xCutOff) XX=(XMI+XMA)*0.5d0
END IF
-
+
! Calculate the conditional expected mean
Cm(ix+1:Nstoc)=Cm(ix+1:Nstoc)+XX*
- & R(m1,index1(ix+1:Nstoc))
+ & R(m1,index1(ix+1:Nstoc))
- ! Calculating conditional variances for the
+ ! Calculating conditional variances for the
! first Nstoc variables.
- ! variables with variance less than EPS2
- ! will be treated as deterministic and not
+ ! variables with variance less than EPS2
+ ! will be treated as deterministic and not
! stochastic variables and are therefore moved
! to the end among these variables.
- ! Nstoc is the # of variables we treat
- ! stochastically
+ ! Nstoc is the # of variables we treat
+ ! stochastically
iy=ix+1;Nsold=Nstoc
DO WHILE (iy.LE.Nstoc)
r1=index1(iy)
@@ -3496,7 +3496,7 @@
Nstoc=Nstoc-1
r1=index1(Nstoc)
SQ(Nstoc)=R(r1,r1)-R(r1,m1)*R(m1,r1) !/R(m1,m1)
- END DO
+ END DO
CALL swapint(index1(iy),index1(Nstoc)) ! swap indices
!CALL swapre(SQ(iy),SQ(Nstoc)) ! swap values
SQ(iy)=SQ(Nstoc);
@@ -3505,7 +3505,7 @@
Nstoc=Nstoc-1
ENDIF
iy=iy+1
- END DO
+ END DO
NsXtmj(ix)=Nstoc ! saving index to last stoch. var. after conditioning
! Calculating Covariances for non-deterministic variables
DO row=ix+1,Nstoc
@@ -3517,8 +3517,8 @@
R(c1,r1)=R(r1,c1)-R(r1,m1)*R(m1,c1) !/R(m1,m1)
R(r1,c1)=R(c1,r1)
ENDDO
- ENDDO
- ! similarly for deterministic values
+ ENDDO
+ ! similarly for deterministic values
DO row=Nstoc+1,Nsold
r1=index1(row)
SQ(row) = 0.d0 !MAX(0.d0,SQ(row))
@@ -3540,7 +3540,7 @@
! PRINT *,'Nstoc,Njj, Ntscis',Nstoc,Njj,Ntscis
endif
IF (ALLOCATED(ind)) DEALLOCATE(ind)
- RETURN
+ RETURN
END SUBROUTINE CONDSORT4
SUBROUTINE CONDSORT (R,CSTD,index1,xedni,NsXtmj,NsXdj,INFORM)
@@ -3548,9 +3548,9 @@
& XCEPS2,SCIS,Ntscis
IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: R
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(out) :: CSTD
- INTEGER, DIMENSION(: ), INTENT(out) :: index1
- INTEGER, DIMENSION(: ), INTENT(out) :: xedni
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(out) :: CSTD
+ INTEGER, DIMENSION(: ), INTENT(out) :: index1
+ INTEGER, DIMENSION(: ), INTENT(out) :: xedni
INTEGER, DIMENSION(: ), INTENT(out) :: NsXtmj
INTEGER, DIMENSION(: ), INTENT(out) :: NsXdj
INTEGER, INTENT(out) :: INFORM
@@ -3560,83 +3560,83 @@
INTEGER, DIMENSION(1 ) :: m
INTEGER :: Nstoc,Ntmp,NstoXd !,degenerate
INTEGER :: changed,m1,r1,c1,row,col,ix,iy,Njleft,Ntmj
-
+
! R = Input: Cov(X) where X=[Xt Xd Xc] is stochastic vector
-! Output: sorted Conditional Covar. matrix Shape N X N (N=Nt+Nd+Nc)
+! Output: sorted Conditional Covar. matrix Shape N X N (N=Nt+Nd+Nc)
! CSTD = SQRT(Var(X(1:I-1)|X(I:N)))
! conditional standard deviation. Shape Ntd X max(Nd+Nj,1)
! index1 = indices to the variables original place. Size Ntdc
! xedni = indices to the variables new place. Size Ntdc
! NsXtmj(I) = indices to the last stochastic variable
-! among Nt-Nj first of Xt after conditioning on
+! among Nt-Nj first of Xt after conditioning on
! X(Nt-Nj+I). Size Nd+Nj+Njj+Ntscis+1
! NsXdj(I) = indices to the first stochastic variable
-! among Xd+Nj of Xt after conditioning on
+! among Xd+Nj of Xt after conditioning on
! X(Nt-Nj+I). Size Nd+Nj+1
-!
+!
! R=Cov([Xt,Xd,Xc]) is a covariance matrix of the stochastic vector X=[Xt Xd Xc]
-! where the variables Xt, Xd and Xc have the size Nt, Nd and Nc, respectively.
+! where the variables Xt, Xd and Xc have the size Nt, Nd and Nc, respectively.
! Xc is (are) the conditional variable(s).
! Xd and Xt are the variables to integrate.
-! Xd + Nj variables of Xt are integrated directly by the RindDXX
+! Xd + Nj variables of Xt are integrated directly by the RindDXX
! subroutines in the order of decreasing conditional variance.
-! The remaining Nt-Nj variables of Xt are integrated in
-! increasing order of the marginal probabilities by the RindXX subroutines.
-! CONDSORT prepare and rearrange the covariance matrix
+! The remaining Nt-Nj variables of Xt are integrated in
+! increasing order of the marginal probabilities by the RindXX subroutines.
+! CONDSORT prepare and rearrange the covariance matrix
! by decreasing order of conditional variances in a special way
! to accomodate this strategy:
-!
-! After conditioning and sorting, the first Nt-Nj x Nt-Nj block of R
+!
+! After conditioning and sorting, the first Nt-Nj x Nt-Nj block of R
! will contain the conditional covariance matrix
-! of Xt(1:Nt-Nj) given Xt(Nt-Nj+1:Nt) Xd and Xc, i.e.,
-! Cov(Xt(1:Nt-Nj),Xt(1:Nt-Nj)|Xt(Nt-Nj+1:Nt), Xd,Xc)
+! of Xt(1:Nt-Nj) given Xt(Nt-Nj+1:Nt) Xd and Xc, i.e.,
+! Cov(Xt(1:Nt-Nj),Xt(1:Nt-Nj)|Xt(Nt-Nj+1:Nt), Xd,Xc)
! NB! for Nj>0 the order of Xd and Xt(Nt-Nj+1:Nt) may be mixed.
-! The covariances, Cov(X(1:I-1),X(I)|X(I+1:N)), needed for computation of the
-! conditional expectation, E(X(1:I-1)|X(I:N), are saved in column I of R
+! The covariances, Cov(X(1:I-1),X(I)|X(I+1:N)), needed for computation of the
+! conditional expectation, E(X(1:I-1)|X(I:N), are saved in column I of R
! for I=Nt-Nj+1:Ntdc.
-!
-! IF any of the variables have variance less than EPS2. They will be
-! be treated as deterministic and not stochastic variables by the
-! RindXXX subroutines. The deterministic variables are moved to
-! middle in the order they became deterministic in order to
+!
+! IF any of the variables have variance less than EPS2. They will be
+! be treated as deterministic and not stochastic variables by the
+! RindXXX subroutines. The deterministic variables are moved to
+! middle in the order they became deterministic in order to
! keep track of them. Their variance and covariance with
-! the remaining stochastic variables are set to zero in
+! the remaining stochastic variables are set to zero in
! order to avoid numerical difficulties.
-!
-! NsXtmj(I) is the number of variables among the Nt-Nj
-! first we treat stochastically after conditioning on X(Nt-Nj+I).
+!
+! NsXtmj(I) is the number of variables among the Nt-Nj
+! first we treat stochastically after conditioning on X(Nt-Nj+I).
! The covariance matrix is sorted so that all variables with indices
! from 1 to NsXtmj(I) are stochastic after conditioning
-! on X(Nt-Nj+I). Thus NsXtmj(I) may also be considered
+! on X(Nt-Nj+I). Thus NsXtmj(I) may also be considered
! as the index to the last stochastic variable after conditioning
! on X(Nt-Nj+I). In other words NsXtmj keeps track of the deterministic
-! and stochastic variables among the Nt-Nj first variables in each
+! and stochastic variables among the Nt-Nj first variables in each
! conditioning step.
!
! Similarly NsXdj(I) keeps track of the deterministic and stochastic
! variables among the Nd+Nj following variables in each conditioning step.
! NsXdj(I) is the index to the first stochastic variable
-! among the Nd+Nj following variables after conditioning on X(Nt-Nj+I).
+! among the Nd+Nj following variables after conditioning on X(Nt-Nj+I).
! The covariance matrix is sorted so that all variables with indices
! from NsXdj(I+1) to NsXdj(I)-1 are deterministic conditioned on
-! X(Nt-Nj+I).
+! X(Nt-Nj+I).
!
! Var(Xc(1))>Var(Xc(2)|Xc(1))>...>Var(Xc(Nc)|Xc(1),Xc(2),...,Xc(Nc)).
! If Nj=0 then
-! Var(Xd(1)|Xc)>Var(Xd(2)|Xd(1),Xc)>...>Var(Xd(Nd)|Xd(1),Xd(2),...,Xd(Nd),Xc).
-!
+! Var(Xd(1)|Xc)>Var(Xd(2)|Xd(1),Xc)>...>Var(Xd(Nd)|Xd(1),Xd(2),...,Xd(Nd),Xc).
+!
! NB!! Since R is symmetric, only the upper triangular contains the
! sorted conditional covariance. The whole matrix
-! is easily obtained by copying elements of the upper triangle to
+! is easily obtained by copying elements of the upper triangle to
! the lower or by uncommenting some lines in the end of this subroutine
! revised pab 18.04.2000
! new name rind60
-! New assumption of BIG for the conditional sorted variables:
+! New assumption of BIG for the conditional sorted variables:
! BIG(I,I)=sqrt(Var(X(I)|X(I+1)...X(N))=SQI
-! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))/SQI
-! Otherwise
+! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))/SQI
+! Otherwise
! BIG(I,I) = Var(X(I)|X(I+1)...X(N)
! BIG(1:I-1,I)=COV(X(1:I-1),X(I)|X(I+1)...X(N))
! This also affects C1C2: SQ0=sqrt(Var(X(I)|X(I+1)...X(N)) is removed from input
@@ -3645,35 +3645,35 @@
! Using SQ to temporarily store the diagonal of R
-! Adding a nugget effect to ensure the the inversion is
-! not corrupted by round off errors
-! good choice for nugget might be 1e-8
+! Adding a nugget effect to ensure the the inversion is
+! not corrupted by round off errors
+! good choice for nugget might be 1e-8
!call getdiag(SQ,R)
INFORM = 0
ALLOCATE(SQ(1:Ntdc))
IF (Nd+Nj+Njj+Ntscis.GT.0) THEN
ALLOCATE(CSTD2(1:Ntd,1:Nd+Nj+Njj+Ntscis))
- CSTD2=0.d0 ! initialize CSTD
+ CSTD2=0.d0 ! initialize CSTD
ENDIF
!CALL ECHO(R,Ntdc)
- DO ix = 1, Ntdc
- R(ix,ix)=R(ix,ix)+Nugget
+ DO ix = 1, Ntdc
+ R(ix,ix)=R(ix,ix)+Nugget
SQ(ix)=R(ix,ix)
- index1 (ix) = ix ! initialize index1
+ index1 (ix) = ix ! initialize index1
ENDDO
-
+
Ntmj=Nt-Nj
!NsXtmj(Njj+Nd+Nj+1)=Ntmj ! index to last stochastic variable of Nt-Nj of Xt
!NsXdj(Nd+Nj+1)=Ntmj+1 ! index to first stochastic variable of Xd and Nj of Xt
!degenerate=0
Njleft=Nj
NstoXd=Ntmj+1;Nstoc=Ntmj
-
-
+
+
DO ix = 1, Nc ! Condsort Xc
r1 = Ntdc-ix
- m=r1+2-MAXLOC(SQ(r1+1:Ntd+1:-1))
+ m=r1+2-MAXLOC(SQ(r1+1:Ntd+1:-1))
IF (SQ(m(1)).LT.XCEPS2) THEN
INFORM = 1
!PRINT *,'Condsort, degenerate Xc'
@@ -3691,14 +3691,14 @@
R(m1,index1(1:r1)) = R(index1(1:r1),m1)
! sort and calculate conditional covariances
CALL CONDSORT2(R,SQ,index1,Nstoc,NstoXd,Njleft,m1,Ntdc-ix)
- ENDDO ! ix
-
+ ENDDO ! ix
+
NsXdj(Nd+Nj+1) = NstoXd ! index to first stochastic variable of Xd and Nj of Xt
NsXtmj(Nd+Nj+Njj+Ntscis+1) = Nstoc ! index to last stochastic variable of Nt-Nj of Xt
!print *, 'condsort index1', index1
- !print *, 'condsort Xd'
+ !print *, 'condsort Xd'
!call echo(R,Ntdc)
-
+
DO ix = 1, Nd+Nj ! Condsort Xd + Nj of Xt
r1 = Ntd-ix
IF (Njleft.GT.0) THEN
@@ -3714,7 +3714,7 @@
ELSE
m=r1+2-MAXLOC(SQ(r1+1:Ntmj+1:-1))
END IF
- IF (SQ(m(1)).LT.EPS2) THEN
+ IF (SQ(m(1)).LT.EPS2) THEN
!PRINT *,'Condsort, degenerate Xd'
!degenerate=1
Ntmp=Nd+Nj+1-ix
@@ -3723,7 +3723,7 @@
IF (ix.EQ.1) THEN
DO iy=1,Ntd !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
r1=index1(iy)
- CSTD2(r1,Ntscis+Njj+1:Ntmp+Ntscis+Njj)=SQRT(SQ(iy))
+ CSTD2(r1,Ntscis+Njj+1:Ntmp+Ntscis+Njj)=SQRT(SQ(iy))
ENDDO
ELSE
DO iy=ix,Nd+Nj
@@ -3739,28 +3739,28 @@
!CALL swapRe(SQ(Ntd-ix+1),SQ(m(1)))
SQ(r1+1) = SQRT(SQ(m(1)))
CSTD2(m1,Nd+Nj+Ntscis+Njj+1-ix) = SQ(r1+1)
-
+
R(index1(1:r1+1),m1) = R(index1(1:r1+1),m1)/SQ(r1+1)
R(m1,index1(1:r1)) = R(index1(1:r1),m1)
-
- ! Calculating conditional variances
+
+ ! Calculating conditional variances
CALL CONDSORT2(R,SQ,index1,Nstoc,NstoXd,Njleft,m1,Ntd-ix)
! saving indices
NsXtmj(Nd+Nj+Njj+Ntscis+1-ix)=Nstoc
NsXdj(Nd+Nj+1-ix)=NstoXd
-
+
! Calculating standard deviations non-deterministic variables
DO row=1,NsXtmj(Nd+Nj+Njj+Ntscis+2-ix) !Nstoc
r1=index1(row)
- CSTD2(r1,Nd+Nj+Njj+Ntscis+1-ix)=SQRT(SQ(row)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
- ENDDO
- DO row=NsXdj(Nd+Nj+2-ix),Ntd-ix !NstoXd,Ntd-ix
+ CSTD2(r1,Nd+Nj+Njj+Ntscis+1-ix)=SQRT(SQ(row)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
+ ENDDO
+ DO row=NsXdj(Nd+Nj+2-ix),Ntd-ix !NstoXd,Ntd-ix
r1=index1(row)
- CSTD2(r1,Nd+Nj+Ntscis+Njj+1-ix)=SQRT(SQ(row)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
+ CSTD2(r1,Nd+Nj+Ntscis+Njj+1-ix)=SQRT(SQ(row)) !sqrt(VAR(X(I)|X(Ntd-ix+1:Ntdc))
ENDDO
- ENDDO ! ix
-
-
+ ENDDO ! ix
+
+
200 IF ((SCIS.GT.0).OR. (Njj.gt.0)) THEN ! check on Njj instead
! Calculating conditional variances and sort for Nstoc of Xt
CALL CONDSORT3(R,CSTD2,SQ,index1,NsXtmj,Nstoc)
@@ -3768,33 +3768,33 @@
ENDIF
IF ((Nd+Nj+Njj+Ntscis.GT.0)) THEN
DO row=1,Ntd ! sorting CSTD according to index1
- r1=index1(row)
+ r1=index1(row)
CSTD(row,:)= CSTD2(r1,:)
END DO
DEALLOCATE(CSTD2)
- ELSE
- IF (Nc.EQ.0) THEN
- ix=1; Nstoc=Ntmj
+ ELSE
+ IF (Nc.EQ.0) THEN
+ ix=1; Nstoc=Ntmj
DO WHILE (ix.LE.Nstoc)
IF (SQ(ix).LT.EPS2) THEN
DO WHILE ((SQ(Nstoc).LT.EPS2).AND.(ix.LT.Nstoc))
SQ(Nstoc)=0.d0 !max(0.d0,SQ(Nstoc))
Nstoc=Nstoc-1
- END DO
+ END DO
CALL swapint(index1(ix),index1(Nstoc)) ! swap indices
!CALL swapRe(SQ(ix),SQ(Nstoc))
SQ(ix)=SQ(Nstoc);SQ(Nstoc)=0.d0
Nstoc=Nstoc-1
ENDIF
ix=ix+1
- END DO
+ END DO
ENDIF
CSTD(1:Nt,1)=SQRT(SQ(1:Nt))
NsXtmj(1)=Nstoc
- ENDIF
+ ENDIF
- changed=0
- DO row=Ntdc,1,-1 ! sorting the upper triangular of the
+ changed=0
+ DO row=Ntdc,1,-1 ! sorting the upper triangular of the
r1=index1(row) ! covariance matrix according to index1
xedni(r1)=row
!PRINT *,'condsort,xedni',xedni
@@ -3810,9 +3810,9 @@
R(row,col)=R(r1,c1)
END IF
END DO
- END IF
+ END IF
END DO
- ! you may sort the lower triangular according
+ ! you may sort the lower triangular according
! to index1 also, but it is not needed
! since R is symmetric. Uncomment the
! following if the whole matrix is needed
@@ -3834,7 +3834,7 @@
! PRINT 600, R
! PRINT 600, SQ
DEALLOCATE(SQ)
-
+
RETURN
END SUBROUTINE CONDSORT
@@ -3843,8 +3843,8 @@
USE GLOBALDATA, ONLY : Ntd,EPS2,XCEPS2
IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: R
- DOUBLE PRECISION, DIMENSION(:), INTENT(inout) :: SQ
- INTEGER, DIMENSION(: ), INTENT(inout) :: index1
+ DOUBLE PRECISION, DIMENSION(:), INTENT(inout) :: SQ
+ INTEGER, DIMENSION(: ), INTENT(inout) :: index1
INTEGER, INTENT(inout) :: Nstoc,NstoXd,Njleft
INTEGER, INTENT(in) :: m1,N
! local variables
@@ -3854,12 +3854,12 @@
! save their old values
Nsold=Nstoc;Ndold=NstoXd
- ! Calculating conditional variances for the
- ! Xc variables.
+ ! Calculating conditional variances for the
+ ! Xc variables.
DO row=Ntd+1,N
r1 = index1(row)
SQ(row) = R(r1,r1)-R(r1,m1)*R(m1,r1) !/R(m1,m1)
- IF (SQ(row).LT.XCEPS2) THEN
+ IF (SQ(row).LT.XCEPS2) THEN
IF (SQ(row).LT.-XCEPS2) THEN
!print *, 'Condsort2,Error: Covariance negative definit'
ENDIF
@@ -3875,14 +3875,14 @@
R(r1,c1) = R(c1,r1)
ENDDO
ENDIF
- ENDDO ! Calculating conditional variances for the
+ ENDDO ! Calculating conditional variances for the
! first Nstoc variables.
- ! variables with variance less than EPS2
- ! will be treated as deterministic and not
+ ! variables with variance less than EPS2
+ ! will be treated as deterministic and not
! stochastic variables and are therefore moved
! to the end among these Nt-Nj first variables.
- ! Nstoc is the # of variables we treat
- ! stochastically
+ ! Nstoc is the # of variables we treat
+ ! stochastically
iy=1
DO WHILE (iy.LE.Nstoc)
r1=index1(iy)
@@ -3893,7 +3893,7 @@
ENDIF
r1=index1(Nstoc)
SQ(Nstoc)=R(r1,r1)-R(r1,m1)*R(m1,r1) !/R(m1,m1)
-
+
DO WHILE ((SQ(Nstoc).LT.EPS2).AND.(iy.LT.Nstoc))
IF (SQ(Nstoc).LT.-EPS2) THEN
!print *, 'Condsort2,Error: Covariance negative definit'
@@ -3902,21 +3902,21 @@
Nstoc=Nstoc-1
r1=index1(Nstoc)
SQ(Nstoc)=R(r1,r1)-R(r1,m1)*R(m1,r1) !/R(m1,m1)
- END DO
+ END DO
CALL swapint(index1(iy),index1(Nstoc)) ! swap indices
!CALL swapre(SQ(iy),SQ(Nstoc)) ! swap values
SQ(iy)=SQ(Nstoc);SQ(Nstoc)=0.d0
Nstoc=Nstoc-1
ENDIF
iy=iy+1
- END DO
-
- ! Calculating conditional variances for the
- ! stochastic variables Xd and Njleft of Xt.
+ END DO
+
+ ! Calculating conditional variances for the
+ ! stochastic variables Xd and Njleft of Xt.
! Variables with conditional variance less than
! EPS2 are moved to the beginning among these
! with only One exception: if it is one of the
- ! Xt variables and Nstoc>0 then it switch place
+ ! Xt variables and Nstoc>0 then it switch place
! with Xt(Nstoc)
DO iy=Ndold,MIN(Ntd,N)
@@ -3924,7 +3924,7 @@
SQ(iy)=R(r1,r1)-R(r1,m1)*R(m1,r1) !/R(m1,m1)
IF (SQ(iy).LT.EPS2) THEN
IF (Njleft.GT.0) THEN
- Ntmp=NstoXd+Njleft
+ Ntmp=NstoXd+Njleft
IF (iy.LT.Ntmp) THEN
IF (Nstoc.GT.0) THEN !switch place with Xt(Nstoc)
CALL swapint(index1(iy),index1(Nstoc))
@@ -3941,7 +3941,7 @@
ELSE
CALL swapint(index1(iy),index1(Ntmp))
CALL swapint(index1(Ntmp),index1(NstoXd))
- !CALL swapre(SQ(iy),SQ(Ntmp))
+ !CALL swapre(SQ(iy),SQ(Ntmp))
!CALL swapre(SQ(Ntmp),SQ(NstoXd))
SQ(iy)=SQ(Ntmp);SQ(Ntmp)=SQ(NstoXd)
SQ(NstoXd)=0.d0
@@ -3955,8 +3955,8 @@
ENDIF
ENDIF ! SQ < EPS2
ENDDO
-
-
+
+
! Calculating Covariances for non-deterministic variables
DO row=1,Nstoc
r1=index1(row)
@@ -3971,21 +3971,21 @@
R(c1,r1)=R(r1,c1)-R(r1,m1)*R(m1,c1) !/R(m1,m1)
R(r1,c1)=R(c1,r1)
ENDDO
- ENDDO
+ ENDDO
DO row=NstoXd,MIN(Ntd,N)
r1=index1(row)
R(r1,r1)=SQ(row)
-
+
DO col=row+1,N
c1=index1(col)
R(c1,r1)=R(r1,c1)-R(r1,m1)*R(m1,c1) !/R(m1,m1)
R(r1,c1)=R(c1,r1)
ENDDO
ENDDO
-
+
! Set covariances for Deterministic variables to zero
! in order to avoid numerical problems
-
+
DO row=Ndold,NStoXd-1
r1=index1(row)
SQ(row) = 0.d0 !MAX(SQ(row),0.d0)
@@ -4001,7 +4001,7 @@
R(r1,c1)=0.d0
ENDDO
ENDDO
-
+
DO row=Nstoc+1,Nsold
r1=index1(row)
SQ(row) = 0.d0 !MAX(SQ(row),0.d0)
@@ -4017,7 +4017,7 @@
R(r1,c1)=0.d0
ENDDO
ENDDO
- RETURN
+ RETURN
END SUBROUTINE CONDSORT2
SUBROUTINE CONDSORT3(R,CSTD2,SQ,index1,NsXtmj,Nstoc)
@@ -4025,21 +4025,21 @@
IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: R,CSTD2
DOUBLE PRECISION, DIMENSION(:), INTENT(inout) :: SQ ! diag. of R
- INTEGER, DIMENSION(: ), INTENT(inout) :: index1,NsXtmj
+ INTEGER, DIMENSION(: ), INTENT(inout) :: index1,NsXtmj
INTEGER, DIMENSION(1) :: m
INTEGER, INTENT(inout) :: Nstoc
! local variables
INTEGER :: m1
INTEGER :: Nsold
INTEGER :: r1,c1,row,col,iy,ix
-! This function condsort all the Xt variables for use with RINDSCIS and
+! This function condsort all the Xt variables for use with RINDSCIS and
! MNORMPRB
!Nsoold=Nstoc
ix=1
-
+
DO WHILE ((ix.LE.Nstoc).and.(ix.LE.(Ntscis+Njj)))
- m=ix-1+MAXLOC(SQ(ix:Nstoc))
+ m=ix-1+MAXLOC(SQ(ix:Nstoc))
IF (SQ(m(1)).LT.EPS2) THEN
!PRINT *,'Condsort3, error degenerate X'
NsXtmj(1:Njj+Ntscis)=0
@@ -4050,17 +4050,17 @@
CALL swapint(index1(m(1)),index1(ix))
SQ(ix) = SQRT(SQ(m(1)))
CSTD2(m1,ix) = SQ(ix)
-
+
R(index1(ix:Nstoc),m1) = R(index1(ix:Nstoc),m1)/SQ(ix)
R(m1,index1(ix+1:Nstoc)) = R(index1(ix+1:Nstoc),m1)
- ! Calculating conditional variances for the
+ ! Calculating conditional variances for the
! first Nstoc variables.
- ! variables with variance less than EPS2
- ! will be treated as deterministic and not
+ ! variables with variance less than EPS2
+ ! will be treated as deterministic and not
! stochastic variables and are therefore moved
! to the end among these variables.
- ! Nstoc is the # of variables we treat
- ! stochastically
+ ! Nstoc is the # of variables we treat
+ ! stochastically
iy=ix+1;Nsold=Nstoc
DO WHILE (iy.LE.Nstoc)
r1=index1(iy)
@@ -4079,14 +4079,14 @@
Nstoc=Nstoc-1
r1=index1(Nstoc)
SQ(Nstoc)=R(r1,r1)-R(r1,m1)*R(m1,r1) !/R(m1,m1)
- END DO
+ END DO
CALL swapint(index1(iy),index1(Nstoc)) ! swap indices
!CALL swapre(SQ(iy),SQ(Nstoc)) !
SQ(iy)=SQ(Nstoc); SQ(Nstoc)=0.d0 ! swap values
Nstoc=Nstoc-1
ENDIF
iy=iy+1
- END DO
+ END DO
NsXtmj(ix)=Nstoc ! saving index to last stoch. var. after conditioning
! Calculating Covariances for non-deterministic variables
DO row=ix+1,Nstoc
@@ -4098,8 +4098,8 @@
R(c1,r1)=R(r1,c1)-R(r1,m1)*R(m1,c1) !/R(m1,m1)
R(r1,c1)=R(c1,r1)
ENDDO
- ENDDO
- ! similarly for deterministic values
+ ENDDO
+ ! similarly for deterministic values
DO row=Nstoc+1,Nsold
r1=index1(row)
SQ(row)=0.d0 !MAX(SQ(row),0.d0)
@@ -4113,32 +4113,32 @@
ix=ix+1
ENDDO
NsXtmj(Nstoc+1:Njj+Ntscis)=Nstoc
- RETURN
+ RETURN
END SUBROUTINE CONDSORT3
SUBROUTINE swapRe(m,n)
IMPLICIT NONE
DOUBLE PRECISION, INTENT(inout) :: m,n
- DOUBLE PRECISION :: tmp
+ DOUBLE PRECISION :: tmp
tmp=m
m=n
n=tmp
END SUBROUTINE swapRe
-
+
SUBROUTINE swapint(m,n)
IMPLICIT NONE
INTEGER, INTENT(inout) :: m,n
- INTEGER :: tmp
+ INTEGER :: tmp
tmp=m
m=n
n=tmp
END SUBROUTINE swapint
-
+
SUBROUTINE getdiag(diag,matrix)
IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(: ), INTENT(out) :: diag
DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: matrix
- DOUBLE PRECISION, DIMENSION(: ), ALLOCATABLE :: vector
+ DOUBLE PRECISION, DIMENSION(: ), ALLOCATABLE :: vector
ALLOCATE(vector(SIZE(matrix)))
vector=PACK(matrix,.TRUE.)
@@ -4146,7 +4146,7 @@
DEALLOCATE(vector)
END SUBROUTINE getdiag
- END MODULE RIND71MOD
+ END MODULE RIND71MOD
diff --git a/pywafo/src/wafo/source/rind2007/rind_interface.f b/wafo/source/rind2007/rind_interface.f
similarity index 91%
rename from pywafo/src/wafo/source/rind2007/rind_interface.f
rename to wafo/source/rind2007/rind_interface.f
index a8960c9..6723520 100644
--- a/pywafo/src/wafo/source/rind2007/rind_interface.f
+++ b/wafo/source/rind2007/rind_interface.f
@@ -1,7 +1,7 @@
! This is a interface-file for Python
! This file contains a interface to RIND a subroutine
! for computing multivariate normal expectations.
-! The file is self contained and should compile without errors on (Fortran90)
+! The file is self contained and should compile without errors on (Fortran90)
! standard Fortran compilers.
!
! The interface was written by
@@ -12,40 +12,40 @@
! Norway
! Email: Per.Brodtkorb@ffi.no
!
-!
+!
! RIND Computes multivariate normal expectations
!
-! E[Jacobian*Indicator|Condition ]*f_{Xc}(xc(:,ix))
+! E[Jacobian*Indicator|Condition ]*f_{Xc}(xc(:,ix))
! where
! "Indicator" = I{ H_lo(i) < X(i) < H_up(i), i=1:N_t+N_d }
-! "Jacobian" = J(X(Nt+1),...,X(Nt+Nd+Nc)), special case is
+! "Jacobian" = J(X(Nt+1),...,X(Nt+Nd+Nc)), special case is
! "Jacobian" = |X(Nt+1)*...*X(Nt+Nd)|=|Xd(1)*Xd(2)..Xd(Nd)|
! "condition" = Xc=xc(:,ix), ix=1,...,Nx.
-! X = [Xt; Xd; Xc], a stochastic vector of Multivariate Gaussian
+! X = [Xt; Xd; Xc], a stochastic vector of Multivariate Gaussian
! variables where Xt,Xd and Xc have the length Nt, Nd and Nc,
-! respectively. (Recommended limitations Nx,Nt<=100, Nd<=6 and Nc<=10)
-!
+! respectively. (Recommended limitations Nx,Nt<=100, Nd<=6 and Nc<=10)
+!
! CALL: [value,error,terror,inform]=rind(S,m,indI,Blo,Bup,INFIN,xc,
! Nt,SCIS,XcScale,ABSEPS,RELEPS,COVEPS,MAXPTS,MINPTS,seed,NIT,xCutOff,Nc1c2);
!
!
! VALUE = estimated value for the expectation as explained above size 1 x Nx
-! ERROR = estimated sampling error, with 99% confidence level. size 1 x Nx
+! ERROR = estimated sampling error, with 99% confidence level. size 1 x Nx
! TERROR = estimated truncation error
! INFORM = INTEGER, termination status parameter: (not implemented yet)
! if INFORM = 0, normal completion with ERROR < EPS;
-! if INFORM = 1, completion with ERROR > EPS and MAXPTS
-! function vaules used; increase MAXPTS to
+! if INFORM = 1, completion with ERROR > EPS and MAXPTS
+! function vaules used; increase MAXPTS to
! decrease ERROR;
! if INFORM = 2, N > 100 or N < 1.
-!
+!
! S = Covariance matrix of X=[Xt;Xd;Xc] size Ntdc x Ntdc (Ntdc=Nt+Nd+Nc)
! m = the expectation of X=[Xt;Xd;Xc] size N x 1
-! indI = vector of indices to the different barriers in the
-! indicator function, length NI, where NI = Nb+1
+! indI = vector of indices to the different barriers in the
+! indicator function, length NI, where NI = Nb+1
! (NB! restriction indI(1)=0, indI(NI)=Nt+Nd )
-! B_lo,B_up = Lower and upper barriers used to compute the integration
-! limits, Hlo and Hup, respectively. size Mb x Nb
+! B_lo,B_up = Lower and upper barriers used to compute the integration
+! limits, Hlo and Hup, respectively. size Mb x Nb
! INFIN = INTEGER, array of integration limits flags: size 1 x Nb (in)
! if INFIN(I) < 0, Ith limits are (-infinity, infinity);
! if INFIN(I) = 0, Ith limits are (-infinity, Hup(I)];
@@ -54,7 +54,7 @@
! xc = values to condition on size Nc x Nx
! Nt = size of Xt
! SCIS = Integer defining integration method
-! 1 Integrate all by SADAPT for Ndim<9 and by KRBVRC otherwise
+! 1 Integrate all by SADAPT for Ndim<9 and by KRBVRC otherwise
! 2 Integrate all by SADAPT by Genz (1992) (Fast)
! 3 Integrate all by KRBVRC by Genz (1993) (Fast)
! 4 Integrate all by KROBOV by Genz (1992) (Fast)
@@ -64,23 +64,23 @@
! ABSEPS = REAL absolute error tolerance.
! RELEPS = REAL relative error tolerance.
! COVEPS = REAL error in cholesky factorization
-! MAXPTS = INTEGER, maximum number of function values allowed. This
-! parameter can be used to limit the time. A sensible
+! MAXPTS = INTEGER, maximum number of function values allowed. This
+! parameter can be used to limit the time. A sensible
! strategy is to start with MAXPTS = 1000*N, and then
! increase MAXPTS if ERROR is too large.
! MINPTS = INTEGER, minimum number of function values allowed
! SEED = INTEGER, seed to the random generator used in the integrations
! NIT = INTEGER, maximum number of Xt variables to integrate
-! xCutOff = REAL upper/lower truncation limit of the marginal normal CDF
-! Nc1c2 = INTEGER number of times to use the regression equation to restrict
-! integration area. Nc1c2 = 1,2 is recommended.
+! xCutOff = REAL upper/lower truncation limit of the marginal normal CDF
+! Nc1c2 = INTEGER number of times to use the regression equation to restrict
+! integration area. Nc1c2 = 1,2 is recommended.
+!
!
-!
! If Mb=0,
-! IF INFIN(j)~=0, Hlo(i)=Blo(1,j)+Blo(2:Mb,j).'*xc(1:Mb-1,ix),
-! IF INFIN(j)~=1, Hup(i)=Bup(1,j)+Bup(2:Mb,j).'*xc(1:Mb-1,ix),
+! IF INFIN(j)~=0, Hlo(i)=Blo(1,j)+Blo(2:Mb,j).'*xc(1:Mb-1,ix),
+! IF INFIN(j)~=1, Hup(i)=Bup(1,j)+Bup(2:Mb,j).'*xc(1:Mb-1,ix),
!
! where i=indI(j-1)+1:indI(j), j=2:NI, ix=1:Nx
!
@@ -105,118 +105,118 @@
!set LIB=%DFDir%\LIB;%VCDir%\LIB
!
! then you are ready to compile this file at the matlab prompt using the following command:
-!
-! mex -O -output mexrind2007 intmodule.f jacobmod.f rind2007.f mexrind2007.f
-!
-
-
- subroutine set_constants(method,xcscale,abseps,releps,coveps,
- & maxpts,minpts,nit,xcutoff,Nc1c2, NINT1, xsplit)
- use rindmod, only : setconstants
- use rind71mod, only : setdata
- double precision :: xcscale,abseps,releps,coveps,xcutoff,xsplit
- integer method, maxpts, minpts, nit, Nc1c2, NINT1
-Cf2py double precision, optional :: xcscale = 0.0e0
-Cf2py double precision, optional :: abseps = 0.01e0
-Cf2py double precision, optional :: releps = 0.01e0
-Cf2py double precision, optional :: coveps = 1.0e-10
-Cf2py double precision, optional :: xcutoff = 5.0e0
-Cf2py double precision, optional :: xsplit = 5.0e0
-
-Cf2py integer, optional :: method = 3
-Cf2py integer, optional :: minpts = 0
-Cf2py integer, optional :: maxpts = 40000
-Cf2py integer, optional :: nit = 1000
-Cf2py integer, optional :: Nc1c2 = 2
-Cf2py integer, optional :: nint1 = 2
-
-! Method>0
- call setconstants(method,xcscale,abseps,releps,coveps,
- & maxpts,minpts,nit,xcutoff,Nc1c2)
-! method==0
- call SETDATA(method,xcscale,abseps,releps,coveps,
- & nit, xCutOff,NINT1,xsplit)
- return
- end subroutine set_constants
- SUBROUTINE show_constants()
- use rindmod
- print *, 'method=', mMethod
- print *, 'xcscale=', mXcScale
- print *, 'abseps=', mAbsEps
- print *, 'releps=', mRelEps
- print *, 'coveps=', mCovEps
- print *, 'maxpts=', mMaxPts
- print *, 'minpts=', mMinPts
- print *, 'nit=', mNit
- print *, 'xcutOff=', mXcutOff
- print *, 'Nc1c2=', mNc1c2
- end subroutine show_constants
+!
+! mex -O -output mexrind2007 intmodule.f jacobmod.f rind2007.f mexrind2007.f
+!
+
- SUBROUTINE rind(VALS,ERR,TERR,Big,Ex,Xc,Nt,INDI,Blo,Bup,
+ subroutine set_constants(method,xcscale,abseps,releps,coveps,
+ & maxpts,minpts,nit,xcutoff,Nc1c2, NINT1, xsplit)
+ use rindmod, only : setconstants
+ use rind71mod, only : setdata
+ double precision :: xcscale,abseps,releps,coveps,xcutoff,xsplit
+ integer method, maxpts, minpts, nit, Nc1c2, NINT1
+Cf2py double precision, optional :: xcscale = 0.0e0
+Cf2py double precision, optional :: abseps = 0.01e0
+Cf2py double precision, optional :: releps = 0.01e0
+Cf2py double precision, optional :: coveps = 1.0e-10
+Cf2py double precision, optional :: xcutoff = 5.0e0
+Cf2py double precision, optional :: xsplit = 5.0e0
+
+Cf2py integer, optional :: method = 3
+Cf2py integer, optional :: minpts = 0
+Cf2py integer, optional :: maxpts = 40000
+Cf2py integer, optional :: nit = 1000
+Cf2py integer, optional :: Nc1c2 = 2
+Cf2py integer, optional :: nint1 = 2
+
+! Method>0
+ call setconstants(method,xcscale,abseps,releps,coveps,
+ & maxpts,minpts,nit,xcutoff,Nc1c2)
+! method==0
+ call SETDATA(method,xcscale,abseps,releps,coveps,
+ & nit, xCutOff,NINT1,xsplit)
+ return
+ end subroutine set_constants
+ SUBROUTINE show_constants()
+ use rindmod
+ print *, 'method=', mMethod
+ print *, 'xcscale=', mXcScale
+ print *, 'abseps=', mAbsEps
+ print *, 'releps=', mRelEps
+ print *, 'coveps=', mCovEps
+ print *, 'maxpts=', mMaxPts
+ print *, 'minpts=', mMinPts
+ print *, 'nit=', mNit
+ print *, 'xcutOff=', mXcutOff
+ print *, 'Nc1c2=', mNc1c2
+ end subroutine show_constants
+
+ SUBROUTINE rind(VALS,ERR,TERR,Big,Ex,Xc,Nt,INDI,Blo,Bup,
& INFIN,seed1,Ntdc,Nc,Nx,Ni,Mb,Nb,Nx1)
- USE rindmod
+ USE rindmod
USE rind71mod, only : rind71
IMPLICIT NONE
INTEGER :: Ntd,Nj,K,I
- INTEGER :: seed1
+ INTEGER :: seed1
integer :: Nx,Nx1,Nt, Nc,Ntdc,Ni,Nb,Mb
- DOUBLE PRECISION, dimension(Ntdc,Ntdc) :: BIG
- DOUBLE PRECISION, dimension(Ntdc) :: Ex
- DOUBLE PRECISION, dimension(Nc,Nx1) :: Xc
+ DOUBLE PRECISION, dimension(Ntdc,Ntdc) :: BIG
+ DOUBLE PRECISION, dimension(Ntdc) :: Ex
+ DOUBLE PRECISION, dimension(Nc,Nx1) :: Xc
DOUBLE PRECISION, dimension(Mb,Nb) :: Blo,Bup
DOUBLE PRECISION, dimension(Nx) :: VALS, ERR,TERR
- INTEGER, dimension(Ni) :: IndI
+ INTEGER, dimension(Ni) :: IndI
INTEGER, DIMENSION(Nb) :: INFIN
INTEGER, ALLOCATABLE :: seed(:)
- INTEGER :: seed_size
-Cf2py integer, intent(hide), depend(Ex) :: Ntdc = len(Ex)
-Cf2py integer, intent(hide), depend(Xc) :: Nc = shape(Xc,0)
-Cf2py integer, intent(hide), depend(Xc) :: Nx1 = shape(Xc,1)
-Cf2py integer, intent(hide), depend(Xc) :: Nx = max(shape(Xc,1),1)
-Cf2py integer, intent(hide), depend(Blo) :: Mb = shape(Blo,0), Nb = shape(Blo,1),
-Cf2py integer, intent(hide), depend(Indi) :: Ni = len(Indi)
-Cf2py depend(Ntdc) Big
-Cf2py depend(Nb) INFIN
-Cf2py depend(Mb,Nb) Bup
-Cf2py double precision, intent(out), depend(Nx) :: VALS
-Cf2py double precision, intent(out), depend(Nx) :: ERR
-Cf2py double precision, intent(out), depend(Nx) :: TERR
-
-C print *, 'Ntdc=', Ntdc,' Nt=',Nt,' Nc=',Nc
-C print *, 'Nx=', Nx, 'Mb=', Mb, ' Nb=', Nb, ' Ni=',Ni
-C Ni = Nb+1
-C Nx = max(Nx1,1)
- if (Ni.EQ.Nb+1) then
- else
- print *, '(ni==nb+1) failed: rind:ni=', Ni, ', nb=',Nb
- return
- endif
-
+ INTEGER :: seed_size
+Cf2py integer, intent(hide), depend(Ex) :: Ntdc = len(Ex)
+Cf2py integer, intent(hide), depend(Xc) :: Nc = shape(Xc,0)
+Cf2py integer, intent(hide), depend(Xc) :: Nx1 = shape(Xc,1)
+Cf2py integer, intent(hide), depend(Xc) :: Nx = max(shape(Xc,1),1)
+Cf2py integer, intent(hide), depend(Blo) :: Mb = shape(Blo,0), Nb = shape(Blo,1),
+Cf2py integer, intent(hide), depend(Indi) :: Ni = len(Indi)
+Cf2py depend(Ntdc) Big
+Cf2py depend(Nb) INFIN
+Cf2py depend(Mb,Nb) Bup
+Cf2py double precision, intent(out), depend(Nx) :: VALS
+Cf2py double precision, intent(out), depend(Nx) :: ERR
+Cf2py double precision, intent(out), depend(Nx) :: TERR
+
+C print *, 'Ntdc=', Ntdc,' Nt=',Nt,' Nc=',Nc
+C print *, 'Nx=', Nx, 'Mb=', Mb, ' Nb=', Nb, ' Ni=',Ni
+C Ni = Nb+1
+C Nx = max(Nx1,1)
+ if (Ni.EQ.Nb+1) then
+ else
+ print *, '(ni==nb+1) failed: rind:ni=', Ni, ', nb=',Nb
+ return
+ endif
+
Ntd = Ntdc - Nc;
! Nd = Ntd - Nt
-
+
IF (Ntd.EQ.INDI(Ni)) THEN
-! Call the computational subroutine.
- IF (mMethod.gt.0) THEN
- CALL random_seed(SIZE=seed_size)
- ALLOCATE(seed(seed_size))
- !print *,'rindinterface seed', seed1
- CALL random_seed(GET=seed(1:seed_size)) ! get current state
- seed(1:seed_size)=seed1 ! change seed
- CALL random_seed(PUT=seed(1:seed_size))
- CALL random_seed(GET=seed(1:seed_size)) ! get current state
- !print *,'rindinterface seed', seed
- DEALLOCATE(seed)
- CALL RINDD(VALS,ERR,TERR,Big,Ex,Xc,Nt,INDI,Blo,Bup,INFIN)
- ELSE
- CALL RIND71(VALS,Big,Ex,Xc,Nt,INDI,Blo,Bup)
- ERR(:) = -1
- TERR(:) = -1
+! Call the computational subroutine.
+ IF (mMethod.gt.0) THEN
+ CALL random_seed(SIZE=seed_size)
+ ALLOCATE(seed(seed_size))
+ !print *,'rindinterface seed', seed1
+ CALL random_seed(GET=seed(1:seed_size)) ! get current state
+ seed(1:seed_size)=seed1 ! change seed
+ CALL random_seed(PUT=seed(1:seed_size))
+ CALL random_seed(GET=seed(1:seed_size)) ! get current state
+ !print *,'rindinterface seed', seed
+ DEALLOCATE(seed)
+ CALL RINDD(VALS,ERR,TERR,Big,Ex,Xc,Nt,INDI,Blo,Bup,INFIN)
+ ELSE
+ CALL RIND71(VALS,Big,Ex,Xc,Nt,INDI,Blo,Bup)
+ ERR(:) = -1
+ TERR(:) = -1
ENDIF
- ELSE
+ ELSE
print *,'INDI(Ni) must equal Nt+Nd!'
ENDIF
-
+
RETURN
END SUBROUTINE rind
diff --git a/pywafo/src/wafo/source/rind2007/rindmod.f b/wafo/source/rind2007/rindmod.f
similarity index 86%
rename from pywafo/src/wafo/source/rind2007/rindmod.f
rename to wafo/source/rind2007/rindmod.f
index ded7d1d..73c5bf9 100644
--- a/pywafo/src/wafo/source/rind2007/rindmod.f
+++ b/wafo/source/rind2007/rindmod.f
@@ -1,98 +1,98 @@
-! Programs available in module RINDMOD :
+! Programs available in module RINDMOD :
!
! 1) setConstants
-! 2) RINDD
-!
-! SETCONSTANTS set member variables controlling the performance of RINDD
-!
-! CALL setConstants(method,xcscale,abseps,releps,coveps,maxpts,minpts,nit,xcutoff,Nc1c2)
-!
-! METHOD = INTEGER defining the SCIS integration method
-! 1 Integrate by SADAPT for Ndim<9 and by KRBVRC otherwise
-! 2 Integrate by SADAPT for Ndim<20 and by KRBVRC otherwise
-! 3 Integrate by KRBVRC by Genz (1993) (Fast Ndim<101) (default)
-! 4 Integrate by KROBOV by Genz (1992) (Fast Ndim<101)
-! 5 Integrate by RCRUDE by Genz (1992) (Slow Ndim<1001)
-! 6 Integrate by SOBNIED (Fast Ndim<1041)
-! 7 Integrate by DKBVRC by Genz (2003) (Fast Ndim<1001)
-!
-! XCSCALE = REAL to scale the conditinal probability density, i.e.,
-! f_{Xc} = exp(-0.5*Xc*inv(Sxc)*Xc + XcScale) (default XcScale =0)
-! ABSEPS = REAL absolute error tolerance. (default 0)
-! RELEPS = REAL relative error tolerance. (default 1e-3)
-! COVEPS = REAL error tolerance in Cholesky factorization (default 1e-13)
-! MAXPTS = INTEGER, maximum number of function values allowed. This
-! parameter can be used to limit the time. A sensible
-! strategy is to start with MAXPTS = 1000*N, and then
-! increase MAXPTS if ERROR is too large.
-! (Only for METHOD~=0) (default 40000)
-! MINPTS = INTEGER, minimum number of function values allowed.
-! (Only for METHOD~=0) (default 0)
-! NIT = INTEGER, maximum number of Xt variables to integrate
-! This parameter can be used to limit the time.
-! If NIT is less than the rank of the covariance matrix,
-! the returned result is a upper bound for the true value
-! of the integral. (default 1000)
-! XCUTOFF = REAL cut off value where the marginal normal
-! distribution is truncated. (Depends on requested
-! accuracy. A value between 4 and 5 is reasonable.)
-! NC1C2 = number of times to use the regression equation to restrict
-! integration area. Nc1c2 = 1,2 is recommended. (default 2)
-!
-!
-!RIND computes E[Jacobian*Indicator|Condition]*f_{Xc}(xc(:,ix))
+! 2) RINDD
+!
+! SETCONSTANTS set member variables controlling the performance of RINDD
+!
+! CALL setConstants(method,xcscale,abseps,releps,coveps,maxpts,minpts,nit,xcutoff,Nc1c2)
+!
+! METHOD = INTEGER defining the SCIS integration method
+! 1 Integrate by SADAPT for Ndim<9 and by KRBVRC otherwise
+! 2 Integrate by SADAPT for Ndim<20 and by KRBVRC otherwise
+! 3 Integrate by KRBVRC by Genz (1993) (Fast Ndim<101) (default)
+! 4 Integrate by KROBOV by Genz (1992) (Fast Ndim<101)
+! 5 Integrate by RCRUDE by Genz (1992) (Slow Ndim<1001)
+! 6 Integrate by SOBNIED (Fast Ndim<1041)
+! 7 Integrate by DKBVRC by Genz (2003) (Fast Ndim<1001)
+!
+! XCSCALE = REAL to scale the conditinal probability density, i.e.,
+! f_{Xc} = exp(-0.5*Xc*inv(Sxc)*Xc + XcScale) (default XcScale =0)
+! ABSEPS = REAL absolute error tolerance. (default 0)
+! RELEPS = REAL relative error tolerance. (default 1e-3)
+! COVEPS = REAL error tolerance in Cholesky factorization (default 1e-13)
+! MAXPTS = INTEGER, maximum number of function values allowed. This
+! parameter can be used to limit the time. A sensible
+! strategy is to start with MAXPTS = 1000*N, and then
+! increase MAXPTS if ERROR is too large.
+! (Only for METHOD~=0) (default 40000)
+! MINPTS = INTEGER, minimum number of function values allowed.
+! (Only for METHOD~=0) (default 0)
+! NIT = INTEGER, maximum number of Xt variables to integrate
+! This parameter can be used to limit the time.
+! If NIT is less than the rank of the covariance matrix,
+! the returned result is a upper bound for the true value
+! of the integral. (default 1000)
+! XCUTOFF = REAL cut off value where the marginal normal
+! distribution is truncated. (Depends on requested
+! accuracy. A value between 4 and 5 is reasonable.)
+! NC1C2 = number of times to use the regression equation to restrict
+! integration area. Nc1c2 = 1,2 is recommended. (default 2)
+!
+!
+!RIND computes E[Jacobian*Indicator|Condition]*f_{Xc}(xc(:,ix))
!
! where
! "Indicator" = I{ H_lo(i) < X(i) < H_up(i), i=1:Nt+Nd }
-! "Jacobian" = J(X(Nt+1),...,X(Nt+Nd+Nc)), special case is
+! "Jacobian" = J(X(Nt+1),...,X(Nt+Nd+Nc)), special case is
! "Jacobian" = |X(Nt+1)*...*X(Nt+Nd)|=|Xd(1)*Xd(2)..Xd(Nd)|
! "condition" = Xc=xc(:,ix), ix=1,...,Nx.
-! X = [Xt; Xd ;Xc], a stochastic vector of Multivariate Gaussian
+! X = [Xt; Xd ;Xc], a stochastic vector of Multivariate Gaussian
! variables where Xt,Xd and Xc have the length Nt, Nd and Nc,
-! respectively.
-! (Recommended limitations Nx, Nt<101, Nd<7 and NIT,Nc<11)
-! (RIND = Random Integration N Dimensions)
+! respectively.
+! (Recommended limitations Nx, Nt<101, Nd<7 and NIT,Nc<11)
+! (RIND = Random Integration N Dimensions)
!
!CALL RINDD(E,err,terr,S,m,xc,Nt,indI,Blo,Bup,INFIN);
!
! E = expectation/density as explained above size 1 x Nx (out)
-! ERR = estimated sampling error size 1 x Nx (out)
+! ERR = estimated sampling error size 1 x Nx (out)
! TERR = estimated truncation error size 1 x Nx (out)
! S = Covariance matrix of X=[Xt;Xd;Xc] size N x N (N=Nt+Nd+Nc) (in)
! m = the expectation of X=[Xt;Xd;Xc] size N x 1 (in)
! xc = values to condition on size Nc x Nx (in)
-! indI = vector of indices to the different barriers in the (in)
-! indicator function, length NI, where NI = Nb+1
+! indI = vector of indices to the different barriers in the (in)
+! indicator function, length NI, where NI = Nb+1
! (NB! restriction indI(1)=0, indI(NI)=Nt+Nd )
! Blo,Bup = Lower and upper barrier coefficients used to compute the (in)
-! integration limits A and B, respectively.
+! integration limits A and B, respectively.
! size Mb x Nb. If Mb=0,
-! IF INFIN(j)~=0, A(i)=Blo(1,j)+Blo(2:Mb,j).'*xc(1:Mb-1,ix),
-! IF INFIN(j)~=1, B(i)=Bup(1,j)+Bup(2:Mb,j).'*xc(1:Mb-1,ix),
+! IF INFIN(j)~=0, A(i)=Blo(1,j)+Blo(2:Mb,j).'*xc(1:Mb-1,ix),
+! IF INFIN(j)~=1, B(i)=Bup(1,j)+Bup(2:Mb,j).'*xc(1:Mb-1,ix),
!
! where i=indI(j-1)+1:indI(j), j=1:NI-1, ix=1:Nx
! Thus the integration limits may change with the conditional
! variables.
-!Example:
-! The indices, indI=[0 3 5 6], and coefficients Blo=[0 0 -1],
-! Bup=[0 0 5], INFIN=[0 1 2]
-! means that A = [-inf -inf -inf 0 0 -1] B = [0 0 0 inf inf 5]
+!Example:
+! The indices, indI=[0 3 5 6], and coefficients Blo=[0 0 -1],
+! Bup=[0 0 5], INFIN=[0 1 2]
+! means that A = [-inf -inf -inf 0 0 -1] B = [0 0 0 inf inf 5]
!
!
! (Recommended limitations Nx,Nt<101, Nd<7 and Nc<11)
! Also note that the size information have to be transferred to RINDD
-! through the input arguments E,S,m,Nt,IndI,Blo,Bup and INFIN
+! through the input arguments E,S,m,Nt,IndI,Blo,Bup and INFIN
!
-! For further description see the modules
+! For further description see the modules
!
! References
! Podgorski et al. (2000)
@@ -101,9 +101,9 @@
!
! R. Ambartzumian, A. Der Kiureghian, V. Ohanian and H.
! Sukiasian (1998)
-! "Multinormal probabilities by sequential conditioned
+! "Multinormal probabilities by sequential conditioned
! importance sampling: theory and application" (MVNFUN)
-! Probabilistic Engineering Mechanics, Vol. 13, No 4. pp 299-308
+! Probabilistic Engineering Mechanics, Vol. 13, No 4. pp 299-308
!
! Alan Genz (1992)
! 'Numerical Computation of Multivariate Normal Probabilites' (MVNFUN)
@@ -117,25 +117,25 @@
! P. A. Brodtkorb (2004), (RINDD, MVNFUN, COVSRT)
! Numerical evaluation of multinormal expectations
! In Lund university report series
-! and in the Dr.Ing thesis:
+! and in the Dr.Ing thesis:
! The probability of Occurrence of dangerous Wave Situations at Sea.
! Dr.Ing thesis, Norwegian University of Science and Technolgy, NTNU,
! Trondheim, Norway.
! Tested on: DIGITAL UNIX Fortran90 compiler
! PC pentium II with Lahey Fortran90 compiler
-! Solaris with SunSoft F90 compiler Version 1.0.1.0 (21229283)
-! History:
-! Revised pab aug. 2009
-! -renamed from rind2007 to rindmod
-! Revised pab July 2007
-! - separated the absolute error into ERR and TERR.
+! Solaris with SunSoft F90 compiler Version 1.0.1.0 (21229283)
+! History:
+! Revised pab aug. 2009
+! -renamed from rind2007 to rindmod
+! Revised pab July 2007
+! - separated the absolute error into ERR and TERR.
! - renamed from alanpab24 -> rind2007
! revised pab 23may2004
! RIND module totally rewritten according to the last reference.
- MODULE GLOBALCONST ! global constants
+ MODULE GLOBALCONST ! global constants
IMPLICIT NONE
DOUBLE PRECISION, PARAMETER :: gSQTWPI1= 0.39894228040143D0 !=1/sqrt(2*pi)
DOUBLE PRECISION, PARAMETER :: gSQPI1 = 0.56418958354776D0 !=1/sqrt(pi)
@@ -161,34 +161,34 @@
! USE PRINTMOD ! used for debugging only
IMPLICIT NONE
PRIVATE
- PUBLIC :: RINDD, SetConstants
- PUBLIC :: mCovEps, mAbsEps,mRelEps, mXcutOff, mXcScale
+ PUBLIC :: RINDD, SetConstants
+ PUBLIC :: mCovEps, mAbsEps,mRelEps, mXcutOff, mXcScale
PUBLIC :: mNc1c2, mNIT, mMaxPts,mMinPts, mMethod, mSmall
private :: preInit
private :: initIntegrand
private :: initfun,mvnfun,cvsrtxc,covsrt1,covsrt,rcscale,rcswap
- private :: cleanUp
-
- INTERFACE RINDD
- MODULE PROCEDURE RINDD
+ private :: cleanUp
+
+ INTERFACE RINDD
+ MODULE PROCEDURE RINDD
END INTERFACE
-
- INTERFACE SetConstants
- MODULE PROCEDURE SetConstants
- END INTERFACE
-
+
+ INTERFACE SetConstants
+ MODULE PROCEDURE SetConstants
+ END INTERFACE
+
! mInfinity = what is considered as infinite value in FI
-! mFxcEpss = if fxc is less, do not compute E(...|Xc)
+! mFxcEpss = if fxc is less, do not compute E(...|Xc)
! mXcEps2 = if any Var(Xc(j)|Xc(1),...,Xc(j-1)) <= XCEPS2 then return NAN
double precision, parameter :: mInfinity = 8.25d0 ! 37.0d0
- double precision, parameter :: mFxcEpss = 1.0D-20
+ double precision, parameter :: mFxcEpss = 1.0D-20
double precision, save :: mXcEps2 = 2.3d-16
! Constants defining accuracy of integration:
! mCovEps = termination criteria for Cholesky decomposition
! mAbsEps = requested absolute tolerance
! mRelEps = requested relative tolerance
! mXcutOff = truncation value to c1c2
-! mXcScale = scale factor in the exponential (in order to avoid overflow)
+! mXcScale = scale factor in the exponential (in order to avoid overflow)
! mNc1c2 = number of times to use function c1c2, i.e.,regression
! equation to restrict integration area.
! mNIT = maximum number of Xt variables to integrate
@@ -198,7 +198,7 @@
! 3 Integrate all by KRBVRC by Genz (1998) (Fast and reliable)
! 4 Integrate all by KROBOV by Genz (1992) (Fast and reliable)
! 5 Integrate all by RCRUDE by Genz (1992) (Reliable)
-! 6 Integrate all by SOBNIED by Hong and Hickernell
+! 6 Integrate all by SOBNIED by Hong and Hickernell
! 7 Integrate all by DKBVRC by Genz (2003) (Fast Ndim<1001)
double precision, save :: mCovEps = 1.0d-10
double precision, save :: mAbsEps = 0.01d0
@@ -210,22 +210,22 @@
integer, save :: mMaxPts = 40000
integer, save :: mMinPts = 0
integer, save :: mMethod = 3
-
-
+
+
! Integrand variables:
-! mBIG = Cholesky Factor/Covariance matrix:
+! mBIG = Cholesky Factor/Covariance matrix:
! Upper triangular part is the cholesky factor
-! Lower triangular part contains the conditional
-! standarddeviations
+! Lower triangular part contains the conditional
+! standarddeviations
! (mBIG2 is only used if mNx>1)
! mCDI = Cholesky DIagonal elements
! mA,mB = Integration limits
! mINFI = integrationi limit flags
! mCm = conditional mean
-! mINFIXt,
+! mINFIXt,
! mINFIXd = # redundant variables of Xt and Xd,
-! respectively
-! mIndex1,
+! respectively
+! mIndex1,
! mIndex2 = indices to the variables original place. Size Ntdc
! xedni = indices to the variables new place. Size Ntdc
! mNt = # Xt variables
@@ -234,22 +234,22 @@
! mNtd = mNt + mNd
! mNtdc = mNt + mNd + mNc
! mNx = # different integration limits
-
+
double precision,allocatable, dimension(:,:) :: mBIG,mBIG2
- double precision,allocatable, dimension(:) :: mA,mB,mCDI,mCm
+ double precision,allocatable, dimension(:) :: mA,mB,mCDI,mCm
INTEGER, DIMENSION(:),ALLOCATABLE :: mInfi,mIndex1,mIndex2,mXedni
INTEGER,SAVE :: mNt,mNd,mNc,mNtdc, mNtd, mNx ! Size information
- INTEGER,SAVE :: mInfiXt,mInfiXd
+ INTEGER,SAVE :: mInfiXt,mInfiXd
logical,save :: mInitIntegrandCalled = .FALSE.
DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: mCDIXd, mCmXd
DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: mXd, mXc, mY
double precision, save :: mSmall = 2.3d-16
-
+
! variables set in initfun and used in mvnfun:
INTEGER, PRIVATE :: mI0,mNdleftN0
DOUBLE PRECISION, PRIVATE :: mE1,mD1, mVAL0
-
+
contains
subroutine setConstants(method,xcscale,abseps,releps,coveps,
& maxpts,minpts,nit,xcutoff,Nc1c2)
@@ -267,16 +267,16 @@
if (present(minpts)) mMinPts = minpts
if (present(nit)) mNit = nit
if (present(xcutOff)) mXcutOff = xCutOff
- if (present(Nc1c2)) mNc1c2 = max(Nc1c2,1)
-! print *, 'method=', mMethod
-! print *, 'xcscale=', mXcScale
-! print *, 'abseps=', mAbsEps
-! print *, 'releps=', mRelEps
-! print *, 'coveps=', mCovEps
-! print *, 'maxpts=', mMaxPts
-! print *, 'minpts=', mMinPts
-! print *, 'nit=', mNit
-! print *, 'xcutOff=', mXcutOff
+ if (present(Nc1c2)) mNc1c2 = max(Nc1c2,1)
+! print *, 'method=', mMethod
+! print *, 'xcscale=', mXcScale
+! print *, 'abseps=', mAbsEps
+! print *, 'releps=', mRelEps
+! print *, 'coveps=', mCovEps
+! print *, 'maxpts=', mMaxPts
+! print *, 'minpts=', mMinPts
+! print *, 'nit=', mNit
+! print *, 'xcutOff=', mXcutOff
! print *, 'Nc1c2=', mNc1c2
end subroutine setConstants
@@ -296,7 +296,7 @@
mNx = MAX( SIZE( Xc, dim = 2), 1 )
mNtdc = SIZE( BIG, dim = 1 )
! make sure it does not exceed Ntdc-Nc
- IF (mNt+mNc.GT.mNtdc) mNt = mNtdc - mNc
+ IF (mNt+mNc.GT.mNtdc) mNt = mNtdc - mNc
mNd = mNtdc-mNt-mNc
mNtd = mNt+mNd
IF (mNd < 0) THEN
@@ -305,9 +305,9 @@
inform = 3
return
ENDIF
-
+
! PRINT *,'Nt Nd Nc Ntd Ntdc,',Nt, Nd, Nc, Ntd, Ntdc
-
+
! ALLOCATION
!~~~~~~~~~~~~
IF (mNd>0) THEN
@@ -317,30 +317,30 @@
mxd(:) = gZERO
END IF
ALLOCATE(mBIG(mNtdc,mNtdc),mCm(mNtdc),mY(mNtd))
- ALLOCATE(mIndex1(mNtdc),mA(mNtd),mB(mNtd),mINFI(mNtd),mXc(mNc))
+ ALLOCATE(mIndex1(mNtdc),mA(mNtd),mB(mNtd),mINFI(mNtd),mXc(mNc))
ALLOCATE(mCDI(mNtd),mXedni(mNtdc),mIndex2(mNtdc))
-
+
! Initialization
!~~~~~~~~~~~~~~~~~~~~~
! Copy upper triangular of input matrix, only.
do i = 1,mNtdc
- mBIG(1:i,i) = BIG(1:i,i)
+ mBIG(1:i,i) = BIG(1:i,i)
end do
-
+
mIndex2 = (/(J,J=1,mNtdc)/)
-
+
! CALL mexprintf('BIG Before CovsrtXc'//CHAR(10))
! CALL ECHO(BIG)
-! sort BIG by decreasing cond. variance for Xc
- CALL CVSRTXC(mNt,mNd,mBIG,mIndex2,INFORM)
+! sort BIG by decreasing cond. variance for Xc
+ CALL CVSRTXC(mNt,mNd,mBIG,mIndex2,INFORM)
! CALL mexprintf('BIG after CovsrtXc'//CHAR(10))
! CALL ECHO(BIG)
-
- IF (INFORM.GT.0) return ! degenerate case exit VALS=0 for all
+
+ IF (INFORM.GT.0) return ! degenerate case exit VALS=0 for all
! (should perhaps return NaN instead??)
- DO I=mNtdc,1,-1
+ DO I=mNtdc,1,-1
J = mIndex2(I) ! covariance matrix according to index2
mXedni(J) = I
END DO
@@ -366,10 +366,10 @@
integer :: I,J
inform = 0
NDIM = 0
- VALUE = gZERO
+ VALUE = gZERO
fxc = gONE
abserr = mSmall
-
+
IF (mInitIntegrandCalled) then
do i = 1,mNtdc
mBIG(1:i,i) = mBIG2(1:i,i) !Copy input matrix
@@ -377,33 +377,33 @@
else
mInitIntegrandCalled = .TRUE.
endif
-
+
! Set the original means of the variables
- mCm(:) = Ex(mIndex2(1:mNtdc)) ! Cm(1:Ntdc) =Ex (index1(1:Ntdc))
+ mCm(:) = Ex(mIndex2(1:mNtdc)) ! Cm(1:Ntdc) =Ex (index1(1:Ntdc))
IF (mNc>0) THEN
mXc(:) = Xc(:,ix)
!mXc(1:Nc) = Xc(1:Nc,ix)
QUANT = DBLE(mNc)*LOG(gSQTWPI1)
- I = mNtdc
- DO J = 1, mNc
-! Iterative conditioning on the last Nc variables
+ I = mNtdc
+ DO J = 1, mNc
+! Iterative conditioning on the last Nc variables
SQ0 = mBIG(I,I) ! SQRT(Var(X(i)|X(i+1),X(i+2),...,X(Ntdc)))
xx = (mXc(mIndex2(I) - mNtd) - mCm(I))/SQ0
!Trick to calculate
- !fxc = fxc*SQTWPI1*EXP(-0.5*(XX**2))/SQ0
- QUANT = QUANT - gHALF*xx*xx - LOG(SQ0)
- ! conditional mean (expectation)
- ! E(X(1:i-1)|X(i),X(i+1),...,X(Ntdc))
+ !fxc = fxc*SQTWPI1*EXP(-0.5*(XX**2))/SQ0
+ QUANT = QUANT - gHALF*xx*xx - LOG(SQ0)
+ ! conditional mean (expectation)
+ ! E(X(1:i-1)|X(i),X(i+1),...,X(Ntdc))
mCm(1:I-1) = mCm(1:I-1) + xx*mBIG(1:I-1,I)
I = I-1
ENDDO
- ! Calculating the
- ! fxc probability density for i=Ntdc-J+1,
+ ! Calculating the
+ ! fxc probability density for i=Ntdc-J+1,
! fXc=f(X(i)|X(i+1),X(i+2)...X(Ntdc))*
! f(X(i+1)|X(i+2)...X(Ntdc))*..*f(X(Ntdc))
- fxc = EXP(QUANT+mXcScale)
-
- ! if fxc small: don't bother
+ fxc = EXP(QUANT+mXcScale)
+
+ ! if fxc small: don't bother
! calculating it, goto end
IF (fxc < mFxcEpss) then
abserr = gONE
@@ -415,33 +415,33 @@
! NOTE: mA and mB are integration limits with mCm subtracted
CALL setIntLimits(mXc,indI,Blo,Bup,INFIN,inform)
if (inform>0) return
- mIndex1(:) = mIndex2(:)
- CALL COVSRT(.FALSE., mNt,mNd,mBIG,mCm,mA,mB,mINFI,
+ mIndex1(:) = mIndex2(:)
+ CALL COVSRT(.FALSE., mNt,mNd,mBIG,mCm,mA,mB,mINFI,
& mINDEX1,mINFIXt,mINFIXd,NDIM,mY,mCDI)
CALL INITFUN(VALUE,abserr,INFORM)
! IF INFORM>0 : degenerate case:
-! Integral can be calculated excactly, ie.
+! Integral can be calculated excactly, ie.
! mean of deterministic variables outside the barriers,
-! or NDIM = 1
+! or NDIM = 1
return
end subroutine initIntegrand
subroutine cleanUp
-! Deallocate all work arrays and vectors
- IF (ALLOCATED(mXc)) DEALLOCATE(mXc)
- IF (ALLOCATED(mXd)) DEALLOCATE(mXd)
- IF (ALLOCATED(mCm)) DEALLOCATE(mCm)
- IF (ALLOCATED(mBIG2)) DEALLOCATE(mBIG2)
- IF (ALLOCATED(mBIG)) DEALLOCATE(mBIG)
+! Deallocate all work arrays and vectors
+ IF (ALLOCATED(mXc)) DEALLOCATE(mXc)
+ IF (ALLOCATED(mXd)) DEALLOCATE(mXd)
+ IF (ALLOCATED(mCm)) DEALLOCATE(mCm)
+ IF (ALLOCATED(mBIG2)) DEALLOCATE(mBIG2)
+ IF (ALLOCATED(mBIG)) DEALLOCATE(mBIG)
IF (ALLOCATED(mIndex2)) DEALLOCATE(mIndex2)
IF (ALLOCATED(mIndex1)) DEALLOCATE(mIndex1)
IF (ALLOCATED(mXedni)) DEALLOCATE(mXedni)
IF (ALLOCATED(mA)) DEALLOCATE(mA)
- IF (ALLOCATED(mB)) DEALLOCATE(mB)
- IF (ALLOCATED(mY)) DEALLOCATE(mY)
- IF (ALLOCATED(mCDI)) DEALLOCATE(mCDI)
- IF (ALLOCATED(mCDIXd)) DEALLOCATE(mCDIXd)
- IF (ALLOCATED(mCmXd)) DEALLOCATE(mCmXd)
+ IF (ALLOCATED(mB)) DEALLOCATE(mB)
+ IF (ALLOCATED(mY)) DEALLOCATE(mY)
+ IF (ALLOCATED(mCDI)) DEALLOCATE(mCDI)
+ IF (ALLOCATED(mCDIXd)) DEALLOCATE(mCDIXd)
+ IF (ALLOCATED(mCmXd)) DEALLOCATE(mCmXd)
IF (ALLOCATED(mINFI)) DEALLOCATE(mINFI)
end subroutine cleanUp
function integrandBound(I0,N,Y,FINY) result (bound1)
@@ -460,15 +460,15 @@
FINB = 0
IK = 2
DO I = I0, N
- ! E(Y(I) | Y(1))/STD(Y(IK)|Y(1))
- TMP = mBIG(IK-1,I)*Y
+ ! E(Y(I) | Y(1))/STD(Y(IK)|Y(1))
+ TMP = mBIG(IK-1,I)*Y
IF (mINFI(I) > -1) then
! May have infinite int. Limits if Nd>0
IF ( mINFI(I) .NE. 0 ) THEN
IF ( FINA .EQ. 1 ) THEN
AI = MAX( AI, mA(I) - tmp )
ELSE
- AI = mA(I) - tmp
+ AI = mA(I) - tmp
FINA = 1
END IF
END IF
@@ -476,12 +476,12 @@
IF ( FINB .EQ. 1 ) THEN
BI = MIN( BI, mB(I) - tmp)
ELSE
- BI = mB(I) - tmp
+ BI = mB(I) - tmp
FINB = 1
END IF
END IF
endif
-
+
IF (I.EQ.N.OR.mBIG(IK+1,I+1)>gZERO) THEN
CALL MVNLMS( AI, BI,2*FINA+FINB-1, D1, E1 )
IF (D10) THEN
+
+ IF (mINFIXd>0) THEN
! Redundant variables of Xd: replace Xd with the mean
I = mNt + mNd !-INFIS
J = mNdleftN0-mINFIXd
-
+
DO WHILE (mNdleftN0>J)
isXd = (mNt < mIndex1(I))
- IF (isXd) THEN
+ IF (isXd) THEN
mXd (mNdleftN0) = mCm (I)
- mNdleftN0 = mNdleftN0-1
+ mNdleftN0 = mNdleftN0-1
END IF
I = I-1
ENDDO
ENDIF
- IF (N+1 < 1) THEN
-! Degenerate case, No relevant variables left to integrate
+ IF (N+1 < 1) THEN
+! Degenerate case, No relevant variables left to integrate
! Print *,'rind ndim1',Ndim1
- IF (mNd>0) THEN
+ IF (mNd>0) THEN
VALUE = jacob (mXd,mXc) ! jacobian of xd,xc
ELSE
VALUE = gONE
@@ -575,7 +575,7 @@
ENDIF
IF (mNIT<=100) THEN
xCut = mXcutOff
-
+
J = 1
DO I = 2, N+1
IF (mBIG(J+1,I)>gZERO) THEN
@@ -588,7 +588,7 @@
ENDIF
END DO
ELSE
- xCut = gZERO
+ xCut = gZERO
ENDIF
NdleftO = mNdleftN0
@@ -600,7 +600,7 @@
IF ( FINA .EQ. 1 ) THEN
AI = MAX( AI, mA(I) )
ELSE
- AI = mA(I)
+ AI = mA(I)
FINA = 1
END IF
END IF
@@ -608,23 +608,23 @@
IF ( FINB .EQ. 1 ) THEN
BI = MIN( BI, mB(I) )
ELSE
- BI = mB(I)
+ BI = mB(I)
FINB = 1
END IF
END IF
endif
isXd = (mINDEX1(I)>mNt)
IF (isXd) THEN ! Save the mean for Xd
- mCmXd(mNdleftN0) = mCm(I)
- mCDIXd(mNdleftN0) = mCDI(I)
+ mCmXd(mNdleftN0) = mCm(I)
+ mCDIXd(mNdleftN0) = mCDI(I)
mNdleftN0 = mNdleftN0-1
END IF
-
+
IF (I.EQ.N+1.OR.mBIG(2,I+1)>gZERO) THEN
IF (useC1C2.AND.I=E0) GOTO 200
@@ -635,8 +635,8 @@
upError = abs(E0-mE1)
loError = abs(D0-mD1)
if (upError>mSmall) then
- upError = upError*integrandBound(I+1,N+1,BI,FINB)
- endif
+ upError = upError*integrandBound(I+1,N+1,BI,FINB)
+ endif
if (loError>mSmall) then
loError = loError*integrandBound(I+1,N+1,AI,FINA)
endif
@@ -644,12 +644,12 @@
!CALL printvar(log10(loError+upError+msmall),'lo+up-err')
ELSE
CALL MVNLMS( AI, BI,2*FINA+FINB-1, mD1, mE1 )
- IF (mD1>=mE1) GOTO 200
+ IF (mD1>=mE1) GOTO 200
ENDIF
!CALL MVNLMS( AI, BI,2*FINA+FINB-1, mD1, mE1 )
!IF (mD1>=mE1) GOTO 200
IF ( NdleftO<=0) THEN
- IF (mNd>0) mVAL0 = JACOB(mXd,mXc)
+ IF (mNd>0) mVAL0 = JACOB(mXd,mXc)
SELECT CASE (I-N)
CASE (1) !IF (I.EQ.N+1) THEN
VALUE = (mE1-mD1)*mVAL0
@@ -657,7 +657,7 @@
GO TO 200
CASE (0) !ELSEIF (I.EQ.N) THEN
!D1=1/sqrt(1-rho^2)=1/STD(X(I+1)|X(1))
- mD1 = SQRT( gONE + mBIG(1,I+1)*mBIG(1,I+1) )
+ mD1 = SQRT( gONE + mBIG(1,I+1)*mBIG(1,I+1) )
mINFI(2) = mINFI(I+1)
mA(1) = AI
mB(1) = BI
@@ -666,20 +666,20 @@
IF ( mINFI(2) .NE. 1 ) mB(2) = mB(I+1)/mD1
VALUE = BVNMVN( mA, mB,mINFI,mBIG(1,I+1)/mD1 )*mVAL0
abserr = (abserr+1.0d-14)*mVAL0
- GO TO 200
+ GO TO 200
CASE ( -1 ) !ELSEIF (I.EQ.N-1) THEN
IF (.FALSE.) THEN
-! TODO :this needs further checking! (it should work though)
+! TODO :this needs further checking! (it should work though)
!1/D1= sqrt(1-r12^2) = STD(X(I+1)|X(1))
!1/E1= STD(X(I+2)|X(1)X(I+1))
!D1 = BIG(I+1,1)
!E1 = BIG(I+2,2)
-
+
mD1 = gONE/SQRT( gONE + mBIG(1,I+1)*mBIG(1,I+1) )
R12 = mBIG( 1, I+1 ) * mD1
if (mBIG(3,I+2)>gZERO) then
mE1 = gONE/SQRT( gONE + mBIG(1,I+2)*mBIG(1,I+2) +
- & mBIG(2,I+2)*mBIG(2,I+2) )
+ & mBIG(2,I+2)*mBIG(2,I+2) )
R13 = mBIG( 1, I+2 ) * mE1
R23 = mBIG( 2, I+2 ) * (mE1 * mD1) + R12 * R13
else
@@ -729,8 +729,8 @@
RETURN
200 INFORM = 1
RETURN
- END SUBROUTINE INITFUN
-!
+ END SUBROUTINE INITFUN
+!
! Integrand subroutine
!
FUNCTION MVNFUN( Ndim, W ) RESULT (VAL)
@@ -744,19 +744,19 @@
INTEGER :: N,I, J, FINA, FINB
INTEGER :: NdleftN, NdleftO ,IK
DOUBLE PRECISION :: TMP, AI, BI, DI, EI
- LOGICAL :: useC1C2, isXd
+ LOGICAL :: useC1C2, isXd
!MVNFUN Multivariate Normal integrand function
-! where the integrand is transformed from an integral
+! where the integrand is transformed from an integral
! having integration limits A and B to an
! integral having constant integration limits i.e.
-! B 1
+! B 1
! int jacob(xd,xc)*f(xd,xt)dxt dxd = int F2(W) dW
! A 0
!
! W - new transformed integration variables, valid range 0..1
! The vector must have the length Ndim returned from Covsrt
! mBIG - conditional sorted ChOlesky Factor of the covariance matrix (IN)
-! mCDI - Cholesky DIagonal elements used to calculate the mean
+! mCDI - Cholesky DIagonal elements used to calculate the mean
! mCm - conditional mean of Xd and Xt given Xc, E(Xd,Xt|Xc)
! mXd - variables to the jacobian variable, need no initialization size Nd
! mXc - conditional variables (IN)
@@ -764,11 +764,11 @@
! variables otherwise it is one of Xt
!PRINT *,'Mvnfun,ndim',Ndim
-
+
! xCut = gZERO ! xCutOff
N = mNt+mNd-mINFIXt-mINFIXd-1
- IK = 1 ! Counter for Ndim
+ IK = 1 ! Counter for Ndim
FINA = 0
FINB = 0
@@ -780,7 +780,7 @@
IF (useC1C2) THEN
! Calculate the conditional mean
! E(Y(I) | Y(1),...Y(I0))/STD(Y(I)|Y(1),,,,Y(I0))
- mY(mI0+1:N+1) = mBIG(IK, mI0+1:N+1)*mY(IK)
+ mY(mI0+1:N+1) = mBIG(IK, mI0+1:N+1)*mY(IK)
ENDIF
IF (NdleftO.GT.NdleftN ) THEN
mXd(NdleftN+1:NdleftO) = mCmXd(NdleftN+1:NdleftO)+
@@ -788,32 +788,32 @@
ENDIF
NdleftO = NdleftN
IK = 2 !=IK+1
-
-
+
+
DO I = mI0+1, N+1
IF (useC1C2) THEN
TMP = mY(I)
ELSE
TMP = 0.d0
- DO J = 1, IK-1
+ DO J = 1, IK-1
! E(Y(I) | Y(1),...Y(IK-1))/STD(Y(IK)|Y(1),,,,Y(IK-1))
- TMP = TMP + mBIG(J,I)*mY(J)
+ TMP = TMP + mBIG(J,I)*mY(J)
END DO
ENDIF
IF (mINFI(I) < 0) GO TO 100
! May have infinite int. Limits if Nd>0
IF ( mINFI(I) .NE. 0 ) THEN
IF ( FINA .EQ. 1 ) THEN
- AI = MAX( AI, mA(I) - TMP)
+ AI = MAX( AI, mA(I) - TMP)
ELSE
- AI = mA(I) - TMP
+ AI = mA(I) - TMP
FINA = 1
END IF
IF (FINB.EQ.1.AND.BI<=AI) GOTO 200
END IF
IF ( mINFI(I) .NE. 1 ) THEN
IF ( FINB .EQ. 1 ) THEN
- BI = MIN( BI, mB(I) - TMP)
+ BI = MIN( BI, mB(I) - TMP)
ELSE
BI = mB(I) - TMP
FINB = 1
@@ -821,23 +821,23 @@
IF (FINA.EQ.1.AND.BI<=AI) GOTO 200
END IF
100 isXd = (mNt gZERO ) THEN
+ END IF
+ IF (I == N+1 .OR. mBIG(IK+1,I+1) > gZERO ) THEN
IF (useC1C2) THEN
-! Note: for J =I+1:N+1: Y(J) = conditional expectation, E(Yj|Y1,...Yk)
+! Note: for J =I+1:N+1: Y(J) = conditional expectation, E(Yj|Y1,...Yk)
CALL C1C2(I+1,N+1,IK,mA,mB,mINFI,mY,mBIG,AI,BI,FINA,FINB)
ENDIF
- CALL MVNLMS( AI, BI, 2*FINA+FINB-1, DI, EI )
+ CALL MVNLMS( AI, BI, 2*FINA+FINB-1, DI, EI )
IF ( DI >= EI ) GO TO 200
VAL = VAL * ( EI - DI )
-
+
IF ( I <= N .OR. (NdleftN < NdleftO)) THEN
mY(IK) = FIINV( DI + W(IK)*( EI - DI ) )
IF (NdleftN < NdleftO ) THEN
@@ -847,17 +847,17 @@
ENDIF
useC1C2 = (IK+1<=mNc1c2)
IF (useC1C2) THEN
-
+
! E(Y(J) | Y(1),...Y(I))/STD(Y(J)|Y(1),,,,Y(I))
mY(I+1:N+1) = mY(I+1:N+1) + mBIG(IK, I+1:N+1)*mY(IK)
ENDIF
- ENDIF
+ ENDIF
IK = IK + 1
FINA = 0
FINB = 0
END IF
END DO
- IF (mNd>0) VAL = VAL * jacob(mXd,mXc)
+ IF (mNd>0) VAL = VAL * jacob(mXd,mXc)
RETURN
200 VAL = gZERO
RETURN
@@ -868,53 +868,53 @@
!!******************* RINDD - the main program *********************!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE RINDD(VALS,ERR,TERR,Big,Ex,Xc,Nt,
- & indI,Blo,Bup,INFIN)
+ & indI,Blo,Bup,INFIN)
USE RCRUDEMOD
USE KRBVRCMOD
USE ADAPTMOD
- USE KROBOVMOD
+ USE KROBOVMOD
USE DKBVRCMOD
USE SSOBOLMOD
- IMPLICIT NONE
+ IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(: ), INTENT(out):: VALS, ERR ,TERR
DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: BIG
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Xc
- DOUBLE PRECISION, DIMENSION(:), INTENT(in) :: Ex
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo, Bup
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Xc
+ DOUBLE PRECISION, DIMENSION(:), INTENT(in) :: Ex
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo, Bup
INTEGER, DIMENSION(:), INTENT(in) :: indI,INFIN
- INTEGER, INTENT(in) :: Nt
+ INTEGER, INTENT(in) :: Nt
! DOUBLE PRECISION, INTENT(in) :: XcScale
! local variables
INTEGER :: ix, INFORM, NDIM, MAXPTS, MINPTS
DOUBLE PRECISION :: VALUE,fxc,absERR,absERR2
double precision :: LABSEPS,LRELEPS
-
-
- VALS(:) = gZERO
- ERR(:) = gONE
- TERR(:) = gONE
-
- call preInit(BIG,Xc,Nt,inform)
- IF (INFORM.GT.0) GOTO 110 ! degenerate case exit VALS=0 for all
+
+
+ VALS(:) = gZERO
+ ERR(:) = gONE
+ TERR(:) = gONE
+
+ call preInit(BIG,Xc,Nt,inform)
+ IF (INFORM.GT.0) GOTO 110 ! degenerate case exit VALS=0 for all
! (should perhaps return NaN instead??)
! Now the loop over all different values of
-! variables Xc (the one one is conditioning on)
+! variables Xc (the one one is conditioning on)
! is started. The density f_{Xc}(xc(:,ix))
! will be computed and denoted by fxc.
- DO ix = 1, mNx
+ DO ix = 1, mNx
call initIntegrand(ix,Xc,Ex,indI,Blo,Bup,infin,
& fxc,value,abserr,NDIM,inform)
-
- IF (INFORM.GT.0) GO TO 100
-
+
+ IF (INFORM.GT.0) GO TO 100
+
MAXPTS = mMAXPTS
MINPTS = mMINPTS
LABSEPS = max(mABSEPS-abserr,0.2D0*mABSEPS) !*fxc
LRELEPS = mRELEPS
ABSERR2 = mSmall
-
+
SELECT CASE (mMethod)
CASE (:1)
IF (NDIM < 9) THEN
@@ -925,7 +925,7 @@
CALL KRBVRC(NDIM, MINPTS, MAXPTS, MVNFUN,LABSEPS,LRELEPS,
& ABSERR2, VALUE, INFORM )
ENDIF
- CASE (2)
+ CASE (2)
! Call the subregion adaptive integration subroutine
IF ( NDIM .GT. 19.) THEN
! print *, 'Ndim too large for SADMVN => Calling KRBVRC'
@@ -940,39 +940,39 @@
CALL KRBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, LABSEPS,
& LRELEPS, ABSERR2, VALUE, INFORM )
CASE (4) ! Call the Lattice rule
- ! integration procedure
+ ! integration procedure
CALL KROBOV( NDIM, MINPTS, MAXPTS, MVNFUN, LABSEPS,
& LRELEPS,ABSERR2, VALUE, INFORM )
CASE (5) ! Call Crude Monte Carlo integration procedure
- CALL RANMC( NDIM, MAXPTS, MVNFUN, LABSEPS,
- & LRELEPS, ABSERR2, VALUE, INFORM )
+ CALL RANMC( NDIM, MAXPTS, MVNFUN, LABSEPS,
+ & LRELEPS, ABSERR2, VALUE, INFORM )
CASE (6) ! Call the scrambled Sobol sequence rule integration procedure
CALL SOBNIED( NDIM, MINPTS, MAXPTS, MVNFUN, LABSEPS, LRELEPS,
- & ABSERR2, VALUE, INFORM )
- CASE (7:)
- CALL DKBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, LABSEPS, LRELEPS,
& ABSERR2, VALUE, INFORM )
- END SELECT
+ CASE (7:)
+ CALL DKBVRC( NDIM, MINPTS, MAXPTS, MVNFUN, LABSEPS, LRELEPS,
+ & ABSERR2, VALUE, INFORM )
+ END SELECT
! IF (INFORM.gt.0) print *,'RIND, INFORM,error =',inform,error
- 100 VALS(ix) = VALUE*fxc
- IF (SIZE(ERR, DIM = 1).EQ.mNx) ERR(ix) = abserr2*fxc
- IF (SIZE(TERR, DIM = 1).EQ.mNx) TERR(ix) = abserr*fxc
+ 100 VALS(ix) = VALUE*fxc
+ IF (SIZE(ERR, DIM = 1).EQ.mNx) ERR(ix) = abserr2*fxc
+ IF (SIZE(TERR, DIM = 1).EQ.mNx) TERR(ix) = abserr*fxc
ENDDO !ix
110 CONTINUE
call cleanUp
- RETURN
+ RETURN
END SUBROUTINE RINDD
-
- SUBROUTINE setIntLimits(xc,indI,Blo,Bup,INFIN,inform)
+
+ SUBROUTINE setIntLimits(xc,indI,Blo,Bup,INFIN,inform)
IMPLICIT NONE
DOUBLE PRECISION, DIMENSION(: ), INTENT(in) :: xc
- INTEGER, DIMENSION(: ), INTENT(in) :: indI,INFIN
- DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo,Bup
+ INTEGER, DIMENSION(: ), INTENT(in) :: indI,INFIN
+ DOUBLE PRECISION, DIMENSION(:,:), INTENT(in) :: Blo,Bup
integer, intent(out) :: inform
!Local variables
- INTEGER :: I, J, K, L,Mb1,Nb,NI,Nc
+ INTEGER :: I, J, K, L,Mb1,Nb,NI,Nc
DOUBLE PRECISION :: xCut, SQ0
!this procedure set mA,mB and mInfi according to Blo/Bup and INFIN
!
@@ -992,44 +992,44 @@
NI = size(indI,DIM=1)
Nc = size(xc,DIM=1)
if (Mb1>Nc .or. Nb.NE.NI-1) then
-! size of variables inconsistent
+! size of variables inconsistent
inform = 4
return
endif
-
+
! IF (Mb.GT.Nc+1) print *,'barrier: Mb,Nc =',Mb,Nc
! IF (Nb.NE.NI-1) print *,'barrier: Nb,NI =',Nb,NI
- DO J = 2, NI
+ DO J = 2, NI
DO I = indI (J - 1) + 1 , indI (J)
- L = mXedni(I)
+ L = mXedni(I)
mINFI(L) = INFIN(J-1)
SQ0 = SQRT(mBIG(L,L))
mA(L) = -xCut*SQ0
mB(L) = xCut*SQ0
IF (mINFI(L).GE.0) THEN
IF (mINFI(L).NE.0) THEN
- mA(L) = Blo (1, J - 1)-mCm(L)
+ mA(L) = Blo (1, J - 1)-mCm(L)
DO K = 1, Mb1
- mA(L) = mA(L)+Blo(K+1,J-1)*xc(K)
+ mA(L) = mA(L)+Blo(K+1,J-1)*xc(K)
ENDDO ! K
- ! This can only be done if
+ ! This can only be done if
if (mA(L)< -xCut*SQ0) mINFI(L) = mINFI(L)-2
ENDIF
IF (mINFI(L).NE.1) THEN
- mB(L) = Bup (1, J - 1)-mCm(L)
+ mB(L) = Bup (1, J - 1)-mCm(L)
DO K = 1, Mb1
mB(L) = mB(L)+Bup(K+1,J-1)*xc(K)
- ENDDO
+ ENDDO
if (xCut*SQ0B(I) or
-!
-! b) Cm(I)+x1*B1(I)+C*SQ(I)B(I) or
+!
+! b) Cm(I)+x1*B1(I)+C*SQ(I)-1) THEN
- !BdSQ0 = B1(I)
+ !BdSQ0 = B1(I)
!CSQ = xCut * SQ(I)
BdSQ0 = BIG(IK,I)
CSQ = xCut * BIG(I,IK)
@@ -1170,8 +1170,8 @@
ELSE
BJ = (B(I) - Cm(I) + CSQ)/BdSQ0
FINB = 1
- ENDIF
- IF (FINA.GT.0) BJ = MAX(AJ,BJ)
+ ENDIF
+ IF (FINA.GT.0) BJ = MAX(AJ,BJ)
END IF
ELSEIF (BdSQ0 < -LTOL) THEN
IF ( INFI .NE. 0 ) THEN
@@ -1181,7 +1181,7 @@
BJ = (A(I) - Cm(I) - CSQ)/BdSQ0
FINB = 1
ENDIF
- IF (FINA.GT.0) BJ = MAX(AJ,BJ)
+ IF (FINA.GT.0) BJ = MAX(AJ,BJ)
END IF
IF ( INFI .NE. 1 ) THEN
IF (FINA.EQ.1) THEN
@@ -1192,7 +1192,7 @@
ENDIF
IF (FINB.GT.0) AJ = MIN(AJ,BJ)
END IF
- END IF
+ END IF
ENDIF
END DO
! IF (FINA>0 .AND. FINB>0) THEN
@@ -1209,48 +1209,48 @@
! USE GLOBALDATA, ONLY : XCEPS2
! USE GLOBALCONST
IMPLICIT NONE
- INTEGER, INTENT(in) :: Nt,Nd
+ INTEGER, INTENT(in) :: Nt,Nd
DOUBLE PRECISION, DIMENSION(:,:), INTENT(inout) :: R
- INTEGER, DIMENSION(: ), INTENT(inout) :: index1
- INTEGER, INTENT(out) :: INFORM
+ INTEGER, DIMENSION(: ), INTENT(inout) :: index1
+ INTEGER, INTENT(out) :: INFORM
! local variables
DOUBLE PRECISION, DIMENSION(:), allocatable :: SQ
INTEGER, DIMENSION(1) :: m
INTEGER :: M1,K,I,J,Ntdc,Ntd,Nc, LO
DOUBLE PRECISION :: LTOL, maxSQ
-! if any Var(Xc(j)|Xc(1),...,Xc(j-1)) <= XCEPS2 then return NAN
- double precision :: XCEPS2
+! if any Var(Xc(j)|Xc(1),...,Xc(j-1)) <= XCEPS2 then return NAN
+ double precision :: XCEPS2
!CVSRTXC calculate the conditional covariance matrix of Xt and Xd given Xc
! as well as the cholesky factorization for the Xc variable(s)
! The Xc variables are sorted by the largest conditional covariance
-!
+!
! R = In : Cov(X) where X=[Xt Xd Xc] is stochastic vector
! Out: sorted Conditional Covar. matrix, i.e.,
-! [ Cov([Xt,Xd] | Xc) Shape N X N (N=Ntdc=Nt+Nd+Nc)
-! index1 = In/Out : permutation vector giving the indices to the variables
+! [ Cov([Xt,Xd] | Xc) Shape N X N (N=Ntdc=Nt+Nd+Nc)
+! index1 = In/Out : permutation vector giving the indices to the variables
! original place. Size Ntdc
! INFORM = Out, Returns
! 0 If Normal termination.
! 1 If R is degenerate, i.e., Cov(Xc) is singular.
-!
-! R=Cov([Xt,Xd,Xc]) is a covariance matrix of the stochastic
+!
+! R=Cov([Xt,Xd,Xc]) is a covariance matrix of the stochastic
! vector X=[Xt Xd Xc] where the variables Xt, Xd and Xc have the size
-! Nt, Nd and Nc, respectively.
+! Nt, Nd and Nc, respectively.
! Xc are the conditional variables.
-! Xd and Xt are the variables to integrate.
+! Xd and Xt are the variables to integrate.
!(Xd,Xt = variables in the jacobian and indicator respectively)
!
! Note: CVSRTXC only works on the upper triangular part of R
-
+
INFORM = 0
Ntdc = size(R,DIM=1)
Ntd = Nt + Nd
Nc = Ntdc - Ntd
-
+
IF (Nc < 1) RETURN
-
-
-
+
+
+
ALLOCATE(SQ(1:Ntdc))
maxSQ = gZERO
DO I = 1, Ntdc
@@ -1264,10 +1264,10 @@
LO = 1
K = Ntdc
DO I = 1, Nc ! Condsort Xc
- m = K+1-MAXLOC(SQ(K:Ntd+1:-1))
+ m = K+1-MAXLOC(SQ(K:Ntd+1:-1))
M1 = m(1)
IF (SQ(m1)<=XCEPS2) THEN
-! PRINT *,'CVSRTXC: Degenerate case of Xc(Nc-J+1) for J=',ix
+! PRINT *,'CVSRTXC: Degenerate case of Xc(Nc-J+1) for J=',ix
!CALL mexprintf('CVSRTXC: Degenerate case of Xc(Nc-J+1)')
INFORM = 1
GOTO 200 ! RETURN !degenerate case
@@ -1301,7 +1301,7 @@
R(J,J) = SQ(J)
R(LO:J-1,J) = R(LO:J-1,J) - R(LO:J-1,K)*R(J,K)
ENDIF
- END DO
+ END DO
K = K - 1
ENDDO
200 DEALLOCATE(SQ)
@@ -1318,17 +1318,17 @@
! CALL RCSCALE( k, k0, N1, N,K1, CDI,Cm,R,A, B, INFIN,index1,Y)
!
! chkLim = TRUE if check if variable K is redundant
-! FALSE
+! FALSE
! K = index to variable which is deterministic,i.e.,
! STD(Xk|X1,...Xr) = 0
-! N1 = Number of significant variables of [Xt,Xd]
+! N1 = Number of significant variables of [Xt,Xd]
! N = length(Xt)+length(Xd)
! K1 = index to current variable we are conditioning on.
! CDI = Cholesky diagonal elements which contains either
! CDI(J) = STD(Xj | X1,...,Xj-1,Xc) if Xj is stochastic given
! X1,...Xj, Xc
! or
-! CDI(J) = COV(Xj,Xk | X1,..,Xk-1,Xc )/STD(Xk | X1,..,Xk-1,Xc)
+! CDI(J) = COV(Xj,Xk | X1,..,Xk-1,Xc )/STD(Xk | X1,..,Xk-1,Xc)
! if Xj is determinstically determined given X1,..,Xk,Xc
! for some k LTOL) .OR. (isXt)) THEN
+ IF ( (R(I,I) > LTOL) .OR. (isXt)) THEN
DO J = 1,I-1
isXd = (INDEX1(J)>Nt)
IF ( (R(J,J) <= LTOL) .AND.isXd) THEN
CALL RCSWAP(J, I, N, N, R,INDEX1,Cm, A, B, INFI)
- !GO TO 10
+ !GO TO 10
CYCLE LP3
ENDIF
END DO
ENDIF
-! 10
- END DO LP3
-!
+! 10
+ END DO LP3
+!
! Move any doubly infinite limits or any redundant of Xt to the next
! innermost positions.
-!
+!
LP4: DO I = N-INFISD, N1+1, -1
isXd = (INDEX1(I)>Nt)
IF ( ((INFI(I) > -1).AND.(R(I,I) > LTOL))
- & .OR. isXd) THEN
+ & .OR. isXd) THEN
DO J = 1,I-1
isXt = (INDEX1(J)<=Nt)
- IF ( (INFI(J) < 0 .OR. (R(J,J)<= LTOL))
+ IF ( (INFI(J) < 0 .OR. (R(J,J)<= LTOL))
& .AND. (isXt)) THEN
CALL RCSWAP( J, I, N,N, R,INDEX1,Cm, A, B, INFI)
- !GO TO 15
+ !GO TO 15
CYCLE LP4
ENDIF
END DO
ENDIF
-!15
+!15
END DO LP4
! CALL mexprintf('Before sorting')
! CALL PRINTCOF(N,A,B,INFI,R,INDEX1)
! CALL PRINTVEC(CDI,'CDI')
! CALL PRINTVEC(Cm,'Cm')
-
+
IF ( N1 <= 0 ) GOTO 200
-!
+!
! Sort remaining limits and determine Cholesky factor.
-!
+!
Y(1:N1) = gZERO
K = 1
Ndleft = Nd - INFISD
Nullity = 0
- DO WHILE (K .LE. N1)
-
+ DO WHILE (K .LE. N1)
+
! IF (Ndim.EQ.3) EPSL = MAX(EPS2,1D-10)
! Determine the integration limits for variable with minimum
! expected probability and interchange that variable with Kth.
-
+
K0 = K - Nullity
PRBMIN = gTWO
JMIN = K
@@ -1707,7 +1707,7 @@
TMP = TMP + R(I,J)*Y(I)
END DO
SUMSQ = SQRT( R(J,J))
-
+
IF (INFI(J)>-1) THEN
! May have infinite int. limits if Nd>0
IF (INFI(J).NE.0) THEN
@@ -1721,7 +1721,7 @@
AA = (Cm(J)+TMP)/SUMSQ ! inflection point
CALL EXLMS(AA,AJ,BJ,INFI(J),D,E,Ca,Pa)
PRBJ = E - D
- ELSE
+ ELSE
!CALL MVNLMS( AJ, BJ, INFI(J), D, E )
CALL MVNLIMITS(AJ,BJ,INFI(J),APJ,PRBJ)
ENDIF
@@ -1734,20 +1734,20 @@
CVDIAG = SUMSQ
ENDIF
ENDIF
- END DO
+ END DO
END IF
-!
+!
! Compute Ith column of Cholesky factor.
! Compute expected value for Ith integration variable (without
! considering the jacobian) and
! scale Ith covariance matrix row and limits.
-!
-! 40
+!
+! 40
IF ( CVDIAG.GT.TOL) THEN
isXd = (INDEX1(JMIN)>Nt)
IF (isXd) THEN
- Ndleft = Ndleft - 1
- ELSEIF (BCVSRT.EQV..FALSE..AND.(PRBMIN+LTOL>=gONE)) THEN
+ Ndleft = Ndleft - 1
+ ELSEIF (BCVSRT.EQV..FALSE..AND.(PRBMIN+LTOL>=gONE)) THEN
!BCVSRT.EQ.
J = 1
AJ = R(J,JMIN)*xCut
@@ -1766,12 +1766,12 @@
INFJ = INFI(JMIN)
AJ = A(JMIN)+AJ
BJ = B(JMIN)+BJ
-
+
D = gZERO
DO J = 2, K0-1
D = D + ABS(R(J,JMIN))
END DO
-
+
AJ = (AJ + D*xCut)/CVDIAG
BJ = (BJ - D*xCut)/CVDIAG
CALL ADJLIMITS(AJ,BJ,INFJ)
@@ -1782,15 +1782,15 @@
CALL RCSWAP( JMIN,N1,N1,N,R,INDEX1,Cm,A,B,INFI)
! move conditional standarddeviations
R(JMIN,1:K0-1) = R(N1,1:K0-1)
-
- Y(JMIN) = Y(N1)
+
+ Y(JMIN) = Y(N1)
ENDIF
R(1:N1,N1) = gZERO
R(N1,1:N1) = gZERO
Y(N1) = gZERO
INFIS = INFIS+1
N1 = N1-1
- GOTO 100
+ GOTO 100
END IF
ENDIF
NDIM = NDIM + 1 !Number of relevant dimensions to integrate
@@ -1802,24 +1802,24 @@
CALL SWAP(R(K,J),R(JMIN,J))
END DO
END IF
-
- R(K0,K) = CVDIAG
+
+ R(K0,K) = CVDIAG
CDI(K) = CVDIAG ! Store the diagonal element
DO I = K0+1,K
R(I,K) = gZERO;
R(K,I) = gZERO
END DO
- K1 = K
+ K1 = K
I = K1 + 1
- DO WHILE (I <= N1)
+ DO WHILE (I <= N1)
TMP = ZERO
DO J = 1, K0 - 1
!tmp = tmp + L(i,j).*L(k1,j)
- TMP = TMP + R(J,I)*R(J,K1)
+ TMP = TMP + R(J,I)*R(J,K1)
END DO
! Cov(Xk,Xi|X1,X2,...Xk-1)/STD(Xk|X1,X2,...Xk-1)
- R(K0,I) = (R(K1,I) - TMP) /CVDIAG
+ R(K0,I) = (R(K1,I) - TMP) /CVDIAG
! Var(Xi|X1,X2,...Xk)
R(I,I) = R(I,I) - R(K0,I) * R(K0,I)
@@ -1829,8 +1829,8 @@
!CALL mexprintf('Singular')
isXd = (index1(I)>Nt)
if (isXd) then
- Ndleft = Ndleft - 1
- ELSEIF (BCVSRT.EQV..FALSE.) THEN
+ Ndleft = Ndleft - 1
+ ELSEIF (BCVSRT.EQV..FALSE.) THEN
! BCVSRT.EQ.
J = 1
AJ = R(J,I)*xCut
@@ -1849,12 +1849,12 @@
INFJ = INFI(I)
AJ = A(I)+AJ
BJ = B(I)+BJ
-
+
D = gZERO
DO J = 2, K0
D = D + ABS(R(J,I))
END DO
-
+
AJ = (AJ + D*xCut)-mXcutOff
BJ = (BJ - D*xCut)+mXcutOff
!call printvar(Aj,'Aj')
@@ -1867,18 +1867,18 @@
CALL RCSWAP( I,N1,N1,N,R,INDEX1,Cm,A,B,INFI)
! move conditional standarddeviations
R(I,1:K0-1) = R(N1,1:K0-1)
-
- Y(I) = Y(N1)
+
+ Y(I) = Y(N1)
ENDIF
R(1:N1,N1) = gZERO
R(N1,1:N1) = gZERO
Y(N1) = gZERO
INFIS = INFIS+1
N1 = N1-1
-
+
!CALL mexprintf('covsrt updated N1')
!call printvar(INFIS,' Infis')
- GOTO 75
+ GOTO 75
END IF
END IF
IF (mNIT>100) THEN
@@ -1901,9 +1901,9 @@
& R,A,B,INFI,INDEX1)
if (L.ne.INFIS) THEN
K = K - 1
- I = I - 1
+ I = I - 1
ENDIF
- END IF
+ END IF
I = I + 1
75 CONTINUE
END DO
@@ -1916,26 +1916,26 @@
IF (INFJ.NE.0) FINA = 1
IF (INFJ.NE.1) FINB = 1
ENDIF
- CALL C1C2(K1+1,N1,K0,A,B,INFI, Y, R,
+ CALL C1C2(K1+1,N1,K0,A,B,INFI, Y, R,
& AMIN, BMIN, FINA,FINB)
INFJ = 2*FINA+FINB-1
- CALL MVNLIMITS(AMIN,BMIN,INFJ,APJ,PRBMIN)
+ CALL MVNLIMITS(AMIN,BMIN,INFJ,APJ,PRBMIN)
ENDIF
-
+
Y(K0) = gettmean(AMIN,BMIN,INFJ,PRBMIN)
-
- R( K0, K1 ) = R( K0, K1 ) / CVDIAG
+
+ R( K0, K1 ) = R( K0, K1 ) / CVDIAG
DO J = 1, K0 - 1
! conditional covariances
- R( J, K1 ) = R( J, K1 ) / CVDIAG
+ R( J, K1 ) = R( J, K1 ) / CVDIAG
! conditional standard dev.s used in regression eq.
- R( K1, J ) = R( K1, J ) / CVDIAG
+ R( K1, J ) = R( K1, J ) / CVDIAG
END DO
-
+
A( K1 ) = A( K1 )/CVDIAG
B( K1 ) = B( K1 )/CVDIAG
-
+
K = K + 1
100 CONTINUE
ELSE
@@ -1944,7 +1944,7 @@
I = K
DO WHILE (I <= N1)
! Scale covariance matrix rows and limits
-! If the conditional covariance matrix diagonal entry is zero,
+! If the conditional covariance matrix diagonal entry is zero,
! permute limits and/or rows, if necessary.
chkLim = ((index1(I)<=Nt).AND.(BCVSRT.EQV..FALSE.))
L = INFIS
@@ -1955,7 +1955,7 @@
Nullity = N1 - K0 + 1
GOTO 200 !RETURN
END IF
- END DO
+ END DO
200 CONTINUE
IF (Ndim .GT. 0) THEN ! N10
IF (INFI(J).NE.0) THEN
AJ = ( A(J) - TMP )/SUMSQ
@@ -2201,20 +2201,20 @@
CVDIAG = SUMSQ
ENDIF
ENDIF
- END DO
+ END DO
END IF
-!
+!
! Compute Ith column of Cholesky factor.
! Compute expected value for Ith integration variable (without
! considering the jacobian) and
! scale Ith covariance matrix row and limits.
-!
-!40
+!
+!40
IF ( CVDIAG.GT.TOL) THEN
IF (INDEX1(JMIN).GT.Nt) THEN
Ndleft = Ndleft-1
ELSE
- IF (BCVSRT.EQV..FALSE..AND.(PRBMIN+LTOL.GE.gONE)) THEN
+ IF (BCVSRT.EQV..FALSE..AND.(PRBMIN+LTOL.GE.gONE)) THEN
!BCVSRT.EQ.
I = 1
AJ = R(I,JMIN)*xCut
@@ -2239,7 +2239,7 @@
D = D + ABS(R(I,JMIN))
END DO
-
+
AJ = (AJ + D*xCut)/CVDIAG
BJ = (BJ - D*xCut)/CVDIAG
@@ -2250,21 +2250,21 @@
IF ( JMIN < N1 ) THEN
CALL RCSWAP( JMIN, N1, N1,N, R,INDEX1,Cm, A, B, INFI)
! SWAP conditional standarddeviations
- DO I = 1,K0-1
+ DO I = 1,K0-1
CALL SWAP(R(JMIN,I),R(N1,I))
END DO
CALL SWAP(Y(N1),Y(JMIN))
ENDIF
INFIS = INFIS+1
N1 = N1-1
- GOTO 100
- END IF
+ GOTO 100
+ END IF
ENDIF
ENDIF
NDIM = NDIM + 1 !Number of relevant dimensions to integrate
IF ( K < JMIN ) THEN
-
+
CALL RCSWAP( K, JMIN, N1,N, R,INDEX1,Cm, A, B, INFI)
! SWAP conditional standarddeviations
DO J=1,K0-1
@@ -2272,8 +2272,8 @@
END DO
CALL SWAP(Y(K),Y(JMIN))
END IF
-
-
+
+
R(K0,K:N1) = R(K0,K:N1)/CVDIAG
R(K0,K) = CVDIAG
CDI(K) = CVDIAG ! Store the diagonal element
@@ -2281,10 +2281,10 @@
R(I,K) = ZERO
R(K,I) = ZERO
END DO
-
+
K1 = K
!IF (K .EQ. N1) GOTO 200
-
+
! Cov(Xi,Xj|Xk,Xk+1,..,Xn)=
! Cov(Xi,Xj|Xk+1,..,Xn) -
! Cov(Xi,Xk|Xk+1,..Xn)*Cov(Xj,Xk|Xk+1,..Xn)
@@ -2306,7 +2306,7 @@
CALL SWAP(R(K,J),R(I,J))
END DO
CALL SWAP(Y(K),Y(I))
- ENDIF
+ ENDIF
isXd = (INDEX1(K).GT.Nt)
IF (isXd) Ndleft = Ndleft-1
chkLim = ((.not.isXd).AND.(BCVSRT.EQV..FALSE.))
@@ -2314,9 +2314,9 @@
CALL RCSCALE(chkLim,K,K0,N1,N,K1,INFIS,CDI,Cm,
& R,A,B,INFI,INDEX1,Y)
IF (L.NE.INFIS) I = I - 1
- END IF
+ END IF
I = I +1
- END DO
+ END DO
INFJ = INFI(K1)
IF (K0 == 1) THEN
FINA = 0
@@ -2325,15 +2325,15 @@
IF (INFJ.NE.0) FINA = 1
IF (INFJ.NE.1) FINB = 1
ENDIF
- CALL C1C2(K1+1,N1,K0,A,B,INFI, Y, R,
+ CALL C1C2(K1+1,N1,K0,A,B,INFI, Y, R,
& AMIN, BMIN, FINA,FINB)
INFJ = 2*FINA+FINB-1
- CALL MVNLIMITS(AMIN,BMIN,INFJ,APJ,PRBMIN)
+ CALL MVNLIMITS(AMIN,BMIN,INFJ,APJ,PRBMIN)
ENDIF
Y(K0) = GETTMEAN(AMIN,BMIN,INFJ,PRBMIN)
- ! conditional mean (expectation)
- ! E(Y(K+1:N)|Y(1),Y(2),...,Y(K))
+ ! conditional mean (expectation)
+ ! E(Y(K+1:N)|Y(1),Y(2),...,Y(K))
Y(K+1:N1) = Y(K+1:N1)+Y(K0)*R(K0,K+1:N1)
R(K0,K1) = R(K0,K1)/CVDIAG ! conditional covariances
DO J = 1, K0 - 1
@@ -2345,13 +2345,13 @@
K = K + 1
100 CONTINUE
- ELSE
+ ELSE
R(K:N1,K:N1) = gZERO
! CALL PRINTCOF(N,A,B,INFI,R,INDEX1)
I = K
DO WHILE (I <= N1)
! Scale covariance matrix rows and limits
-! If the conditional covariance matrix diagonal entry is zero,
+! If the conditional covariance matrix diagonal entry is zero,
! permute limits and/or rows, if necessary.
chkLim = ((index1(I)<=Nt).AND.(BCVSRT.EQV..FALSE.))
L = INFIS
@@ -2360,10 +2360,10 @@
if (L.EQ.INFIS) I = I + 1
END DO
Nullity = N1 - K0 + 1
- GOTO 200 !RETURN
+ GOTO 200 !RETURN
END IF
- END DO
-
+ END DO
+
200 CONTINUE
IF (Ndim .GT. 0) THEN ! N1 2):
# for i=1:tn-2
# cov(Xt)
# for j=i:tn-2
# BIG(i,j) = -R2(j-i+1) % cov(X'(ti+1),X'(tj+1))
# end %do
-
+
# % cov(Xt) = % cov(X'(ti+1),X'(tj+1))
BIG[:tn - 2, :tn - 2] = toeplitz(-R2[:tn - 2])
-
+
# cov(Xt,Xc)
BIG[:tn - 2, tn + shft] = -R2[1:tn - 1] # cov(X'(ti+1),X'(t1))
# cov(X'(ti+1),X'(tn))
@@ -2344,7 +2344,7 @@ class SpecData1D(PlotData):
BIG[:tn - 2, tn + shft + 2] = R1[1:tn - 1] # cov(X'(ti+1),X(t1))
# cov(X'(ti+1),X(tn))
BIG[:tn - 2, tn + shft + 3] = -R1[tn - 2:0:-1]
-
+
# Cov(Xt,Xd)
BIG[:tn - 2, tn - 2] = R3[1:tn - 1] # cov(X'(ti+1),X''(t1))
BIG[:tn - 2, tn - 1] = -R3[tn - 2:0:-1] # cov(X'(ti+1),X''(tn))
@@ -2354,7 +2354,7 @@ class SpecData1D(PlotData):
BIG[tn - 2, tn - 2] = R4[0]
BIG[tn - 2, tn - 1] = R4[tn - 1] # cov(X''(t1),X''(tn))
BIG[tn - 1, tn - 1] = R4[0]
-
+
# cov(Xc)
BIG[tn + shft + 2, tn + shft + 2] = R0[0] # cov(X(t1),X(t1))
# cov(X(t1),X(tn))
@@ -2929,8 +2929,8 @@ class SpecData1D(PlotData):
# 1'st order + 2'nd order component.
x2[:, 1::] = x[:, 1::] + x2o[0:ns, :].real
if output == 'timeseries':
- xx2 = mat2timeseries(x2[:, 1::], x2[:, 0].ravel())
- xx = mat2timeseries(x[:, 1::], x[:, 0].ravel())
+ xx2 = mat2timeseries(x2)
+ xx = mat2timeseries(x)
return xx2, xx
return x2, x
diff --git a/pywafo/src/wafo/spectrum/models.py b/wafo/spectrum/models.py
similarity index 100%
rename from pywafo/src/wafo/spectrum/models.py
rename to wafo/spectrum/models.py
diff --git a/pywafo/src/Wafo.egg-info/dependency_links.txt b/wafo/spectrum/tests/__init__.py
similarity index 100%
rename from pywafo/src/Wafo.egg-info/dependency_links.txt
rename to wafo/spectrum/tests/__init__.py
diff --git a/wafo/spectrum/tests/conftest.py b/wafo/spectrum/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/wafo/spectrum/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/pywafo/src/wafo/spectrum/test/test_models.py b/wafo/spectrum/tests/test_models.py
similarity index 100%
rename from pywafo/src/wafo/spectrum/test/test_models.py
rename to wafo/spectrum/tests/test_models.py
diff --git a/pywafo/src/wafo/spectrum/test/test_specdata1d.py b/wafo/spectrum/tests/test_specdata1d.py
similarity index 93%
rename from pywafo/src/wafo/spectrum/test/test_specdata1d.py
rename to wafo/spectrum/tests/test_specdata1d.py
index 46b043f..8d36675 100644
--- a/pywafo/src/wafo/spectrum/test/test_specdata1d.py
+++ b/wafo/spectrum/tests/test_specdata1d.py
@@ -3,6 +3,7 @@ import wafo.transform.models as wtm
import wafo.objects as wo
from wafo.spectrum import SpecData1D
import numpy as np
+from numpy.testing import assert_array_almost_equal
import unittest
@@ -93,10 +94,10 @@ def test_sim_nl():
funs = [np.mean, np.std, st.skew, st.kurtosis]
for fun, trueval in zip(funs, truth1):
- res = fun(x2[:, 1::], axis=0)
+ res = fun(x2.data, axis=0)
m = res.mean()
sa = res.std()
- #trueval, m, sa
+ # trueval, m, sa
assert(np.abs(m - trueval) < 2 * sa)
@@ -107,9 +108,9 @@ def test_stats_nl():
S = Sj.tospecdata()
me, va, sk, ku = S.stats_nl(moments='mvsk')
assert(me == 0.0)
- assert(va == 3.0608203389019537)
- assert(sk == 0.18673120577479801)
- assert(ku == 3.0619885212624176)
+ assert_array_almost_equal(va, 3.0608203389019537)
+ assert_array_almost_equal(sk, 0.18673120577479801)
+ assert_array_almost_equal(ku, 3.0619885212624176)
def test_testgaussian():
@@ -127,7 +128,7 @@ def test_testgaussian():
ys = wo.mat2timeseries(S.sim(ns=2 ** 13))
g0, _gemp = ys.trdata()
t0 = g0.dist2gauss()
- t1 = S0.testgaussian(ns=2 ** 13, t0=t0, cases=50)
+ t1 = S0.testgaussian(ns=2 ** 13, test0=t0, cases=50)
assert(sum(t1 > t0) < 5)
@@ -138,9 +139,9 @@ def test_moment():
true_vals = [1.5614600345079888, 0.95567089481941048]
true_txt = ['m0', 'm0tt']
for tv, v in zip(true_vals, vals):
- assert(tv == v)
+ assert_array_almost_equal(tv, v)
for tv, v in zip(true_txt, txt):
- assert(tv == v)
+ assert(tv==v)
def test_nyquist_freq():
@@ -163,7 +164,7 @@ def test_normalize():
vals, _txt = S.moment(2)
true_vals = [1.5614600345079888, 0.95567089481941048]
for tv, v in zip(true_vals, vals):
- assert(tv == v)
+ assert_array_almost_equal(tv, v)
Sn = S.copy()
Sn.normalize()
diff --git a/pywafo/src/wafo/stats/__init__.py b/wafo/stats/__init__.py
similarity index 100%
rename from pywafo/src/wafo/stats/__init__.py
rename to wafo/stats/__init__.py
diff --git a/pywafo/src/wafo/stats/_binned_statistic.py b/wafo/stats/_binned_statistic.py
similarity index 100%
rename from pywafo/src/wafo/stats/_binned_statistic.py
rename to wafo/stats/_binned_statistic.py
diff --git a/pywafo/src/wafo/stats/_constants.py b/wafo/stats/_constants.py
similarity index 100%
rename from pywafo/src/wafo/stats/_constants.py
rename to wafo/stats/_constants.py
diff --git a/pywafo/src/wafo/stats/_continuous_distns.py b/wafo/stats/_continuous_distns.py
similarity index 100%
rename from pywafo/src/wafo/stats/_continuous_distns.py
rename to wafo/stats/_continuous_distns.py
diff --git a/pywafo/src/wafo/stats/_discrete_distns.py b/wafo/stats/_discrete_distns.py
similarity index 100%
rename from pywafo/src/wafo/stats/_discrete_distns.py
rename to wafo/stats/_discrete_distns.py
diff --git a/pywafo/src/wafo/stats/_distn_infrastructure.py b/wafo/stats/_distn_infrastructure.py
similarity index 100%
rename from pywafo/src/wafo/stats/_distn_infrastructure.py
rename to wafo/stats/_distn_infrastructure.py
diff --git a/pywafo/src/wafo/stats/_distr_params.py b/wafo/stats/_distr_params.py
similarity index 100%
rename from pywafo/src/wafo/stats/_distr_params.py
rename to wafo/stats/_distr_params.py
diff --git a/pywafo/src/wafo/stats/_multivariate.py b/wafo/stats/_multivariate.py
similarity index 100%
rename from pywafo/src/wafo/stats/_multivariate.py
rename to wafo/stats/_multivariate.py
diff --git a/pywafo/src/wafo/stats/_numpy_compat.py b/wafo/stats/_numpy_compat.py
similarity index 100%
rename from pywafo/src/wafo/stats/_numpy_compat.py
rename to wafo/stats/_numpy_compat.py
diff --git a/pywafo/src/wafo/stats/_tukeylambda_stats.py b/wafo/stats/_tukeylambda_stats.py
similarity index 100%
rename from pywafo/src/wafo/stats/_tukeylambda_stats.py
rename to wafo/stats/_tukeylambda_stats.py
diff --git a/pywafo/src/wafo/stats/contingency.py b/wafo/stats/contingency.py
similarity index 100%
rename from pywafo/src/wafo/stats/contingency.py
rename to wafo/stats/contingency.py
diff --git a/pywafo/src/wafo/stats/core.py b/wafo/stats/core.py
similarity index 100%
rename from pywafo/src/wafo/stats/core.py
rename to wafo/stats/core.py
diff --git a/pywafo/src/wafo/stats/distributions.py b/wafo/stats/distributions.py
similarity index 100%
rename from pywafo/src/wafo/stats/distributions.py
rename to wafo/stats/distributions.py
diff --git a/pywafo/src/wafo/stats/estimation.py b/wafo/stats/estimation.py
similarity index 99%
rename from pywafo/src/wafo/stats/estimation.py
rename to wafo/stats/estimation.py
index 4c825d9..6ee4f64 100644
--- a/pywafo/src/wafo/stats/estimation.py
+++ b/wafo/stats/estimation.py
@@ -10,8 +10,8 @@ Author: Per A. Brodtkorb 2008
from __future__ import division, absolute_import
import warnings
-from ..plotbackend import plotbackend
-from ..misc import ecross, findcross
+from wafo.plotbackend import plotbackend
+from wafo.misc import ecross, findcross
import numdifftools # @UnresolvedImport
@@ -1151,6 +1151,9 @@ def test1():
# Better CI for phat.par[i=0]
Lp1 = Profile(phat, i=0) # @UnusedVariable
+ Lp1.plot()
+ import matplotlib.pyplot as plt
+ plt.show()
# Lp2 = Profile(phat, i=2)
# SF = 1./990
# x = phat.isf(SF)
diff --git a/pywafo/src/wafo/stats/kde.py b/wafo/stats/kde.py
similarity index 100%
rename from pywafo/src/wafo/stats/kde.py
rename to wafo/stats/kde.py
diff --git a/pywafo/src/wafo/stats/kde_example.py b/wafo/stats/kde_example.py
similarity index 100%
rename from pywafo/src/wafo/stats/kde_example.py
rename to wafo/stats/kde_example.py
diff --git a/pywafo/src/wafo/stats/misc.py b/wafo/stats/misc.py
similarity index 100%
rename from pywafo/src/wafo/stats/misc.py
rename to wafo/stats/misc.py
diff --git a/pywafo/src/wafo/stats/morestats.py b/wafo/stats/morestats.py
similarity index 100%
rename from pywafo/src/wafo/stats/morestats.py
rename to wafo/stats/morestats.py
diff --git a/pywafo/src/wafo/stats/mstats.py b/wafo/stats/mstats.py
similarity index 100%
rename from pywafo/src/wafo/stats/mstats.py
rename to wafo/stats/mstats.py
diff --git a/pywafo/src/wafo/stats/mstats_basic.py b/wafo/stats/mstats_basic.py
similarity index 100%
rename from pywafo/src/wafo/stats/mstats_basic.py
rename to wafo/stats/mstats_basic.py
diff --git a/pywafo/src/wafo/stats/mstats_extras.py b/wafo/stats/mstats_extras.py
similarity index 100%
rename from pywafo/src/wafo/stats/mstats_extras.py
rename to wafo/stats/mstats_extras.py
diff --git a/pywafo/src/wafo/stats/rv.py b/wafo/stats/rv.py
similarity index 100%
rename from pywafo/src/wafo/stats/rv.py
rename to wafo/stats/rv.py
diff --git a/pywafo/src/wafo/stats/six.py b/wafo/stats/six.py
similarity index 100%
rename from pywafo/src/wafo/stats/six.py
rename to wafo/stats/six.py
diff --git a/pywafo/src/wafo/stats/stats.py b/wafo/stats/stats.py
similarity index 100%
rename from pywafo/src/wafo/stats/stats.py
rename to wafo/stats/stats.py
diff --git a/pywafo/src/wafo/stats/tests/__init__.py b/wafo/stats/tests/__init__.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/__init__.py
rename to wafo/stats/tests/__init__.py
diff --git a/pywafo/src/wafo/stats/tests/common_tests.py b/wafo/stats/tests/common_tests.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/common_tests.py
rename to wafo/stats/tests/common_tests.py
diff --git a/wafo/stats/tests/conftest.py b/wafo/stats/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/wafo/stats/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/pywafo/src/wafo/stats/tests/test_binned_statistic.py b/wafo/stats/tests/test_binned_statistic.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_binned_statistic.py
rename to wafo/stats/tests/test_binned_statistic.py
diff --git a/pywafo/src/wafo/stats/tests/test_contingency.py b/wafo/stats/tests/test_contingency.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_contingency.py
rename to wafo/stats/tests/test_contingency.py
diff --git a/pywafo/src/wafo/stats/tests/test_continuous_basic.py b/wafo/stats/tests/test_continuous_basic.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_continuous_basic.py
rename to wafo/stats/tests/test_continuous_basic.py
diff --git a/pywafo/src/wafo/stats/tests/test_discrete_basic.py b/wafo/stats/tests/test_discrete_basic.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_discrete_basic.py
rename to wafo/stats/tests/test_discrete_basic.py
diff --git a/pywafo/src/wafo/stats/tests/test_distributions.py b/wafo/stats/tests/test_distributions.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_distributions.py
rename to wafo/stats/tests/test_distributions.py
diff --git a/pywafo/src/wafo/stats/tests/test_fit.py b/wafo/stats/tests/test_fit.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_fit.py
rename to wafo/stats/tests/test_fit.py
diff --git a/pywafo/src/wafo/stats/tests/test_kdeoth.py b/wafo/stats/tests/test_kdeoth.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_kdeoth.py
rename to wafo/stats/tests/test_kdeoth.py
diff --git a/pywafo/src/wafo/stats/tests/test_morestats.py b/wafo/stats/tests/test_morestats.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_morestats.py
rename to wafo/stats/tests/test_morestats.py
diff --git a/pywafo/src/wafo/stats/tests/test_mstats_basic.py b/wafo/stats/tests/test_mstats_basic.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_mstats_basic.py
rename to wafo/stats/tests/test_mstats_basic.py
diff --git a/pywafo/src/wafo/stats/tests/test_mstats_extras.py b/wafo/stats/tests/test_mstats_extras.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_mstats_extras.py
rename to wafo/stats/tests/test_mstats_extras.py
diff --git a/pywafo/src/wafo/stats/tests/test_multivariate.py b/wafo/stats/tests/test_multivariate.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_multivariate.py
rename to wafo/stats/tests/test_multivariate.py
diff --git a/pywafo/src/wafo/stats/tests/test_rank.py b/wafo/stats/tests/test_rank.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_rank.py
rename to wafo/stats/tests/test_rank.py
diff --git a/pywafo/src/wafo/stats/tests/test_stats.py b/wafo/stats/tests/test_stats.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_stats.py
rename to wafo/stats/tests/test_stats.py
diff --git a/pywafo/src/wafo/stats/tests/test_tukeylambda_stats.py b/wafo/stats/tests/test_tukeylambda_stats.py
similarity index 100%
rename from pywafo/src/wafo/stats/tests/test_tukeylambda_stats.py
rename to wafo/stats/tests/test_tukeylambda_stats.py
diff --git a/pywafo/src/wafo/stats/twolumps.py b/wafo/stats/twolumps.py
similarity index 100%
rename from pywafo/src/wafo/stats/twolumps.py
rename to wafo/stats/twolumps.py
diff --git a/pywafo/src/wafo/stats/vonmises.py b/wafo/stats/vonmises.py
similarity index 100%
rename from pywafo/src/wafo/stats/vonmises.py
rename to wafo/stats/vonmises.py
diff --git a/pywafo/src/wafo/stats/vonmises_cython.pyx b/wafo/stats/vonmises_cython.pyx
similarity index 100%
rename from pywafo/src/wafo/stats/vonmises_cython.pyx
rename to wafo/stats/vonmises_cython.pyx
diff --git a/wafo/tests/__init__.py b/wafo/tests/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/wafo/tests/__init__.py
@@ -0,0 +1 @@
+
diff --git a/wafo/tests/conftest.py b/wafo/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/wafo/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/wafo/tests/test_gaussian.py b/wafo/tests/test_gaussian.py
new file mode 100644
index 0000000..ae0fff8
--- /dev/null
+++ b/wafo/tests/test_gaussian.py
@@ -0,0 +1,160 @@
+'''
+Created on 17. juli 2010
+
+@author: pab
+'''
+import numpy as np # @UnusedImport
+from numpy import pi, inf # @UnusedImport
+from numpy.testing import assert_array_almost_equal
+from wafo.gaussian import (Rind, prbnormtndpc, prbnormndpc, prbnormnd,
+ cdfnorm2d, prbnorm2d)
+from numpy.ma.testutils import assert_array_almost_equal
+
+
+def test_rind():
+
+ Et = 0.001946 # exact prob.
+ n = 5
+ Blo = -np.inf
+ Bup = -1.2
+ indI = [-1, n - 1] # Barriers
+ m = np.zeros(n)
+ rho = 0.3
+ Sc = (np.ones((n, n)) - np.eye(n)) * rho + np.eye(n)
+ rind = Rind()
+ E0, err0, terr0 = rind(Sc, m, Blo, Bup, indI)
+
+ assert(np.abs(E0 - Et) < err0 + terr0)
+
+ t = 'E0 = %2.6f' % E0
+ assert(t == 'E0 = 0.001946')
+
+ A = np.repeat(Blo, n)
+ B = np.repeat(Bup, n) # Integration limits
+ E1, err1, terr1 = rind(np.triu(Sc), m, A, B) # same as E0
+ assert(np.abs(E1 - Et) < err0 + terr0)
+
+ t = 'E1 = %2.5f' % E1
+ assert(t == 'E1 = 0.00195')
+
+ # Compute expectation E( abs(X1*X2*...*X5) )
+ xc = np.zeros((0, 1))
+ infinity = 37
+ dev = np.sqrt(np.diag(Sc)) # std
+ ind = np.nonzero(indI[1:])[0]
+ Bup, Blo = np.atleast_2d(Bup, Blo)
+ Bup[0, ind] = np.minimum(Bup[0, ind], infinity * dev[indI[ind + 1]])
+ Blo[0, ind] = np.maximum(Blo[0, ind], -infinity * dev[indI[ind + 1]])
+ val, err, terr = rind(Sc, m, Blo, Bup, indI, xc, nt=0)
+ assert_array_almost_equal(val, 0.05494076)
+ assert(err < 0.001)
+ assert_array_almost_equal(terr, 1.00000000e-10)
+
+ # Compute expectation E( X1^{+}*X2^{+} ) with random
+ # correlation coefficient,Cov(X1,X2) = rho2.
+ m2 = [0, 0]
+ rho2 = 0.3 # np.random.rand(1)
+ Sc2 = [[1, rho2], [rho2, 1]]
+ Blo2 = 0
+ Bup2 = np.inf
+ indI2 = [-1, 1]
+ rind2 = Rind(method=1)
+ g2 = lambda x: (
+ x * (np.pi / 2 + np.arcsin(x)) + np.sqrt(1 - x**2)) / (2 * np.pi)
+ assert_array_almost_equal(g2(rho2), 0.24137214191774381) # exact value
+
+ E3, err3, terr3 = rind(Sc2, m2, Blo2, Bup2, indI2, nt=0)
+ assert_array_almost_equal(E3, 0.24127499)
+ assert_array_almost_equal(err3, 0.00013838)
+ assert_array_almost_equal(terr3, 1.00000000e-10)
+
+ E4, err4, terr4 = rind2(Sc2, m2, Blo2, Bup2, indI2, nt=0)
+ assert_array_almost_equal(E4, 0.24127499)
+ assert_array_almost_equal(err4, 0.00013838)
+ assert_array_almost_equal(terr4, 1.00000000e-10)
+#
+# >>> E5, err5, terr5 = rind2(Sc2,m2,Blo2,Bup2,indI2,nt=0,abseps=1e-4)
+# array([ 0.24127499])
+# array([ 0.00013838])
+# array([ 1.00000000e-10])
+
+
+def test_prbnormtndpc():
+
+ rho2 = np.random.rand(2)
+ a2 = np.zeros(2)
+ b2 = np.repeat(np.inf, 2)
+ [val2, err2, ift2] = prbnormtndpc(rho2, a2, b2)
+ g2 = lambda x: 0.25 + np.arcsin(x[0] * x[1]) / (2 * pi)
+ E2 = g2(rho2) # % exact value
+ assert(np.abs(E2 - val2) < err2)
+
+ rho3 = np.random.rand(3)
+ a3 = np.zeros(3)
+ b3 = np.repeat(inf, 3)
+ [val3, err3, ift3] = prbnormtndpc(rho3, a3, b3)
+ g3 = lambda x: 0.5 - \
+ sum(np.sort(
+ np.arccos([x[0] * x[1], x[0] * x[2], x[1] * x[2]]))) / (4 * pi)
+ E3 = g3(rho3) # Exact value
+ assert(np.abs(E3 - val3) < err3)
+
+
+def test_prbnormndpc():
+
+ rho2 = np.random.rand(2)
+ a2 = np.zeros(2)
+ b2 = np.repeat(np.inf, 2)
+ [val2, err2, ift2] = prbnormndpc(rho2, a2, b2)
+ g2 = lambda x: 0.25 + np.arcsin(x[0] * x[1]) / (2 * pi)
+ E2 = g2(rho2) # % exact value
+ assert(np.abs(E2 - val2) < err2)
+
+ rho3 = np.random.rand(3)
+ a3 = np.zeros(3)
+ b3 = np.repeat(inf, 3)
+ [val3, err3, ift3] = prbnormndpc(rho3, a3, b3)
+ g3 = lambda x: 0.5 - sum(np.sort(np.arccos([x[0] * x[1], x[0] * x[2],
+ x[1] * x[2]]))) / (4 * pi)
+ E3 = g3(rho3) # Exact value
+ assert(np.abs(E3 - val3) < err3)
+
+
+def test_prbnormnd():
+
+ Et = 0.001946 # exact prob.
+ n = 5
+ Blo = -np.inf
+ Bup = -1.2
+ m = np.zeros(n)
+ rho = 0.3
+ Sc = (np.ones((n, n)) - np.eye(n)) * rho + np.eye(n)
+ A = np.repeat(Blo, n)
+ B = np.repeat(Bup, n) - m
+ [val, err, _inform] = prbnormnd(Sc, A, B)
+ assert(np.abs(val - Et) < err)
+
+ t = 'val = %2.5f' % val
+ assert(t == 'val = 0.00195')
+
+
+def test_cdfnorm2d():
+ x = np.linspace(-3, 3, 3)
+ [b1, b2] = np.meshgrid(x, x)
+ r = 0.3
+ truth = [[2.38515157e-05, 1.14504149e-03, 1.34987703e-03],
+ [1.14504149e-03, 2.98493342e-01, 4.99795143e-01],
+ [1.34987703e-03, 4.99795143e-01, 9.97324055e-01]]
+ assert_array_almost_equal(cdfnorm2d(b1, b2, r), truth)
+
+
+def test_prbnorm2d():
+
+ a = [-1, -2]
+ b = [1, 1]
+ r = 0.3
+ assert_array_almost_equal(prbnorm2d(a,b,r), [ 0.56659121])
+
+if __name__ == '__main__':
+ import doctest
+ doctest.testmod()
diff --git a/pywafo/src/wafo/test/test_integrate.py b/wafo/tests/test_integrate.py
similarity index 100%
rename from pywafo/src/wafo/test/test_integrate.py
rename to wafo/tests/test_integrate.py
diff --git a/pywafo/src/wafo/test/test_kdetools.py b/wafo/tests/test_kdetools.py
similarity index 100%
rename from pywafo/src/wafo/test/test_kdetools.py
rename to wafo/tests/test_kdetools.py
diff --git a/pywafo/src/wafo/test/test_misc.py b/wafo/tests/test_misc.py
similarity index 99%
rename from pywafo/src/wafo/test/test_misc.py
rename to wafo/tests/test_misc.py
index b016240..adda210 100644
--- a/pywafo/src/wafo/test/test_misc.py
+++ b/wafo/tests/test_misc.py
@@ -380,7 +380,7 @@ def test_nextpow2():
def test_discretize():
- x, y = discretize(np.cos, 0, np.pi)
+ x, y = discretize(np.cos, 0, np.pi, tol=0.0051)
assert_array_almost_equal(
x,
np.array(
diff --git a/pywafo/src/wafo/test/test_numpy_utils.py b/wafo/tests/test_numpy_utils.py
similarity index 100%
rename from pywafo/src/wafo/test/test_numpy_utils.py
rename to wafo/tests/test_numpy_utils.py
diff --git a/pywafo/src/wafo/test/test_objects.py b/wafo/tests/test_objects.py
similarity index 100%
rename from pywafo/src/wafo/test/test_objects.py
rename to wafo/tests/test_objects.py
diff --git a/pywafo/src/wafo/test/test_padua.py b/wafo/tests/test_padua.py
similarity index 61%
rename from pywafo/src/wafo/test/test_padua.py
rename to wafo/tests/test_padua.py
index c9372fb..589a93c 100644
--- a/pywafo/src/wafo/test/test_padua.py
+++ b/wafo/tests/test_padua.py
@@ -4,33 +4,34 @@ import unittest
import numpy as np
from numpy import cos, pi
from numpy.testing import assert_array_almost_equal
-from wafo.padua import (padua_points, testfunct, padua_fit,
+from wafo.padua import (padua_points, example_functions, padua_fit,
padua_fit2,
padua_cubature, padua_val)
class PaduaTestCase(unittest.TestCase):
+
def test_padua_points_degree0(self):
pad = padua_points(0)
- expected = [[-1],[-1]]
+ expected = [[-1], [-1]]
assert_array_almost_equal(pad, expected, 15)
def test_padua_points_degree1(self):
pad = padua_points(1)
- expected = [cos(np.r_[0,1,1]*pi),
- cos(np.r_[1,0,2]*pi/2)]
+ expected = [cos(np.r_[0, 1, 1] * pi),
+ cos(np.r_[1, 0, 2] * pi / 2)]
assert_array_almost_equal(pad, expected, 15)
def test_padua_points_degree2(self):
- pad = padua_points(2, domain=[0,1,0,2])
- expected = [(cos(np.r_[0,0,1,1,2,2]*pi/2)+1)/2,
- cos(np.r_[1,3,0,2,1,3]*pi/3)+1]
+ pad = padua_points(2, domain=[0, 1, 0, 2])
+ expected = [(cos(np.r_[0, 0, 1, 1, 2, 2] * pi / 2) + 1) / 2,
+ cos(np.r_[1, 3, 0, 2, 1, 3] * pi / 3) + 1]
assert_array_almost_equal(pad, expected, 15)
def test_testfunct(self):
- vals = [testfunct(0, 0, id) for id in range(12)]
+ vals = [example_functions(0, 0, id) for id in range(12)]
expected = [7.664205912849231e-01, 0.7071067811865476, 0,
1.6487212707001282, 1.9287498479639178e-22, 1.0,
1.0, 1.0, 1.0, 0.0, 1.0, 0.0]
@@ -38,38 +39,38 @@ class PaduaTestCase(unittest.TestCase):
def test_padua_fit_even_degree(self):
points = padua_points(10)
- C0f, abs_error = padua_fit(points, testfunct, 6)
+ C0f, _abs_error = padua_fit(points, example_functions, 6)
expected = np.zeros((11, 11))
- expected[0,0] = 1;
+ expected[0, 0] = 1
assert_array_almost_equal(C0f, expected, 15)
def test_padua_fit_odd_degree(self):
points = padua_points(9)
- C0f, abs_error = padua_fit(points, testfunct, 6)
+ C0f, _abs_error = padua_fit(points, example_functions, 6)
expected = np.zeros((10, 10))
- expected[0,0] = 1;
+ expected[0, 0] = 1
assert_array_almost_equal(C0f, expected, 15)
def test_padua_fit_odd_degree2(self):
points = padua_points(9)
- C0f, abs_error = padua_fit2(points, testfunct, 6)
+ C0f, _abs_error = padua_fit2(points, example_functions, 6)
expected = np.zeros((10, 10))
- expected[0,0] = 1;
+ expected[0, 0] = 1
assert_array_almost_equal(C0f, expected, 15)
def test_padua_cubature(self):
- domain = [0,1,0,1]
+ domain = [0, 1, 0, 1]
points = padua_points(500, domain)
- C0f, abs_error = padua_fit(points, testfunct, 0)
+ C0f, _abs_error = padua_fit(points, example_functions, 0)
val = padua_cubature(C0f, domain)
expected = 4.06969589491556e-01
assert_array_almost_equal(val, expected, 15)
def test_padua_val_unordered(self):
- domain = [0,1,0,1]
+ domain = [0, 1, 0, 1]
points = padua_points(20, domain)
- C0f, abs_error = padua_fit(points, testfunct, 0)
- X = [0,0.5,1]
+ C0f, _abs_error = padua_fit(points, example_functions, 0)
+ X = [0, 0.5, 1]
val = padua_val(X, X, C0f, domain)
expected = [7.664205912849228e-01, 3.2621734202884815e-01,
@@ -77,13 +78,13 @@ class PaduaTestCase(unittest.TestCase):
assert_array_almost_equal(val, expected, 14)
def test_padua_val_grid(self):
- domain = [0,1,0,1]
+ domain = [0, 1, 0, 1]
a, b, c, d = domain
points = padua_points(21, domain)
- C0f, abs_error = padua_fit(points, testfunct, 0)
+ C0f, _abs_error = padua_fit(points, example_functions, 0)
X1 = np.linspace(a, b, 2)
X2 = np.linspace(c, d, 2)
- val = padua_val(X1, X2, C0f,domain, use_meshgrid=True);
- expected = [[7.664205912849229e-01,1.0757071952145181e-01],
- [2.703371615911344e-01,3.5734971024838565e-02]]
+ val = padua_val(X1, X2, C0f, domain, use_meshgrid=True)
+ expected = [[7.664205912849229e-01, 1.0757071952145181e-01],
+ [2.703371615911344e-01, 3.5734971024838565e-02]]
assert_array_almost_equal(val, expected, 14)
diff --git a/pywafo/src/wafo/transform/__init__.py b/wafo/transform/__init__.py
similarity index 100%
rename from pywafo/src/wafo/transform/__init__.py
rename to wafo/transform/__init__.py
diff --git a/pywafo/src/wafo/transform/core.py b/wafo/transform/core.py
similarity index 100%
rename from pywafo/src/wafo/transform/core.py
rename to wafo/transform/core.py
diff --git a/pywafo/src/wafo/transform/estimation.py b/wafo/transform/estimation.py
similarity index 100%
rename from pywafo/src/wafo/transform/estimation.py
rename to wafo/transform/estimation.py
diff --git a/pywafo/src/wafo/transform/models.py b/wafo/transform/models.py
similarity index 100%
rename from pywafo/src/wafo/transform/models.py
rename to wafo/transform/models.py
diff --git a/pywafo/src/wafo/transform/test/__init__.py b/wafo/transform/tests/__init__.py
similarity index 100%
rename from pywafo/src/wafo/transform/test/__init__.py
rename to wafo/transform/tests/__init__.py
diff --git a/wafo/transform/tests/conftest.py b/wafo/transform/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/wafo/transform/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/wafo/transform/tests/test_models.py b/wafo/transform/tests/test_models.py
new file mode 100644
index 0000000..ee56670
--- /dev/null
+++ b/wafo/transform/tests/test_models.py
@@ -0,0 +1,45 @@
+from wafo.transform.models import TrHermite, TrOchi, TrLinear
+import numpy as np
+from numpy.testing import assert_array_almost_equal
+
+def test_trhermite():
+
+ std = 7. / 4
+ g = TrHermite(sigma=std, ysigma=std)
+ assert(np.abs(g.dist2gauss() - 0.88230868748851554) < 1e-7)
+
+ assert(g.mean == 0.0)
+ assert(g.sigma == 1.75)
+ vals = g.dat2gauss([0, 1, 2, 3])
+ true_vals = np.array([0.04654321, 1.03176393, 1.98871279, 2.91930895])
+ assert((np.abs(vals - true_vals) < 1e-7).all())
+
+
+def test_trochi():
+
+ std = 7. / 4
+ g = TrOchi(sigma=std, ysigma=std)
+ assert_array_almost_equal(g.dist2gauss(), 1.4106988010566603)
+ assert_array_almost_equal(g.mean, 0.0)
+ assert_array_almost_equal(g.sigma, 1.75)
+ vals = g.dat2gauss([0, 1, 2, 3])
+ true_vals = np.array([6.21927960e-04, 9.90237621e-01, 1.96075606e+00,
+ 2.91254576e+00])
+ assert_array_almost_equal(vals, true_vals)
+ # assert((np.abs(vals - true_vals) < 1e-7).all())
+
+
+def test_trlinear():
+
+ std = 7. / 4
+ g = TrLinear(sigma=std, ysigma=std)
+ assert(g.dist2gauss() == 0.0)
+ assert(g.mean == 0.0)
+ assert(g.sigma == 1.75)
+ vals = g.dat2gauss([0, 1, 2, 3])
+ true_vals = np.array([0., 1., 2., 3.])
+ assert((np.abs(vals - true_vals) < 1e-7).all())
+
+if __name__ == '__main__':
+ import nose
+ nose.run()
diff --git a/pywafo/src/wafo/transform/test/test_trdata.py b/wafo/transform/tests/test_trdata.py
similarity index 100%
rename from pywafo/src/wafo/transform/test/test_trdata.py
rename to wafo/transform/tests/test_trdata.py
diff --git a/wafo/version.py b/wafo/version.py
new file mode 100644
index 0000000..b6a96c7
--- /dev/null
+++ b/wafo/version.py
@@ -0,0 +1,4 @@
+# THIS FILE IS GENERATED FROM SETUP.PY
+short_version='0.1.2'
+version='0.1.2'
+release=False
diff --git a/pywafo/src/wafo/wafodata.py b/wafo/wafodata.py
similarity index 100%
rename from pywafo/src/wafo/wafodata.py
rename to wafo/wafodata.py
diff --git a/pywafo/src/wafo/wave_theory/__init__.py b/wafo/wave_theory/__init__.py
similarity index 100%
rename from pywafo/src/wafo/wave_theory/__init__.py
rename to wafo/wave_theory/__init__.py
diff --git a/pywafo/src/wafo/wave_theory/core.py b/wafo/wave_theory/core.py
similarity index 100%
rename from pywafo/src/wafo/wave_theory/core.py
rename to wafo/wave_theory/core.py
diff --git a/pywafo/src/wafo/wave_theory/dispersion_relation.py b/wafo/wave_theory/dispersion_relation.py
similarity index 100%
rename from pywafo/src/wafo/wave_theory/dispersion_relation.py
rename to wafo/wave_theory/dispersion_relation.py
diff --git a/pywafo/src/wafo/wave_theory/test/__init__.py b/wafo/wave_theory/tests/__init__.py
similarity index 100%
rename from pywafo/src/wafo/wave_theory/test/__init__.py
rename to wafo/wave_theory/tests/__init__.py
diff --git a/wafo/wave_theory/tests/conftest.py b/wafo/wave_theory/tests/conftest.py
new file mode 100644
index 0000000..356cf9c
--- /dev/null
+++ b/wafo/wave_theory/tests/conftest.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ Dummy conftest.py for wafo.
+
+ If you don't know what this is for, just leave it empty.
+ Read more about conftest.py under:
+ https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest
diff --git a/pywafo/src/wafo/wave_theory/test/test_dispersion_relation.py b/wafo/wave_theory/tests/test_dispersion_relation.py
similarity index 100%
rename from pywafo/src/wafo/wave_theory/test/test_dispersion_relation.py
rename to wafo/wave_theory/tests/test_dispersion_relation.py
diff --git a/pywafo/src/wafo/win32_utils.py b/wafo/win32_utils.py
similarity index 100%
rename from pywafo/src/wafo/win32_utils.py
rename to wafo/win32_utils.py