[python-escript] 01/04: Upstream release 4.2.0.1
Joel Fenwick
jfenwick-guest at moszumanska.debian.org
Tue Apr 5 02:58:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
jfenwick-guest pushed a commit to branch debian
in repository python-escript.
commit bc88e20138a7f3baa8d4f87fd522a67334574e69
Author: Joel Fenwick <joelfenwick at uq.edu.au>
Date: Mon Apr 4 10:50:47 2016 +1000
Upstream release 4.2.0.1
---
README_LICENSE | 2 +-
SConstruct | 45 +-
cusplibrary/SConscript | 6 +-
cusplibrary/build/build-env.py | 6 +-
cusplibrary/build/nvcc.py | 6 +-
cusplibrary/performance/spmv/scripts/benchmark.py | 6 +-
cusplibrary/testing/data/random_10x10/generator.py | 6 +-
debian/changelog | 7 +-
debian/copyright | 55 +-
debian/utils/cppy.py | 6 +-
doc/SConscript | 14 +-
doc/completedevs.tex | 6 +-
doc/cookbook/SConscript | 6 +-
doc/cookbook/cookbook.bib | 6 +-
doc/cookbook/cookbook.tex | 12 +-
doc/cookbook/cookbook_defs.tex | 6 +-
doc/cookbook/einsteinETA.tex | 6 +-
doc/cookbook/escpybas.tex | 6 +-
doc/cookbook/example01.tex | 6 +-
doc/cookbook/example02.tex | 6 +-
doc/cookbook/example03.tex | 6 +-
doc/cookbook/example04.tex | 6 +-
doc/cookbook/example05.tex | 6 +-
doc/cookbook/example07.tex | 6 +-
doc/cookbook/example08.tex | 6 +-
doc/cookbook/example09.tex | 6 +-
doc/cookbook/example10.tex | 6 +-
doc/cookbook/example11.tex | 6 +-
doc/cookbook/intro.tex | 6 +-
doc/cookbook/quickstart.tex | 6 +-
doc/copyrights.tex | 12 +-
doc/currentdev.tex | 6 +-
doc/docguide.tex | 6 +-
doc/doxygen/SConscript | 6 +-
doc/doxygen/doxygen_esys | 2 +-
doc/elist.tex | 6 +-
doc/epydoc/SConscript | 6 +-
doc/examples/SConscript | 6 +-
doc/examples/cookbook/cblib.py | 12 +-
doc/examples/cookbook/cblib1.py | 12 +-
doc/examples/cookbook/cerjen.py | 6 +-
doc/examples/cookbook/example01a.py | 12 +-
doc/examples/cookbook/example01b.py | 12 +-
doc/examples/cookbook/example01c.py | 12 +-
doc/examples/cookbook/example02.py | 12 +-
doc/examples/cookbook/example03a.py | 12 +-
doc/examples/cookbook/example03b.py | 12 +-
doc/examples/cookbook/example04a.py | 12 +-
doc/examples/cookbook/example04b.py | 12 +-
doc/examples/cookbook/example05a.py | 12 +-
doc/examples/cookbook/example05b.py | 12 +-
doc/examples/cookbook/example05c.py | 12 +-
doc/examples/cookbook/example06.py | 12 +-
doc/examples/cookbook/example07a.py | 12 +-
doc/examples/cookbook/example07b.py | 12 +-
doc/examples/cookbook/example08a.py | 12 +-
doc/examples/cookbook/example08b.py | 12 +-
doc/examples/cookbook/example08c.py | 12 +-
doc/examples/cookbook/example09a.py | 12 +-
doc/examples/cookbook/example09b.py | 12 +-
doc/examples/cookbook/example09c.py | 12 +-
doc/examples/cookbook/example09m.py | 12 +-
doc/examples/cookbook/example09n.py | 12 +-
doc/examples/cookbook/example10a.py | 12 +-
doc/examples/cookbook/example10b.py | 12 +-
doc/examples/cookbook/example10c_0.py | 12 +-
doc/examples/cookbook/example10c_1.py | 12 +-
doc/examples/cookbook/example10d.py | 12 +-
doc/examples/cookbook/example10e.py | 12 +-
doc/examples/cookbook/example10m.py | 12 +-
doc/examples/cookbook/example10p.py | 12 +-
doc/examples/cookbook/example11a.py | 12 +-
doc/examples/cookbook/example11b.py | 12 +-
doc/examples/cookbook/example11c.py | 12 +-
doc/examples/cookbook/example11m.py | 12 +-
doc/examples/cookbook/wave_stab.py | 12 +-
doc/examples/cookbook/wavesolver2d001.py | 12 +-
doc/examples/cookbook/wavesolver2d002.py | 12 +-
doc/examples/cookbook/wavesolver2d003.py | 12 +-
doc/examples/cookbook/wavesolver2d004.py | 12 +-
doc/examples/geotutorial/backward_euler.py | 12 +-
doc/examples/geotutorial/forward_euler.py | 12 +-
doc/examples/geotutorial/myfirstscript.py | 12 +-
doc/examples/geotutorial/steadystate.py | 12 +-
doc/examples/geotutorial/steadystate_variablek.py | 12 +-
doc/examples/inversion/create_netcdf.py | 6 +-
doc/examples/inversion/dc_forward.py | 6 +-
doc/examples/inversion/grav_ermapper.py | 12 +-
doc/examples/inversion/grav_netcdf.py | 12 +-
doc/examples/inversion/gravmag_netcdf.py | 12 +-
doc/examples/inversion/gravmag_nodriver.py | 12 +-
doc/examples/inversion/gravmag_wgs84_nodriver.py | 12 +-
doc/examples/inversion/mag_netcdf.py | 12 +-
doc/examples/inversion/mag_wgs84_netcdf.py | 12 +-
doc/examples/inversion/plot_ermapper.py | 6 +-
doc/examples/inversion/plot_netcdf.py | 6 +-
doc/examples/inversion/strong_gravmag_netcdf.py | 12 +-
doc/examples/inversion/synthetic_HTI.py | 10 +-
doc/examples/inversion/synthetic_TTI.py | 12 +-
doc/examples/inversion/synthetic_VTI.py | 12 +-
doc/examples/inversion/synthetic_sonic.py | 12 +-
doc/examples/inversion/synthetic_sonicHTI.py | 12 +-
doc/examples/inversion/test_commemi1.py | 6 +-
doc/examples/inversion/test_commemi4.py | 6 +-
doc/examples/usersguide/brick.py | 12 +-
doc/examples/usersguide/brick_stl.py | 12 +-
doc/examples/usersguide/darcy.py | 12 +-
doc/examples/usersguide/diffusion.py | 12 +-
doc/examples/usersguide/dirac.py | 12 +-
doc/examples/usersguide/fluid.py | 6 +-
doc/examples/usersguide/heatedblock.py | 12 +-
doc/examples/usersguide/helmholtz.py | 12 +-
doc/examples/usersguide/int_save.py | 12 +-
doc/examples/usersguide/lame.py | 6 +-
doc/examples/usersguide/lid_driven_cavity.py | 12 +-
doc/examples/usersguide/mount.py | 12 +-
doc/examples/usersguide/poisson.py | 12 +-
doc/examples/usersguide/poisson_matplotlib.py | 12 +-
doc/examples/usersguide/poisson_vtk.py | 12 +-
doc/examples/usersguide/quad.py | 12 +-
doc/examples/usersguide/refine.py | 12 +-
doc/examples/usersguide/slip.py | 12 +-
doc/examples/usersguide/trapezoid.py | 12 +-
doc/examples/usersguide/voxet_reader.py | 6 +-
doc/examples/usersguide/wave.py | 12 +-
doc/install/SConscript | 6 +-
doc/install/allsrccommon.tex | 6 +-
doc/install/binlinux.tex | 6 +-
doc/install/binmac.tex | 6 +-
doc/install/chcomp.tex | 6 +-
doc/install/compiler.tex | 6 +-
doc/install/debbin.tex | 6 +-
doc/install/install.tex | 8 +-
doc/install/install_defs.tex | 6 +-
doc/install/intro.tex | 23 +-
doc/install/source.tex | 39 +-
doc/install/srcadditional.tex | 6 +-
doc/install/srclinux.tex | 6 +-
doc/install/srcmac.tex | 6 +-
doc/inversion/CookDcRes.tex | 6 +-
doc/inversion/Forward2DMTTEMode.tex | 6 +-
doc/inversion/ForwardDCRES.tex | 6 +-
doc/inversion/ForwardGravity.tex | 6 +-
doc/inversion/ForwardMagnetic.tex | 6 +-
doc/inversion/ForwardSelfMagnetic.tex | 6 +-
doc/inversion/Minimization.tex | 6 +-
doc/inversion/SConscript | 6 +-
doc/inversion/defs.tex | 6 +-
doc/inversion/intro.tex | 6 +-
doc/inversion/inversion.tex | 12 +-
doc/sphinx_api/SConscript | 6 +-
doc/sphinx_api/genrst.py | 6 +-
doc/user/Models.tex | 6 +-
doc/user/SConscript | 6 +-
doc/user/TutorialPDE.tex | 6 +-
doc/user/appendix.tex | 6 +-
doc/user/changes.tex | 19 +-
doc/user/darcyflux.tex | 6 +-
doc/user/diffusion.tex | 6 +-
doc/user/dirac.tex | 6 +-
doc/user/escript.tex | 6 +-
doc/user/execute.tex | 6 +-
doc/user/faultsystem.tex | 6 +-
doc/user/finley.tex | 6 +-
doc/user/finleyelements.tex | 6 +-
doc/user/firststep.tex | 6 +-
doc/user/heatedblock.tex | 6 +-
doc/user/levelset.tex | 6 +-
doc/user/levelsetmodel.tex | 6 +-
doc/user/linearPDE.tex | 6 +-
doc/user/lumping.tex | 6 +-
doc/user/modelframe.tex | 6 +-
doc/user/nonlinearPDE.tex | 6 +-
doc/user/notation.tex | 6 +-
doc/user/ourrefs.tex | 6 +-
doc/user/py3.tex | 6 +-
doc/user/pycad.tex | 6 +-
doc/user/ripley.tex | 6 +-
doc/user/slip.tex | 6 +-
doc/user/speckley.tex | 6 +-
doc/user/stokesflow.tex | 6 +-
doc/user/stokessolver.tex | 6 +-
doc/user/subworlds.tex | 6 +-
doc/user/symbolic.tex | 6 +-
doc/user/user.tex | 6 +-
doc/user/user_defs.tex | 6 +-
doc/user/wave.tex | 6 +-
doc/user/weipa.tex | 6 +-
doc/verinfo.tex | 6 +-
downunder/py_src/SConscript | 6 +-
downunder/py_src/__init__.py | 12 +-
downunder/py_src/coordinates.py | 34 +-
downunder/py_src/costfunctions.py | 12 +-
downunder/py_src/datasources.py | 13 +-
downunder/py_src/dcresistivityforwardmodeling.py | 6 +-
downunder/py_src/domainbuilder.py | 12 +-
downunder/py_src/forwardmodels/__init__.py | 12 +-
downunder/py_src/forwardmodels/acoustic.py | 16 +-
downunder/py_src/forwardmodels/base.py | 16 +-
downunder/py_src/forwardmodels/dcresistivity.py | 16 +-
downunder/py_src/forwardmodels/gravity.py | 12 +-
downunder/py_src/forwardmodels/magnetic.py | 12 +-
.../py_src/forwardmodels/magnetotelluric2d.py | 142 +-
downunder/py_src/forwardmodels/pressure.py | 16 +-
downunder/py_src/forwardmodels/subsidence.py | 12 +-
downunder/py_src/inversioncostfunctions.py | 12 +-
downunder/py_src/inversions.py | 22 +-
downunder/py_src/magtel1d.py | 8 +-
downunder/py_src/magtel2d.py | 17 +-
downunder/py_src/mappings.py | 12 +-
downunder/py_src/minimizers.py | 12 +-
downunder/py_src/regularizations.py | 16 +-
downunder/py_src/seismic.py | 12 +-
downunder/py_src/splitinversioncostfunctions.py | 70 +-
downunder/py_src/splitminimizers.py | 39 +-
downunder/py_src/splitregularizations.py | 16 +-
downunder/test/python/SConscript | 6 +-
downunder/test/python/inversion_acoustictest_2d.py | 12 +-
downunder/test/python/run_comm1.py | 27 +-
downunder/test/python/run_comm4.py | 20 +-
downunder/test/python/run_coordinates.py | 12 +-
downunder/test/python/run_datasources.py | 12 +-
downunder/test/python/run_dcforward.py | 6 +-
downunder/test/python/run_domainbuilder.py | 12 +-
downunder/test/python/run_forward.py | 87 +-
downunder/test/python/run_gravity.py | 12 +-
downunder/test/python/run_inversion_gravmag_2d.py | 12 +-
downunder/test/python/run_inversioncostfunction.py | 14 +-
downunder/test/python/run_magnetic.py | 12 +-
downunder/test/python/run_mappings.py | 12 +-
downunder/test/python/run_minimizers.py | 12 +-
downunder/test/python/run_regularization.py | 12 +-
downunder/test/python/run_seismic.py | 12 +-
dudley/benchmarks/dudleybench.py | 12 +-
dudley/benchmarks/runbenchmark.py | 12 +-
dudley/py_src/SConscript | 6 +-
dudley/py_src/__init__.py | 12 +-
dudley/py_src/factorywrappers.py | 12 +-
dudley/py_src/readers.py | 12 +-
dudley/src/Assemble.h | 6 +-
dudley/src/Assemble_AverageElementData.cpp | 6 +-
dudley/src/Assemble_CopyElementData.cpp | 6 +-
dudley/src/Assemble_CopyNodalData.cpp | 6 +-
dudley/src/Assemble_LumpedSystem.cpp | 6 +-
dudley/src/Assemble_NodeCoordinates.cpp | 6 +-
dudley/src/Assemble_PDE.cpp | 6 +-
dudley/src/Assemble_PDE_Points.cpp | 6 +-
dudley/src/Assemble_PDE_Single2_1D.cpp | 6 +-
dudley/src/Assemble_PDE_Single2_2D.cpp | 6 +-
dudley/src/Assemble_PDE_Single2_3D.cpp | 6 +-
dudley/src/Assemble_PDE_System2_1D.cpp | 6 +-
dudley/src/Assemble_PDE_System2_2D.cpp | 6 +-
dudley/src/Assemble_PDE_System2_3D.cpp | 6 +-
dudley/src/Assemble_addToSystemMatrix.cpp | 6 +-
dudley/src/Assemble_getAssembleParameters.cpp | 6 +-
dudley/src/Assemble_getSize.cpp | 6 +-
dudley/src/Assemble_gradient.cpp | 6 +-
dudley/src/Assemble_integrate.cpp | 6 +-
dudley/src/Assemble_interpolate.cpp | 6 +-
dudley/src/Assemble_jacobeans.cpp | 6 +-
dudley/src/Assemble_setNormal.cpp | 6 +-
dudley/src/CPPAdapter/DudleyAdapterException.cpp | 6 +-
dudley/src/CPPAdapter/DudleyAdapterException.h | 6 +-
dudley/src/CPPAdapter/DudleyError.cpp | 6 +-
dudley/src/CPPAdapter/DudleyError.h | 6 +-
dudley/src/CPPAdapter/MeshAdapter.cpp | 6 +-
dudley/src/CPPAdapter/MeshAdapter.h | 6 +-
dudley/src/CPPAdapter/MeshAdapterFactory.cpp | 6 +-
dudley/src/CPPAdapter/MeshAdapterFactory.h | 6 +-
dudley/src/CPPAdapter/dudleycpp.cpp | 8 +-
dudley/src/CPPAdapter/system_dep.h | 6 +-
dudley/src/Dudley.cpp | 6 +-
dudley/src/Dudley.h | 6 +-
dudley/src/DudleyVersion.h | 8 +-
dudley/src/ElementFile.cpp | 6 +-
dudley/src/ElementFile.h | 6 +-
dudley/src/ElementFile_allocTable.cpp | 6 +-
dudley/src/ElementFile_copyTable.cpp | 6 +-
dudley/src/ElementFile_createColoring.cpp | 6 +-
dudley/src/ElementFile_distributeByRankOfDOF.cpp | 6 +-
dudley/src/ElementFile_gather.cpp | 6 +-
dudley/src/ElementFile_jacobeans.cpp | 6 +-
dudley/src/ElementFile_markNodes.cpp | 6 +-
dudley/src/ElementFile_optimizeOrdering.cpp | 6 +-
dudley/src/ElementFile_relableNodes.cpp | 6 +-
dudley/src/ElementFile_scatter.cpp | 6 +-
dudley/src/ElementFile_setCoordinates.cpp | 6 +-
dudley/src/ElementFile_setNodeRange.cpp | 6 +-
dudley/src/ElementFile_setTags.cpp | 6 +-
dudley/src/ElementType.cpp | 6 +-
dudley/src/ElementType.h | 6 +-
dudley/src/IndexList.cpp | 6 +-
dudley/src/IndexList.h | 6 +-
dudley/src/Mesh.cpp | 6 +-
dudley/src/Mesh.h | 6 +-
dudley/src/Mesh_createNodeFileMappings.cpp | 6 +-
dudley/src/Mesh_distributeByRankOfDOF.cpp | 6 +-
dudley/src/Mesh_findMatchingFaces.cpp | 6 +-
dudley/src/Mesh_getPattern.cpp | 6 +-
dudley/src/Mesh_markNodes.cpp | 6 +-
dudley/src/Mesh_optimizeDOFDistribution.cpp | 6 +-
dudley/src/Mesh_optimizeDOFLabeling.cpp | 6 +-
dudley/src/Mesh_prepare.cpp | 6 +-
dudley/src/Mesh_print.cpp | 6 +-
dudley/src/Mesh_read.cpp | 6 +-
dudley/src/Mesh_readGmsh.cpp | 6 +-
dudley/src/Mesh_relableElementNodes.cpp | 6 +-
dudley/src/Mesh_resolveNodeIds.cpp | 6 +-
dudley/src/Mesh_setCoordinates.cpp | 6 +-
dudley/src/Mesh_tagmaps.cpp | 6 +-
dudley/src/Mesh_tet4.cpp | 6 +-
dudley/src/Mesh_tri3.cpp | 6 +-
dudley/src/Mesh_write.cpp | 6 +-
dudley/src/NodeFile.cpp | 6 +-
dudley/src/NodeFile.h | 6 +-
dudley/src/NodeFile_allocTable.cpp | 6 +-
dudley/src/NodeFile_copyTable.cpp | 6 +-
dudley/src/NodeFile_createDenseLabelings.cpp | 6 +-
dudley/src/NodeFile_gather.cpp | 6 +-
dudley/src/NodeFile_scatter.cpp | 6 +-
dudley/src/NodeFile_setCoordinates.cpp | 6 +-
dudley/src/NodeFile_setIdRange.cpp | 6 +-
dudley/src/NodeFile_setTags.cpp | 6 +-
dudley/src/NodeMapping.cpp | 6 +-
dudley/src/NodeMapping.h | 6 +-
dudley/src/SConscript | 6 +-
dudley/src/ShapeTable.cpp | 6 +-
dudley/src/ShapeTable.h | 6 +-
dudley/src/TagMap.cpp | 6 +-
dudley/src/TagMap.h | 6 +-
dudley/src/TriangularMesh.h | 6 +-
dudley/src/Util.cpp | 6 +-
dudley/src/Util.h | 6 +-
dudley/src/generateReferenceElementList.py | 6 +-
dudley/test/MeshAdapterTestCase.cpp | 6 +-
dudley/test/MeshAdapterTestCase.h | 6 +-
dudley/test/SConscript | 8 +-
dudley/test/dudley_UnitTests.cpp | 6 +-
dudley/test/python/FCT_benchmark.py | 12 +-
dudley/test/python/FCT_test1.py | 12 +-
dudley/test/python/FCT_test2.py | 12 +-
dudley/test/python/OutTest.py | 12 +-
dudley/test/python/PoissonSolverTest.py | 12 +-
dudley/test/python/RT2D.py | 12 +-
dudley/test/python/RecTest.py | 12 +-
dudley/test/python/SConscript | 6 +-
dudley/test/python/axisymm-splitB.py | 12 +-
dudley/test/python/blocktest.py | 12 +-
dudley/test/python/brick.py | 12 +-
dudley/test/python/convection.py | 12 +-
dudley/test/python/fixme_run_generators.py | 12 +-
dudley/test/python/generate_dumps.py | 12 +-
dudley/test/python/generate_meshes.py | 12 +-
dudley/test/python/linearElastic.py | 12 +-
dudley/test/python/rayleigh_taylor_instabilty.py | 12 +-
dudley/test/python/rectangle.py | 12 +-
dudley/test/python/run_escriptOnDudley.py | 12 +-
dudley/test/python/run_inputOutput.py | 12 +-
dudley/test/python/run_linearPDEsOnDudley1.py | 12 +-
dudley/test/python/run_linearPDEsOnDudley2.py | 12 +-
dudley/test/python/run_models.py | 12 +-
dudley/test/python/run_nlpde2dOnDudley.py | 12 +-
dudley/test/python/run_nlpde3dOnDudley.py | 12 +-
dudley/test/python/run_simplesolve.py | 466 +------
dudley/test/python/run_splitworldOnDudley.py | 12 +-
dudley/test/python/run_utilOnDudley.py | 12 +-
dudley/test/python/seismic_wave.py | 12 +-
dudley/test/python/slip_stress_mesh_old.py | 12 +-
dudley/test/python/slip_stress_old.py | 12 +-
dudley/test/python/stokes_problems.py | 12 +-
dudley/test/python/subduction1.py | 12 +-
dudley/test/python/subduction1_gen.py | 12 +-
dudley/test/python/time_chunks.py | 12 +-
dudley/test/python/tp.py | 12 +-
escript/py_src/SConscript | 6 +-
escript/py_src/__init__.py | 12 +-
escript/py_src/datamanager.py | 6 +-
escript/py_src/linearPDEs.py | 6 +-
escript/py_src/modelframe.py | 6 +-
escript/py_src/models.py | 6 +-
escript/py_src/pdetools.py | 6 +-
escript/py_src/{util.py => splitworld.py} | 8 +-
escript/py_src/symbolic.py | 6 +-
escript/py_src/unitsSI.py | 6 +-
escript/py_src/util.py | 6 +-
escriptcore/py_src/SConscript | 6 +-
escriptcore/py_src/__init__.py | 12 +-
escriptcore/py_src/benchmark.py | 12 +-
escriptcore/py_src/datamanager.py | 14 +-
escriptcore/py_src/domainCouplers.py | 12 +-
escriptcore/py_src/faultsystems.py | 12 +-
escriptcore/py_src/flows.py | 12 +-
escriptcore/py_src/gmshrunner.py | 12 +-
escriptcore/py_src/heat.py | 36 +-
escriptcore/py_src/levelset.py | 12 +-
escriptcore/py_src/linearPDEs.py | 12 +-
escriptcore/py_src/modelframe.py | 12 +-
escriptcore/py_src/models.py | 12 +-
escriptcore/py_src/mountains.py | 12 +-
escriptcore/py_src/nonlinearPDE.py | 12 +-
escriptcore/py_src/pdetools.py | 33 +-
escriptcore/py_src/rheologies.py | 16 +-
escriptcore/py_src/runmodel.py | 12 +-
escriptcore/py_src/splitworld.py | 28 +-
escriptcore/py_src/start.py | 12 +-
escriptcore/py_src/symbolic/__init__.py | 12 +-
escriptcore/py_src/symbolic/evaluator.py | 12 +-
escriptcore/py_src/symbolic/functions.py | 12 +-
escriptcore/py_src/symbolic/pretty.py | 12 +-
escriptcore/py_src/symbolic/symbol.py | 12 +-
escriptcore/py_src/symbolic/symconstants.py | 6 +-
escriptcore/py_src/symbolic/utils.py | 12 +-
escriptcore/py_src/testing.py | 12 +-
escriptcore/py_src/unitsSI.py | 12 +-
escriptcore/py_src/utestselect.py | 12 +-
escriptcore/py_src/util.py | 12 +-
escriptcore/src/AbstractContinuousDomain.cpp | 6 +-
escriptcore/src/AbstractContinuousDomain.h | 6 +-
escriptcore/src/AbstractDomain.cpp | 6 +-
escriptcore/src/AbstractDomain.h | 6 +-
escriptcore/src/AbstractReducer.cpp | 6 +-
escriptcore/src/AbstractReducer.h | 6 +-
escriptcore/src/AbstractSystemMatrix.cpp | 6 +-
escriptcore/src/AbstractSystemMatrix.h | 6 +-
escriptcore/src/AbstractTransportProblem.cpp | 6 +-
escriptcore/src/AbstractTransportProblem.h | 6 +-
escriptcore/src/BinaryOp.h | 6 +-
escriptcore/src/Data.cpp | 109 +-
escriptcore/src/Data.h | 36 +-
escriptcore/src/DataAbstract.cpp | 6 +-
escriptcore/src/DataAbstract.h | 6 +-
escriptcore/src/DataAlgorithm.h | 6 +-
escriptcore/src/DataBlocks2D.cpp | 6 +-
escriptcore/src/DataBlocks2D.h | 6 +-
escriptcore/src/DataC.cpp | 6 +-
escriptcore/src/DataC.h | 6 +-
escriptcore/src/DataConstant.cpp | 6 +-
escriptcore/src/DataConstant.h | 6 +-
escriptcore/src/DataEmpty.cpp | 6 +-
escriptcore/src/DataEmpty.h | 6 +-
escriptcore/src/DataException.cpp | 6 +-
escriptcore/src/DataException.h | 6 +-
escriptcore/src/DataExpanded.cpp | 1352 +++++++++-----------
escriptcore/src/DataExpanded.h | 8 +-
escriptcore/src/DataFactory.cpp | 6 +-
escriptcore/src/DataFactory.h | 6 +-
escriptcore/src/DataLazy.cpp | 6 +-
escriptcore/src/DataLazy.h | 6 +-
escriptcore/src/DataMaths.cpp | 6 +-
escriptcore/src/DataMaths.h | 6 +-
escriptcore/src/DataReady.cpp | 6 +-
escriptcore/src/DataReady.h | 6 +-
escriptcore/src/DataTagged.cpp | 6 +-
escriptcore/src/DataTagged.h | 6 +-
escriptcore/src/DataTypes.cpp | 6 +-
escriptcore/src/DataTypes.h | 6 +-
escriptcore/src/DataVector.cpp | 6 +-
escriptcore/src/DataVector.h | 6 +-
escriptcore/src/Dodgy.cpp | 6 +-
escriptcore/src/Dodgy.h | 6 +-
escriptcore/src/DomainException.cpp | 6 +-
escriptcore/src/DomainException.h | 6 +-
escriptcore/src/EscriptParams.cpp | 6 +-
escriptcore/src/EscriptParams.h | 6 +-
escriptcore/src/FunctionSpace.cpp | 6 +-
escriptcore/src/FunctionSpace.h | 6 +-
escriptcore/src/FunctionSpaceException.cpp | 6 +-
escriptcore/src/FunctionSpaceException.h | 6 +-
escriptcore/src/FunctionSpaceFactory.cpp | 6 +-
escriptcore/src/FunctionSpaceFactory.h | 6 +-
escriptcore/src/LapackInverseHelper.cpp | 6 +-
escriptcore/src/LapackInverseHelper.h | 6 +-
escriptcore/src/LocalOps.h | 6 +-
escriptcore/src/MPIDataReducer.cpp | 6 +-
escriptcore/src/MPIDataReducer.h | 6 +-
escriptcore/src/MPIScalarReducer.cpp | 6 +-
escriptcore/src/MPIScalarReducer.h | 6 +-
escriptcore/src/NonReducedVariable.cpp | 6 +-
escriptcore/src/NonReducedVariable.h | 8 +-
escriptcore/src/NullDomain.cpp | 6 +-
escriptcore/src/NullDomain.h | 6 +-
escriptcore/src/Pointers.h | 6 +-
escriptcore/src/SConscript | 6 +-
escriptcore/src/SolverOptions.cpp | 6 +-
escriptcore/src/SolverOptions.h | 6 +-
escriptcore/src/SolverOptionsException.cpp | 6 +-
escriptcore/src/SolverOptionsException.h | 6 +-
escriptcore/src/SplitWorld.cpp | 31 +-
escriptcore/src/SplitWorld.h | 8 +-
escriptcore/src/SplitWorldException.cpp | 6 +-
escriptcore/src/SplitWorldException.h | 6 +-
escriptcore/src/SubWorld.cpp | 63 +-
escriptcore/src/SubWorld.h | 8 +-
escriptcore/src/SystemMatrixException.cpp | 6 +-
escriptcore/src/SystemMatrixException.h | 6 +-
escriptcore/src/Taipan.cpp | 6 +-
escriptcore/src/Taipan.h | 6 +-
escriptcore/src/TestDomain.cpp | 6 +-
escriptcore/src/TestDomain.h | 6 +-
escriptcore/src/TransportProblemException.cpp | 6 +-
escriptcore/src/TransportProblemException.h | 6 +-
escriptcore/src/UnaryFuncs.h | 6 +-
escriptcore/src/UnaryOp.h | 6 +-
escriptcore/src/UtilC.h | 6 +-
escriptcore/src/Utils.cpp | 875 ++++++-------
escriptcore/src/Utils.h | 192 +--
escriptcore/src/WrappedArray.cpp | 6 +-
escriptcore/src/WrappedArray.h | 6 +-
escriptcore/src/escriptcpp.cpp | 16 +-
escriptcore/src/system_dep.h | 6 +-
escriptcore/test/DataAlgorithmAdapterTestCase.cpp | 6 +-
escriptcore/test/DataAlgorithmAdapterTestCase.h | 6 +-
escriptcore/test/DataBlocks2DTestCase.cpp | 6 +-
escriptcore/test/DataBlocks2DTestCase.h | 6 +-
escriptcore/test/DataConstantTestCase.cpp | 6 +-
escriptcore/test/DataConstantTestCase.h | 6 +-
escriptcore/test/DataEmptyTestCase.cpp | 6 +-
escriptcore/test/DataEmptyTestCase.h | 6 +-
escriptcore/test/DataExpandedTestCase.cpp | 6 +-
escriptcore/test/DataExpandedTestCase.h | 6 +-
escriptcore/test/DataFactoryTestCase.cpp | 6 +-
escriptcore/test/DataFactoryTestCase.h | 6 +-
escriptcore/test/DataLazyTestCase.cpp | 6 +-
escriptcore/test/DataLazyTestCase.h | 6 +-
escriptcore/test/DataMathsTestCase.cpp | 6 +-
escriptcore/test/DataMathsTestCase.h | 6 +-
escriptcore/test/DataTaggedTestCase.cpp | 6 +-
escriptcore/test/DataTaggedTestCase.h | 6 +-
escriptcore/test/DataTestCase.cpp | 6 +-
escriptcore/test/DataTestCase.h | 6 +-
escriptcore/test/DataTypesTestCase.cpp | 6 +-
escriptcore/test/DataTypesTestCase.h | 6 +-
escriptcore/test/DataVectorTestCase.cpp | 6 +-
escriptcore/test/DataVectorTestCase.h | 6 +-
escriptcore/test/FunctionSpaceTestCase.cpp | 6 +-
escriptcore/test/FunctionSpaceTestCase.h | 6 +-
escriptcore/test/SConscript | 6 +-
escriptcore/test/SharedDataTestCase.cpp | 6 +-
escriptcore/test/SharedDataTestCase.h | 6 +-
escriptcore/test/TaipanTestCase.cpp | 6 +-
escriptcore/test/TaipanTestCase.h | 6 +-
escriptcore/test/escript_UnitTest.cpp | 6 +-
escriptcore/test/multi_arrayTestCase.cpp | 6 +-
escriptcore/test/multi_arrayTestCase.h | 6 +-
escriptcore/test/python/SConscript | 6 +-
escriptcore/test/python/TimingTests.py.old | 8 +-
escriptcore/test/python/run_data_access.py | 12 +-
escriptcore/test/python/run_symbolic.py | 12 +-
escriptcore/test/python/run_testdomain.py | 12 +-
escriptcore/test/python/run_units.py | 12 +-
escriptcore/test/python/run_xml.py | 12 +-
escriptcore/test/python/test_assemblage.py | 12 +-
escriptcore/test/python/test_assemblage_2Do1.py | 12 +-
escriptcore/test/python/test_assemblage_2Do2.py | 12 +-
escriptcore/test/python/test_assemblage_3Do1.py | 12 +-
escriptcore/test/python/test_assemblage_3Do2.py | 12 +-
escriptcore/test/python/test_condEval.py | 12 +-
escriptcore/test/python/test_linearPDEs.py | 12 +-
escriptcore/test/python/test_modulefns.py | 12 +-
escriptcore/test/python/test_nonLinearPDE.py | 12 +-
escriptcore/test/python/test_objects.py | 12 +-
escriptcore/test/python/test_pdetools.py | 12 +-
escriptcore/test/python/test_shared.py | 12 +-
escriptcore/test/python/test_splitworld.py | 14 +-
escriptcore/test/python/test_symfuncs.py | 12 +-
escriptcore/test/python/test_util.py | 12 +-
escriptcore/test/python/test_util_NaN_funcs.py | 6 +-
escriptcore/test/python/test_util_base.py | 12 +-
.../test/python/test_util_binary_no_tagged_data.py | 12 +-
.../python/test_util_binary_with_tagged_data.py | 12 +-
.../test_util_overloaded_binary_no_tagged_data.py | 12 +-
...test_util_overloaded_binary_with_tagged_data.py | 12 +-
.../python/test_util_reduction_no_tagged_data.py | 12 +-
.../python/test_util_reduction_with_tagged_data.py | 12 +-
.../python/test_util_slicing_no_tagged_data.py | 12 +-
.../python/test_util_slicing_with_tagged_data.py | 12 +-
.../test/python/test_util_spatial_functions1.py | 12 +-
.../test/python/test_util_spatial_functions2.py | 12 +-
.../test/python/test_util_spatial_functions3.py | 12 +-
.../test/python/test_util_unary_no_tagged_data.py | 12 +-
.../python/test_util_unary_with_tagged_data.py | 12 +-
esysUtils/src/EsysAssert.h | 6 +-
esysUtils/src/EsysAssertException.cpp | 6 +-
esysUtils/src/EsysAssertException.h | 6 +-
esysUtils/src/EsysException.cpp | 6 +-
esysUtils/src/EsysException.h | 6 +-
esysUtils/src/EsysRandom.cpp | 6 +-
esysUtils/src/EsysRandom.h | 6 +-
esysUtils/src/Esys_MPI.cpp | 6 +-
esysUtils/src/Esys_MPI.h | 6 +-
esysUtils/src/IndexList.h | 6 +-
esysUtils/src/SConscript | 6 +-
esysUtils/src/blocktimer.cpp | 6 +-
esysUtils/src/blocktimer.h | 6 +-
esysUtils/src/error.cpp | 6 +-
esysUtils/src/error.h | 6 +-
esysUtils/src/esysExceptionTranslator.cpp | 6 +-
esysUtils/src/esysExceptionTranslator.h | 6 +-
esysUtils/src/esysFileWriter.h | 113 +-
esysUtils/src/first.h | 6 +-
esysUtils/src/index.h | 6 +-
esysUtils/src/maths.h | 6 +-
esysUtils/src/mem.h | 6 +-
esysUtils/src/pyerr.cpp | 6 +-
esysUtils/src/pyerr.h | 6 +-
esysUtils/src/system_dep.h | 6 +-
esysUtils/src/types.h | 6 +-
esysUtils/test/EsysExceptionTestCase.cpp | 6 +-
esysUtils/test/EsysExceptionTestCase.h | 6 +-
esysUtils/test/EsysFileWriterTestCase.cpp | 6 +-
esysUtils/test/EsysFileWriterTestCase.h | 6 +-
esysUtils/test/SConscript | 6 +-
esysUtils/test/esysUtils_UnitTest.cpp | 6 +-
finley/benchmarks/finleybench.py | 12 +-
finley/benchmarks/runbenchmark.py | 12 +-
finley/py_src/SConscript | 6 +-
finley/py_src/__init__.py | 12 +-
finley/py_src/factorywrappers.py | 12 +-
finley/py_src/readers.py | 12 +-
finley/src/Assemble.h | 6 +-
finley/src/Assemble_AverageElementData.cpp | 12 +-
finley/src/Assemble_CopyElementData.cpp | 12 +-
finley/src/Assemble_CopyNodalData.cpp | 6 +-
finley/src/Assemble_LumpedSystem.cpp | 6 +-
finley/src/Assemble_NodeCoordinates.cpp | 6 +-
finley/src/Assemble_PDE.cpp | 6 +-
finley/src/Assemble_PDE_Points.cpp | 6 +-
finley/src/Assemble_PDE_Single_1D.cpp | 6 +-
finley/src/Assemble_PDE_Single_2D.cpp | 6 +-
finley/src/Assemble_PDE_Single_3D.cpp | 6 +-
finley/src/Assemble_PDE_Single_C.cpp | 6 +-
finley/src/Assemble_PDE_System_1D.cpp | 6 +-
finley/src/Assemble_PDE_System_2D.cpp | 6 +-
finley/src/Assemble_PDE_System_3D.cpp | 6 +-
finley/src/Assemble_PDE_System_C.cpp | 6 +-
finley/src/Assemble_addToSystemMatrix.cpp | 6 +-
finley/src/Assemble_getAssembleParameters.cpp | 6 +-
finley/src/Assemble_getNormal.cpp | 6 +-
finley/src/Assemble_getSize.cpp | 8 +-
finley/src/Assemble_gradient.cpp | 6 +-
finley/src/Assemble_integrate.cpp | 6 +-
finley/src/Assemble_interpolate.cpp | 6 +-
finley/src/Assemble_jacobians.cpp | 6 +-
finley/src/CPPAdapter/FinleyAdapterException.cpp | 6 +-
finley/src/CPPAdapter/FinleyAdapterException.h | 6 +-
finley/src/CPPAdapter/MeshAdapter.cpp | 9 +-
finley/src/CPPAdapter/MeshAdapter.h | 6 +-
finley/src/CPPAdapter/MeshAdapterFactory.cpp | 6 +-
finley/src/CPPAdapter/MeshAdapterFactory.h | 6 +-
finley/src/CPPAdapter/finleycpp.cpp | 6 +-
finley/src/CPPAdapter/system_dep.h | 6 +-
finley/src/ElementFile.cpp | 44 +-
finley/src/ElementFile.h | 12 +-
finley/src/ElementFile_jacobians.cpp | 6 +-
finley/src/Finley.cpp | 6 +-
finley/src/Finley.h | 6 +-
finley/src/FinleyVersion.h | 8 +-
finley/src/IndexList.cpp | 6 +-
finley/src/IndexList.h | 6 +-
finley/src/Mesh.cpp | 6 +-
finley/src/Mesh.h | 12 +-
finley/src/Mesh_addPoints.cpp | 6 +-
finley/src/Mesh_findMatchingFaces.cpp | 6 +-
finley/src/Mesh_getPattern.cpp | 6 +-
finley/src/Mesh_glueFaces.cpp | 8 +-
finley/src/Mesh_hex20.cpp | 6 +-
finley/src/Mesh_hex8.cpp | 6 +-
finley/src/Mesh_joinFaces.cpp | 16 +-
finley/src/Mesh_merge.cpp | 6 +-
finley/src/Mesh_optimizeDOFDistribution.cpp | 28 +-
finley/src/Mesh_read.cpp | 6 +-
finley/src/Mesh_readGmsh.cpp | 6 +-
finley/src/Mesh_rec4.cpp | 6 +-
finley/src/Mesh_rec8.cpp | 6 +-
finley/src/Mesh_write.cpp | 292 ++---
finley/src/NodeFile.cpp | 57 +-
finley/src/NodeFile.h | 25 +-
finley/src/NodeMapping.h | 6 +-
finley/src/Quadrature.cpp | 6 +-
finley/src/Quadrature.h | 6 +-
finley/src/RectangularMesh.h | 6 +-
finley/src/ReferenceElementSets.h | 6 +-
finley/src/ReferenceElements.cpp | 6 +-
finley/src/ReferenceElements.h | 6 +-
finley/src/SConscript | 6 +-
finley/src/ShapeFunctions.cpp | 6 +-
finley/src/ShapeFunctions.h | 6 +-
finley/src/Util.cpp | 6 +-
finley/src/Util.h | 6 +-
finley/src/generateReferenceElementList.py | 6 +-
finley/test/MeshAdapterTestCase.cpp | 6 +-
finley/test/MeshAdapterTestCase.h | 6 +-
finley/test/SConscript | 8 +-
finley/test/finley_UnitTests.cpp | 6 +-
finley/test/python/FCT_benchmark.py | 12 +-
finley/test/python/FCT_test0.py | 20 +-
finley/test/python/FCT_test1.py | 12 +-
finley/test/python/FCT_test2.py | 12 +-
finley/test/python/OutTest.py | 12 +-
finley/test/python/PoissonSolverTest.py | 12 +-
finley/test/python/RT2D.py | 6 +-
finley/test/python/RecTest.py | 12 +-
finley/test/python/SConscript | 6 +-
finley/test/python/axisymm-splitB.py | 12 +-
finley/test/python/blocktest.py | 12 +-
finley/test/python/brick.py | 12 +-
finley/test/python/coalgas.py | 12 +-
finley/test/python/convection.py | 22 +-
finley/test/python/damage.py | 12 +-
finley/test/python/generate_dumps.py | 12 +-
finley/test/python/generate_meshes.py | 12 +-
finley/test/python/linearElastic.py | 12 +-
finley/test/python/localization.py | 12 +-
finley/test/python/lumping_advection_test.py | 12 +-
finley/test/python/lumping_wave_test.py | 12 +-
finley/test/python/rayleigh_taylor_instabilty.py | 12 +-
finley/test/python/rectangle.py | 12 +-
finley/test/python/run_amg.py | 12 +-
finley/test/python/run_darcy.py | 12 +-
finley/test/python/run_escriptOnFinley.py | 12 +-
finley/test/python/run_generators.py | 12 +-
finley/test/python/run_inputOutput.py | 12 +-
finley/test/python/run_linearPDEsOnFinley1_2D1.py | 12 +-
finley/test/python/run_linearPDEsOnFinley1_2D2.py | 12 +-
finley/test/python/run_linearPDEsOnFinley1_3D1.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part1.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part2.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part3-1.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part3-2.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part3-3.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part3-4.py | 12 +-
.../python/run_linearPDEsOnFinley1_3D2_part4.py | 12 +-
finley/test/python/run_linearPDEsOnFinley2.py | 12 +-
finley/test/python/run_linearPDEsOnFinley3.py | 12 +-
finley/test/python/run_linearPDEsOnFinleyMacro.py | 12 +-
finley/test/python/run_models.py | 12 +-
finley/test/python/run_nlpde2dOnFinley.py | 12 +-
finley/test/python/run_nlpde3dOnFinley.py | 12 +-
finley/test/python/run_simplesolve.py | 12 +-
finley/test/python/run_splitworldOnFinley.py | 12 +-
finley/test/python/run_utilOnFinley.py | 12 +-
finley/test/python/run_visualization_interface.py | 12 +-
finley/test/python/runcoalgas.py | 12 +-
finley/test/python/seismic_wave.py | 12 +-
finley/test/python/slip_stress_mesh_old.py | 12 +-
finley/test/python/slip_stress_old.py | 12 +-
finley/test/python/stokes_problems.py | 12 +-
finley/test/python/subduction1.py | 12 +-
finley/test/python/subduction1_gen.py | 12 +-
finley/test/python/time_chunks.py | 12 +-
finley/test/python/tp.py | 12 +-
modellib/py_src/SConscript | 6 +-
modellib/py_src/__init__.py | 6 +-
modellib/py_src/flow.py | 12 +-
modellib/py_src/geometry.py | 12 +-
modellib/py_src/input.py | 12 +-
modellib/py_src/materials.py | 12 +-
modellib/py_src/mechanics.py | 12 +-
modellib/py_src/probe.py | 12 +-
modellib/py_src/temperature.py | 12 +-
modellib/py_src/tsunami.py.old | 8 +-
modellib/py_src/visualization.py | 12 +-
modellib/test/python/SConscript | 6 +-
modellib/test/python/drucker_prager.py | 12 +-
modellib/test/python/run_convection.py | 12 +-
modellib/test/python/run_domainreaders.py | 12 +-
modellib/test/python/run_flow.py | 12 +-
modellib/test/python/run_temp.py | 12 +-
paso/profiling/Paso_tests.cpp | 6 +-
paso/profiling/Paso_tests.h | 6 +-
paso/profiling/SConscript | 6 +-
paso/src/AMG.cpp | 6 +-
paso/src/AMG_Interpolation.cpp | 6 +-
paso/src/AMG_Prolongation.cpp | 6 +-
paso/src/AMG_Restriction.cpp | 6 +-
paso/src/AMG_Root.cpp | 6 +-
paso/src/AML.cpp.old | 12 +-
paso/src/BOOMERAMG.cpp | 6 +-
paso/src/BOOMERAMG.h | 6 +-
paso/src/BiCGStab.cpp | 6 +-
paso/src/BlockOps.h | 6 +-
paso/src/Coupler.cpp | 6 +-
paso/src/Coupler.h | 6 +-
paso/src/Distribution.cpp | 6 +-
paso/src/Distribution.h | 6 +-
paso/src/FCT_Solver.cpp | 6 +-
paso/src/FCT_Solver.h | 6 +-
paso/src/FluxLimiter.cpp | 6 +-
paso/src/FluxLimiter.h | 6 +-
paso/src/Functions.cpp | 6 +-
paso/src/Functions.h | 6 +-
paso/src/GMRES.cpp | 6 +-
paso/src/GMRES2.cpp | 6 +-
paso/src/GSMPI.cpp.old | 6 +-
paso/src/ILU.cpp | 6 +-
paso/src/LocalAMG.cpp | 6 +-
paso/src/LocalAMG_Prolongation.cpp | 6 +-
paso/src/MINRES.cpp | 6 +-
paso/src/MKL.cpp | 91 +-
paso/src/MKL.h | 28 +-
paso/src/MergedSolver.cpp | 6 +-
paso/src/MergedSolver.h | 6 +-
paso/src/NewtonGMRES.cpp | 6 +-
paso/src/Options.cpp | 6 +-
paso/src/Options.h | 6 +-
paso/src/PCG.cpp | 6 +-
paso/src/Paso.h | 6 +-
paso/src/PasoUtil.cpp | 6 +-
paso/src/PasoUtil.h | 6 +-
paso/src/Pattern.cpp | 6 +-
paso/src/Pattern.h | 6 +-
paso/src/Pattern_mis.cpp | 6 +-
paso/src/Pattern_reduceBandwidth.cpp | 6 +-
paso/src/Preconditioner.cpp | 6 +-
paso/src/Preconditioner.h | 6 +-
paso/src/RILU.cpp | 6 +-
paso/src/ReactiveSolver.cpp | 6 +-
paso/src/ReactiveSolver.h | 6 +-
paso/src/SConscript | 6 +-
paso/src/SchurComplement.cpp | 6 +-
paso/src/SharedComponents.h | 6 +-
paso/src/Smoother.cpp | 6 +-
paso/src/Solver.cpp | 6 +-
paso/src/Solver.h | 6 +-
paso/src/Solver_Function.cpp | 6 +-
paso/src/Solver_applyBlockDiagonalMatrix.cpp.old | 6 +-
paso/src/SparseMatrix.cpp | 6 +-
paso/src/SparseMatrix.h | 6 +-
paso/src/SparseMatrix_MatrixMatrix.cpp | 6 +-
paso/src/SparseMatrix_MatrixMatrixTranspose.cpp | 6 +-
paso/src/SparseMatrix_MatrixVector.cpp | 6 +-
paso/src/SparseMatrix_getSubmatrix.cpp | 6 +-
paso/src/SparseMatrix_nullifyRowsAndCols.cpp | 6 +-
paso/src/SparseMatrix_saveHB.cpp | 6 +-
paso/src/SystemMatrix.cpp | 12 +-
paso/src/SystemMatrix.h | 6 +-
paso/src/SystemMatrixPattern.cpp | 6 +-
paso/src/SystemMatrixPattern.h | 6 +-
paso/src/SystemMatrixPattern_unrollBlocks.cpp | 6 +-
paso/src/SystemMatrix_MatrixVector.cpp | 6 +-
paso/src/SystemMatrix_copyRemoteCoupleBlock.cpp | 6 +-
paso/src/SystemMatrix_debug.cpp | 6 +-
paso/src/SystemMatrix_extendedRows.cpp | 6 +-
paso/src/SystemMatrix_loadMM.cpp | 6 +-
paso/src/SystemMatrix_mergeMainAndCouple.cpp | 6 +-
paso/src/TFQMR.cpp | 6 +-
paso/src/Transport.cpp | 6 +-
paso/src/Transport.h | 6 +-
paso/src/Transport_solve.cpp | 6 +-
paso/src/UMFPACK.cpp | 14 +-
paso/src/UMFPACK.h | 6 +-
paso/src/mmio.cpp | 6 +-
paso/src/mmio.h | 6 +-
paso/src/performance.cpp | 6 +-
paso/src/performance.h | 6 +-
paso/src/solve.cpp | 6 +-
pasowrap/py_src/SConscript | 6 +-
pasowrap/py_src/__init__.py | 12 +-
pasowrap/py_src/pasowrap.py | 12 +-
pasowrap/src/PasoException.cpp | 6 +-
pasowrap/src/PasoException.h | 6 +-
pasowrap/src/SConscript | 6 +-
pasowrap/src/SystemMatrixAdapter.cpp | 6 +-
pasowrap/src/SystemMatrixAdapter.h | 6 +-
pasowrap/src/TransportProblemAdapter.cpp | 6 +-
pasowrap/src/TransportProblemAdapter.h | 6 +-
pasowrap/src/pasowrapcpp.cpp | 6 +-
pasowrap/src/system_dep.h | 6 +-
pycad/py_src/SConscript | 6 +-
pycad/py_src/Triangle.py | 12 +-
pycad/py_src/__init__.py | 12 +-
pycad/py_src/design.py | 12 +-
pycad/py_src/extras.py | 12 +-
pycad/py_src/gmsh.py | 12 +-
pycad/py_src/primitives.py | 12 +-
pycad/py_src/shapes.py | 12 +-
pycad/py_src/transformations.py | 12 +-
pycad/test/python/SConscript | 6 +-
pycad/test/python/run_pycad_test.py | 12 +-
pythonMPI/src/SConscript | 6 +-
pythonMPI/src/ScriptMPI.cpp | 6 +-
pythonMPI/src/ScriptMPIredirect.cpp | 6 +-
ripley/generators/lamebuilder.py | 6 +-
ripley/generators/lamesource.py | 6 +-
ripley/py_src/MultiResolutionDomain.py | 6 +-
ripley/py_src/SConscript | 6 +-
ripley/py_src/__init__.py | 12 +-
ripley/src/AbstractAssembler.h | 6 +-
ripley/src/Brick.cpp | 10 +-
ripley/src/Brick.h | 6 +-
ripley/src/DefaultAssembler2D.cpp | 6 +-
ripley/src/DefaultAssembler2D.h | 6 +-
ripley/src/DefaultAssembler3D.cpp | 6 +-
ripley/src/DefaultAssembler3D.h | 6 +-
ripley/src/LameAssembler2D.cpp | 6 +-
ripley/src/LameAssembler2D.h | 6 +-
ripley/src/LameAssembler3D.cpp | 6 +-
ripley/src/LameAssembler3D.h | 6 +-
ripley/src/MultiBrick.cpp | 42 +-
ripley/src/MultiBrick.h | 6 +-
ripley/src/MultiRectangle.cpp | 47 +-
ripley/src/MultiRectangle.h | 6 +-
ripley/src/Rectangle.cpp | 10 +-
ripley/src/Rectangle.h | 6 +-
ripley/src/Ripley.h | 6 +-
ripley/src/RipleyDomain.cpp | 6 +-
ripley/src/RipleyDomain.h | 6 +-
ripley/src/RipleyException.cpp | 6 +-
ripley/src/RipleyException.h | 6 +-
ripley/src/RipleySystemMatrix.cu | 6 +-
ripley/src/RipleySystemMatrix.h | 6 +-
ripley/src/SConscript | 6 +-
ripley/src/WaveAssembler2D.cpp | 6 +-
ripley/src/WaveAssembler2D.h | 6 +-
ripley/src/WaveAssembler3D.cpp | 6 +-
ripley/src/WaveAssembler3D.h | 6 +-
ripley/src/blocktools.cpp | 6 +-
ripley/src/blocktools.h | 6 +-
ripley/src/blocktools2.cpp | 6 +-
ripley/src/domainhelpers.cpp | 6 +-
ripley/src/domainhelpers.h | 6 +-
ripley/src/generate_assamblage.py | 6 +-
ripley/src/generate_assemblage_cpp.py | 6 +-
ripley/src/ripleycpp.cpp | 6 +-
ripley/src/system_dep.h | 6 +-
ripley/test/SConscript | 6 +-
ripley/test/SystemMatrixTestCase.cpp | 6 +-
ripley/test/SystemMatrixTestCase.h | 6 +-
ripley/test/python/SConscript | 6 +-
.../test/python/run_customAssemblersOnMultiRes.py | 12 +-
ripley/test/python/run_customAssemblersOnRipley.py | 12 +-
ripley/test/python/run_diracOnMultiRes.py | 12 +-
ripley/test/python/run_diracOnRipley.py | 12 +-
ripley/test/python/run_escriptOnMultiResolution.py | 12 +-
ripley/test/python/run_escriptOnRipley.py | 12 +-
ripley/test/python/run_linearPDEsOnMultiRes.py | 12 +-
ripley/test/python/run_linearPDEsOnRipley.py | 12 +-
ripley/test/python/run_nonlinearPDEOnMultiRes.py | 12 +-
ripley/test/python/run_nonlinearPDEOnRipley.py | 12 +-
ripley/test/python/run_readWriteOnMultiRes.py | 12 +-
ripley/test/python/run_readWriteOnRipley.py | 12 +-
ripley/test/python/run_simplesolveOnMultiRes.py | 12 +-
ripley/test/python/run_simplesolveOnRipley.py | 12 +-
ripley/test/python/run_splitworldOnRipley.py | 12 +-
ripley/test/python/run_utilOnMultiRes.py | 12 +-
ripley/test/python/run_utilOnRipley.py | 12 +-
ripley/test/ripley_UnitTest.cpp | 14 +-
run-escript.in | 14 +-
scons/templates/__init__.py | 6 +-
scons/templates/centos7_0_options.py | 8 +-
scons/templates/fedora21_5_options.py | 8 +-
scons/templates/freebsd10_0_options.py | 14 +-
scons/templates/homebrew_10.10_options.py | 10 +-
...rew_10.10_options.py => homebrew_11_options.py} | 14 +-
scons/templates/homebrew_options.py | 10 +-
scons/templates/jessie_mpi_options.py | 6 +-
scons/templates/jessie_options.py | 8 +-
scons/templates/jessie_py3_mpi_options.py | 6 +-
scons/templates/jessie_py3_options.py | 6 +-
scons/templates/macports_10.10_options.py | 8 +-
scons/templates/macports_options.py | 8 +-
scons/templates/opensuse13_2_options.py | 8 +-
.../{vivid_mpi_options.py => sid_mpi_options.py} | 8 +-
.../{jessie_options.py => sid_options.py} | 34 +-
scons/templates/sid_py3_mpi_options.py | 61 +
scons/templates/sid_py3_options.py | 60 +
scons/templates/trusty_options.py | 8 +-
scons/templates/utopic_options.py | 8 +-
scons/templates/vivid_mpi_options.py | 6 +-
scons/templates/vivid_options.py | 6 +-
scons/templates/vivid_py3_mpi_options.py | 6 +-
scons/templates/vivid_py3_options.py | 6 +-
scons/templates/wheezy_mpi_options.py | 6 +-
scons/templates/wheezy_options.py | 8 +-
scons/templates/wheezy_py3_mpi_options.py | 6 +-
scons/templates/wheezy_py3_options.py | 6 +-
scons/templates/windows_intelc_options.py | 8 +-
scons/templates/windows_msvc90_options.py | 8 +-
scons/templates/windows_options.py | 8 +-
scripts/extracttests.sh | 2 +-
scripts/libmover.sh | 26 +
scripts/makesrc.sh | 8 +-
scripts/moveall.sh | 10 +
scripts/py_comp.py | 6 +-
scripts/release_sanity.py | 27 +
site_scons/dependencies.py | 14 +-
site_scons/extractdebbuild.py | 12 +-
site_scons/grouptest.py | 12 +-
site_scons/site_init.py | 22 +-
site_scons/site_tools/nvcc.py | 6 +-
speckley/py_src/SConscript | 6 +-
speckley/py_src/__init__.py | 12 +-
speckley/src/AbstractAssembler.cpp | 6 +-
speckley/src/AbstractAssembler.h | 6 +-
speckley/src/Brick.cpp | 6 +-
speckley/src/Brick.h | 6 +-
speckley/src/BrickGradients.cpp | 6 +-
speckley/src/BrickIntegrals.cpp | 6 +-
speckley/src/BrickReductions.cpp | 6 +-
speckley/src/CrossDomainCoupler.cpp | 6 +-
speckley/src/CrossDomainCoupler.h | 6 +-
speckley/src/DefaultAssembler2D.cpp | 6 +-
speckley/src/DefaultAssembler2D.h | 6 +-
speckley/src/DefaultAssembler3D.cpp | 6 +-
speckley/src/DefaultAssembler3D.h | 6 +-
speckley/src/Rectangle.cpp | 6 +-
speckley/src/Rectangle.h | 6 +-
speckley/src/RectangleGradients.cpp | 6 +-
speckley/src/RectangleIntegrals.cpp | 6 +-
speckley/src/RectangleReductions.cpp | 6 +-
speckley/src/SConscript | 6 +-
speckley/src/Speckley.h | 6 +-
speckley/src/SpeckleyDomain.cpp | 6 +-
speckley/src/SpeckleyDomain.h | 6 +-
speckley/src/SpeckleyException.cpp | 6 +-
speckley/src/SpeckleyException.h | 6 +-
speckley/src/WaveAssembler2D.cpp | 6 +-
speckley/src/WaveAssembler2D.h | 6 +-
speckley/src/WaveAssembler3D.cpp | 6 +-
speckley/src/WaveAssembler3D.h | 6 +-
speckley/src/domainhelpers.cpp | 6 +-
speckley/src/domainhelpers.h | 6 +-
speckley/src/lagrange_functions.h | 6 +-
speckley/src/speckleycpp.cpp | 6 +-
speckley/src/system_dep.h | 6 +-
speckley/test/SConscript | 6 +-
speckley/test/python/SConscript | 6 +-
speckley/test/python/run_SpeckleyRipleyCoupler.py | 12 +-
.../test/python/run_customAssemblersOnSpeckley.py | 12 +-
speckley/test/python/run_diracOnSpeckley.py | 12 +-
speckley/test/python/run_readWriteOnSpeckley.py | 12 +-
speckley/test/python/run_specialOnSpeckley.py | 12 +-
svn_version | 2 +-
tools/escriptconvert/SConscript | 6 +-
tools/escriptconvert/escriptconvert.cpp | 6 +-
tools/escriptconvert/esdcreate.cpp | 6 +-
tools/overlord/SConscript | 6 +-
tools/overlord/overlord.c | 6 +-
tools/testrunner.py | 6 +-
weipa/py_src/SConscript | 6 +-
weipa/py_src/__init__.py | 12 +-
weipa/src/DataVar.cpp | 6 +-
weipa/src/DataVar.h | 6 +-
weipa/src/DomainChunk.h | 6 +-
weipa/src/ElementData.h | 6 +-
weipa/src/EscriptDataset.cpp | 18 +-
weipa/src/EscriptDataset.h | 6 +-
weipa/src/FinleyDomain.cpp | 6 +-
weipa/src/FinleyDomain.h | 6 +-
weipa/src/FinleyElements.cpp | 6 +-
weipa/src/FinleyElements.h | 6 +-
weipa/src/FinleyNodes.cpp | 6 +-
weipa/src/FinleyNodes.h | 6 +-
weipa/src/NodeData.h | 6 +-
weipa/src/RipleyDomain.cpp | 6 +-
weipa/src/RipleyDomain.h | 6 +-
weipa/src/RipleyElements.cpp | 6 +-
weipa/src/RipleyElements.h | 6 +-
weipa/src/RipleyNodes.cpp | 6 +-
weipa/src/RipleyNodes.h | 6 +-
weipa/src/SConscript | 6 +-
weipa/src/SpeckleyDomain.cpp | 6 +-
weipa/src/SpeckleyDomain.h | 6 +-
weipa/src/SpeckleyElements.cpp | 6 +-
weipa/src/SpeckleyElements.h | 6 +-
weipa/src/SpeckleyNodes.cpp | 6 +-
weipa/src/SpeckleyNodes.h | 6 +-
weipa/src/VisItControl.cpp | 6 +-
weipa/src/VisItControl.h | 6 +-
weipa/src/VisItData.cpp | 6 +-
weipa/src/VisItData.h | 6 +-
weipa/src/weipa.h | 6 +-
weipa/src/weipacpp.cpp | 6 +-
weipa/test/EscriptDatasetTestCase.cpp | 6 +-
weipa/test/EscriptDatasetTestCase.h | 6 +-
weipa/test/SConscript | 6 +-
weipa/test/python/SConscript | 6 +-
weipa/test/python/run_savesilo_tests.py | 12 +-
weipa/test/python/run_savevtk_tests.py | 12 +-
weipa/test/weipa_UnitTest.cpp | 6 +-
1080 files changed, 6524 insertions(+), 6748 deletions(-)
diff --git a/README_LICENSE b/README_LICENSE
index 021345e..33c46fd 100644
--- a/README_LICENSE
+++ b/README_LICENSE
@@ -1,4 +1,4 @@
The majority of the files contained in this distribution are licensed
-under the Open Software License version 3.0 (http://www.opensource.org/licenses/osl-3.0.php).
+under the Apache License, version 2.0(http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/SConstruct b/SConstruct
index f136186..84a6349 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -150,7 +150,9 @@ vars.AddVariables(
BoolVariable('papi', 'Enable PAPI', False),
('papi_prefix', 'Prefix/Paths to PAPI installation', default_prefix),
('papi_libs', 'PAPI libraries to link with', ['papi']),
- BoolVariable('papi_instrument_solver', 'Use PAPI to instrument each iteration of the solver', False)
+ BoolVariable('papi_instrument_solver', 'Use PAPI to instrument each iteration of the solver', False),
+ BoolVariable('osx_dependency_fix', 'Fix dependencies for libraries to have absolute paths (OSX)',
+False)
)
##################### Create environment and help text #######################
@@ -370,7 +372,7 @@ if env['launcher'] == 'default':
if env['mpi'] == 'INTELMPI':
env['launcher'] = "mpirun -hostfile %f -n %N -ppn %p %b"
elif env['mpi'] == 'OPENMPI':
- env['launcher'] = "mpirun --gmca mpi_warn_on_fork 0 ${EE} --host %h -bynode -bind-to-core --cpus-per-rank %t -np %N %b"
+ env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} --host %h -bynode -bind-to-core --cpus-per-rank %t -np %N %b"
elif env['mpi'] == 'MPT':
env['launcher'] = "mpirun %h -np %p %b"
elif env['mpi'] == 'MPICH':
@@ -683,10 +685,39 @@ install_all_list += ['install_modellib_py']
install_all_list += ['install_pycad_py']
if env['usempi']:
install_all_list += ['install_pythonMPI', 'install_overlord']
-env.Alias('install_all', install_all_list)
+install_all_list += ['install_weipa_py']
+install_all_list += [env.Install(os.path.join(env['build_dir'],'scripts'), os.path.join('scripts', 'release_sanity.py'))]
+
+
+if env['osx_dependency_fix']:
+ print("Require dependency fix")
+ install_all=env.Command('install_all',install_all_list,'scripts/moveall.sh')
+else:
+ install_all=env.Alias('install_all', install_all_list)
+
+
+
# Default target is install
-env.Default('install_all')
+#env.Default('install_all')
+
+
+sanity=env.Alias('sanity', env.Command('dummy','',os.path.join(env['prefix'], 'bin', 'run-escript')+' '+os.path.join(env['build_dir'],'scripts', 'release_sanity.py')))
+env.Depends('dummy', install_all)
+if env['usempi']:
+ #env.Requires('dummy', ['build_pythonMPI', 'install_pythonMPI'])
+ #env.Requires('dummy', env['prefix']+"/lib/pythonMPI")
+ env.Depends('dummy', ['build_pythonMPI', 'install_pythonMPI'])
+ env.Depends('dummy', env['prefix']+"/lib/pythonMPI")
+
+if 'install_dudley' in install_all_list and \
+ 'install_finley' in install_all_list and \
+ 'install_ripley' in install_all_list and \
+ 'install_speckley' in install_all_list:
+ env.AlwaysBuild('sanity')
+ env.Default('sanity')
+else:
+ env.Default('install_all')
################## Targets to build and run the test suite ###################
diff --git a/cusplibrary/SConscript b/cusplibrary/SConscript
index ab92952..dbabea7 100644
--- a/cusplibrary/SConscript
+++ b/cusplibrary/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/cusplibrary/build/build-env.py b/cusplibrary/build/build-env.py
index 40948b7..9d6705a 100644
--- a/cusplibrary/build/build-env.py
+++ b/cusplibrary/build/build-env.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/cusplibrary/build/nvcc.py b/cusplibrary/build/nvcc.py
index f155ba1..1f6fde6 100644
--- a/cusplibrary/build/nvcc.py
+++ b/cusplibrary/build/nvcc.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/cusplibrary/performance/spmv/scripts/benchmark.py b/cusplibrary/performance/spmv/scripts/benchmark.py
index 1df1bcb..20226ca 100644
--- a/cusplibrary/performance/spmv/scripts/benchmark.py
+++ b/cusplibrary/performance/spmv/scripts/benchmark.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/cusplibrary/testing/data/random_10x10/generator.py b/cusplibrary/testing/data/random_10x10/generator.py
index fd22c66..6560423 100644
--- a/cusplibrary/testing/data/random_10x10/generator.py
+++ b/cusplibrary/testing/data/random_10x10/generator.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/debian/changelog b/debian/changelog
index fcaa11d..b20877c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
+python-escript (4.2.0.1-1) experimental; urgency=low
+ * First debian release of escript. Upstream version 4.2.0.1
+ * closes: 783157
+ -- Joel Fenwick <j.oelpublic at gmail.com> Thu, 04 Apr 2016 10:49:00 +1000
+
+Old Changelog:
python-escript (4.1-1) experimental; urgency=low
* First debian release of escript. Upstream version 4.1.
* closes: 783157
-- Joel Fenwick <j.oelpublic at gmail.com> Thu, 23 Apr 2015 17:28:21 +1000
-Old Changelog:
python-escript (4.0) wheezy; urgency=low
* Release 4.0
* User guide has summary of changes
diff --git a/debian/copyright b/debian/copyright
index c34cd42..68b0fa0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,55 +3,6 @@ Upstream-Name: esys-escript
Source: https://launchpad.net/escript-finley
Files-Excluded: debian
-License: OSL-3
- Open Software License v. 3.0 (OSL-3.0)
- .
- This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
- .
- Licensed under the Open Software License version 3.0
- .
- 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
- .
- a) to reproduce the Original Work in copies, either alone or as part of a collective work;
- .
- b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
- .
- c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
- .
- d) to perform the Original Work publicly; and
- .
- e) to display the Original Work publicly.
- .
- 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
- .
- 3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an informa [...]
- .
- 4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is gra [...]
- .
- 5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the [...]
- .
- 6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
- .
- 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, e [...]
- .
- 8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. T [...]
- .
- 9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Se [...]
- .
- 10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
- .
- 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or af [...]
- .
- 12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
- .
- 13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
- .
- 14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contra [...]
- .
- 15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
- .
- 16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the fo [...]
-
License: ASL-2.0
Version 2.0, January 2004
.
@@ -129,11 +80,11 @@ License: Expat
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Files: *
-Copyright: 2003-2015 The University of Queensland
-License: OSL-3
+Copyright: 2003-2016 The University of Queensland
+License: ASL-2.0
Files: debian/*
-Copyright: 2015 The University of Queensland
+Copyright: 2016 The University of Queensland
License: Expat
Files: cusplibrary/*
diff --git a/debian/utils/cppy.py b/debian/utils/cppy.py
index 864c3e2..4a84209 100755
--- a/debian/utils/cppy.py
+++ b/debian/utils/cppy.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the MIT (ExPat) license
+# https://opensource.org/licenses/MIT
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/SConscript b/doc/SConscript
index da27e8c..e8041fa 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -199,9 +199,11 @@ zip_path=os.path.join(release_dir, 'escript_examples.zip')
zip = local_env.Command(zip_path, None, dir_cmd+"zip "+zip_path+" "+" ".join(ex2))
env.Alias('examples_zipfile', zip)
-tar_path=os.path.join(release_dir, 'escript_examples.tar.gz')
-tar = local_env.Command(tar_path, None, dir_cmd+"tar -czf "+tar_path+" "+" ".join(ex2))
-env.Alias('examples_tarfile', tar)
+tar_path=os.path.join(release_dir, 'escript_examples.tar')
+targz_path=os.path.join(release_dir, 'escript_examples.tar.gz')
+tar = local_env.Command(tar_path, None, dir_cmd+"tar -cf "+tar_path+" "+" ".join(ex2))
+targz = local_env.Command(targz_path, tar, "gzip -n -9 "+tar_path)
+env.Alias('examples_tarfile', targz)
#env=Environment(TARFLAGS = "-c -z",chdir=src_dir)
#if 'Tar' in dir(env):
diff --git a/doc/completedevs.tex b/doc/completedevs.tex
index b0d964f..848f74e 100644
--- a/doc/completedevs.tex
+++ b/doc/completedevs.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/SConscript b/doc/cookbook/SConscript
index 429fab2..7bf4339 100644
--- a/doc/cookbook/SConscript
+++ b/doc/cookbook/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/cookbook.bib b/doc/cookbook/cookbook.bib
index f98a93c..a9e3b88 100644
--- a/doc/cookbook/cookbook.bib
+++ b/doc/cookbook/cookbook.bib
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/cookbook.tex b/doc/cookbook/cookbook.tex
index 693b9ae..8010564 100644
--- a/doc/cookbook/cookbook.tex
+++ b/doc/cookbook/cookbook.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -66,11 +66,11 @@ Email: \email{esys at esscc.uq.edu.au}
\fi
\begin{center}
-Copyright (c) 2009--2015 by The University of Queensland \\
+Copyright (c) 2009--2016 by The University of Queensland \\
\url{http://www.uq.edu.au} \\
Primary Business: Queensland, Australia \\
-Licensed under the Open Software License version 3.0 \\
-\url{http://www.opensource.org/licenses/osl-3.0.php} \\
+Licensed under the Apache License, version 2.0 \\
+\url{http://www.apache.org/licenses/LICENSE-2.0} \\
This work is supported by the AuScope National Collaborative Research Infrastructure Strategy,
the Queensland State Government and The University of Queensland.
diff --git a/doc/cookbook/cookbook_defs.tex b/doc/cookbook/cookbook_defs.tex
index 5685b10..22e0378 100644
--- a/doc/cookbook/cookbook_defs.tex
+++ b/doc/cookbook/cookbook_defs.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/einsteinETA.tex b/doc/cookbook/einsteinETA.tex
index 945ab50..d858242 100644
--- a/doc/cookbook/einsteinETA.tex
+++ b/doc/cookbook/einsteinETA.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/escpybas.tex b/doc/cookbook/escpybas.tex
index 778e55d..a53fd28 100644
--- a/doc/cookbook/escpybas.tex
+++ b/doc/cookbook/escpybas.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example01.tex b/doc/cookbook/example01.tex
index 024b539..f930a93 100644
--- a/doc/cookbook/example01.tex
+++ b/doc/cookbook/example01.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example02.tex b/doc/cookbook/example02.tex
index 4e0ca3a..09b332d 100644
--- a/doc/cookbook/example02.tex
+++ b/doc/cookbook/example02.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example03.tex b/doc/cookbook/example03.tex
index 336e3e7..7b115c1 100644
--- a/doc/cookbook/example03.tex
+++ b/doc/cookbook/example03.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example04.tex b/doc/cookbook/example04.tex
index 29fe5bc..ddd5c76 100644
--- a/doc/cookbook/example04.tex
+++ b/doc/cookbook/example04.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example05.tex b/doc/cookbook/example05.tex
index 0fc15b5..76d1b0d 100644
--- a/doc/cookbook/example05.tex
+++ b/doc/cookbook/example05.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example07.tex b/doc/cookbook/example07.tex
index c42bf13..addaf20 100644
--- a/doc/cookbook/example07.tex
+++ b/doc/cookbook/example07.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example08.tex b/doc/cookbook/example08.tex
index c2e3b21..8c9387b 100644
--- a/doc/cookbook/example08.tex
+++ b/doc/cookbook/example08.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example09.tex b/doc/cookbook/example09.tex
index ff21b63..5689e42 100644
--- a/doc/cookbook/example09.tex
+++ b/doc/cookbook/example09.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example10.tex b/doc/cookbook/example10.tex
index df1e406..6d379bc 100644
--- a/doc/cookbook/example10.tex
+++ b/doc/cookbook/example10.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/example11.tex b/doc/cookbook/example11.tex
index 2419204..3276fa6 100644
--- a/doc/cookbook/example11.tex
+++ b/doc/cookbook/example11.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/intro.tex b/doc/cookbook/intro.tex
index 2445952..01f7f1a 100644
--- a/doc/cookbook/intro.tex
+++ b/doc/cookbook/intro.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/cookbook/quickstart.tex b/doc/cookbook/quickstart.tex
index a5e9ac6..e82a26a 100644
--- a/doc/cookbook/quickstart.tex
+++ b/doc/cookbook/quickstart.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/copyrights.tex b/doc/copyrights.tex
index 4922f35..3ba6682 100644
--- a/doc/copyrights.tex
+++ b/doc/copyrights.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{center}
-Copyright (c) 2003-2015 by The University of Queensland\\
+Copyright (c) 2003-2016 by The University of Queensland\\
\url{http://www.uq.edu.au}\\
Primary Business: Queensland, Australia\\
-Licensed under the Open Software License version 3.0\\
-\url{http://www.opensource.org/licenses/osl-3.0.php}\\
+Licensed under the Apache License, version 2.0\\
+\url{http://www.apache.org/licenses/LICENSE-2.0}\\
Development until 2012 by Earth Systems Science Computational Center (ESSCC)\\
Development 2012-2013 by School of Earth Sciences\\
Development from 2014 by Centre for Geoscience Computing (GeoComp)\\
diff --git a/doc/currentdev.tex b/doc/currentdev.tex
index 3ab47d4..1c563c9 100644
--- a/doc/currentdev.tex
+++ b/doc/currentdev.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/docguide.tex b/doc/docguide.tex
index 5c14008..823787c 100644
--- a/doc/docguide.tex
+++ b/doc/docguide.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/doxygen/SConscript b/doc/doxygen/SConscript
index 30df54d..fbdd11c 100644
--- a/doc/doxygen/SConscript
+++ b/doc/doxygen/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/doxygen/doxygen_esys b/doc/doxygen/doxygen_esys
index ea6a3db..41d41e1 100644
--- a/doc/doxygen/doxygen_esys
+++ b/doc/doxygen/doxygen_esys
@@ -2120,7 +2120,7 @@ DOT_NUM_THREADS = 0
# The default value is: Helvetica.
# This tag requires that the tag HAVE_DOT is set to YES.
-DOT_FONTNAME = FreeSans
+#DOT_FONTNAME = FreeSans
# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
# dot graphs.
diff --git a/doc/elist.tex b/doc/elist.tex
index b5dbb88..e6bc85f 100644
--- a/doc/elist.tex
+++ b/doc/elist.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/epydoc/SConscript b/doc/epydoc/SConscript
index 74adbec..680f0f2 100644
--- a/doc/epydoc/SConscript
+++ b/doc/epydoc/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/SConscript b/doc/examples/SConscript
index 570cc3b..a2f2057 100644
--- a/doc/examples/SConscript
+++ b/doc/examples/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/cookbook/cblib.py b/doc/examples/cookbook/cblib.py
index 4202274..7d6b96b 100644
--- a/doc/examples/cookbook/cblib.py
+++ b/doc/examples/cookbook/cblib.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/cblib1.py b/doc/examples/cookbook/cblib1.py
index 63dd144..79f2691 100644
--- a/doc/examples/cookbook/cblib1.py
+++ b/doc/examples/cookbook/cblib1.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/cerjen.py b/doc/examples/cookbook/cerjen.py
index 05fed0a..910c09b 100644
--- a/doc/examples/cookbook/cerjen.py
+++ b/doc/examples/cookbook/cerjen.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/cookbook/example01a.py b/doc/examples/cookbook/example01a.py
index 4a9075a..1d0cd6d 100644
--- a/doc/examples/cookbook/example01a.py
+++ b/doc/examples/cookbook/example01a.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example01b.py b/doc/examples/cookbook/example01b.py
index 1d62620..458c113 100644
--- a/doc/examples/cookbook/example01b.py
+++ b/doc/examples/cookbook/example01b.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example01c.py b/doc/examples/cookbook/example01c.py
index 4c109ea..05b70ab 100644
--- a/doc/examples/cookbook/example01c.py
+++ b/doc/examples/cookbook/example01c.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example02.py b/doc/examples/cookbook/example02.py
index 538057d..af82f73 100644
--- a/doc/examples/cookbook/example02.py
+++ b/doc/examples/cookbook/example02.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example03a.py b/doc/examples/cookbook/example03a.py
index 4099bb7..c2441f5 100644
--- a/doc/examples/cookbook/example03a.py
+++ b/doc/examples/cookbook/example03a.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example03b.py b/doc/examples/cookbook/example03b.py
index 626a16d..0d81395 100644
--- a/doc/examples/cookbook/example03b.py
+++ b/doc/examples/cookbook/example03b.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example04a.py b/doc/examples/cookbook/example04a.py
index c47edd7..8fc89f9 100644
--- a/doc/examples/cookbook/example04a.py
+++ b/doc/examples/cookbook/example04a.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example04b.py b/doc/examples/cookbook/example04b.py
index 43e4db5..2e681ba 100644
--- a/doc/examples/cookbook/example04b.py
+++ b/doc/examples/cookbook/example04b.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example05a.py b/doc/examples/cookbook/example05a.py
index 20fc9f4..20f62c9 100644
--- a/doc/examples/cookbook/example05a.py
+++ b/doc/examples/cookbook/example05a.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example05b.py b/doc/examples/cookbook/example05b.py
index 2a93f62..a837f92 100644
--- a/doc/examples/cookbook/example05b.py
+++ b/doc/examples/cookbook/example05b.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example05c.py b/doc/examples/cookbook/example05c.py
index 4af2bb6..fd4fcce 100644
--- a/doc/examples/cookbook/example05c.py
+++ b/doc/examples/cookbook/example05c.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example06.py b/doc/examples/cookbook/example06.py
index 7449fb2..20af3eb 100644
--- a/doc/examples/cookbook/example06.py
+++ b/doc/examples/cookbook/example06.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example07a.py b/doc/examples/cookbook/example07a.py
index 9b65cd7..ebc32a9 100644
--- a/doc/examples/cookbook/example07a.py
+++ b/doc/examples/cookbook/example07a.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example07b.py b/doc/examples/cookbook/example07b.py
index 9dcdf50..3ca1c8b 100644
--- a/doc/examples/cookbook/example07b.py
+++ b/doc/examples/cookbook/example07b.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example08a.py b/doc/examples/cookbook/example08a.py
index ba88e06..ce0d852 100644
--- a/doc/examples/cookbook/example08a.py
+++ b/doc/examples/cookbook/example08a.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example08b.py b/doc/examples/cookbook/example08b.py
index ff2eb24..92195b6 100644
--- a/doc/examples/cookbook/example08b.py
+++ b/doc/examples/cookbook/example08b.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example08c.py b/doc/examples/cookbook/example08c.py
index af95fbb..a36aeaa 100644
--- a/doc/examples/cookbook/example08c.py
+++ b/doc/examples/cookbook/example08c.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example09a.py b/doc/examples/cookbook/example09a.py
index 158adfb..2747077 100644
--- a/doc/examples/cookbook/example09a.py
+++ b/doc/examples/cookbook/example09a.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example09b.py b/doc/examples/cookbook/example09b.py
index e8b779c..a409b83 100644
--- a/doc/examples/cookbook/example09b.py
+++ b/doc/examples/cookbook/example09b.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example09c.py b/doc/examples/cookbook/example09c.py
index 58cf640..f5d6328 100644
--- a/doc/examples/cookbook/example09c.py
+++ b/doc/examples/cookbook/example09c.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
############################################################FILE HEADER
diff --git a/doc/examples/cookbook/example09m.py b/doc/examples/cookbook/example09m.py
index e25a9c8..70b075d 100644
--- a/doc/examples/cookbook/example09m.py
+++ b/doc/examples/cookbook/example09m.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example09n.py b/doc/examples/cookbook/example09n.py
index 17d86de..de13492 100644
--- a/doc/examples/cookbook/example09n.py
+++ b/doc/examples/cookbook/example09n.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10a.py b/doc/examples/cookbook/example10a.py
index db362b4..3bcafe6 100644
--- a/doc/examples/cookbook/example10a.py
+++ b/doc/examples/cookbook/example10a.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10b.py b/doc/examples/cookbook/example10b.py
index c7c80eb..acb9552 100644
--- a/doc/examples/cookbook/example10b.py
+++ b/doc/examples/cookbook/example10b.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10c_0.py b/doc/examples/cookbook/example10c_0.py
index f6202ca..6dbdbff 100644
--- a/doc/examples/cookbook/example10c_0.py
+++ b/doc/examples/cookbook/example10c_0.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/cookbook/example10c_1.py b/doc/examples/cookbook/example10c_1.py
index 44ef5ae..05febd7 100644
--- a/doc/examples/cookbook/example10c_1.py
+++ b/doc/examples/cookbook/example10c_1.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10d.py b/doc/examples/cookbook/example10d.py
index 96d1854..0131296 100644
--- a/doc/examples/cookbook/example10d.py
+++ b/doc/examples/cookbook/example10d.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10e.py b/doc/examples/cookbook/example10e.py
index daa4cac..4a28308 100644
--- a/doc/examples/cookbook/example10e.py
+++ b/doc/examples/cookbook/example10e.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10m.py b/doc/examples/cookbook/example10m.py
index efaa282..dbc7b6a 100644
--- a/doc/examples/cookbook/example10m.py
+++ b/doc/examples/cookbook/example10m.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example10p.py b/doc/examples/cookbook/example10p.py
index 759eb64..705a4ad 100644
--- a/doc/examples/cookbook/example10p.py
+++ b/doc/examples/cookbook/example10p.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example11a.py b/doc/examples/cookbook/example11a.py
index e045570..3827a6f 100644
--- a/doc/examples/cookbook/example11a.py
+++ b/doc/examples/cookbook/example11a.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example11b.py b/doc/examples/cookbook/example11b.py
index 4ddfdaf..761c28b 100644
--- a/doc/examples/cookbook/example11b.py
+++ b/doc/examples/cookbook/example11b.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example11c.py b/doc/examples/cookbook/example11c.py
index ba92a39..943ba87 100644
--- a/doc/examples/cookbook/example11c.py
+++ b/doc/examples/cookbook/example11c.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/example11m.py b/doc/examples/cookbook/example11m.py
index a1717e6..9f702e8 100644
--- a/doc/examples/cookbook/example11m.py
+++ b/doc/examples/cookbook/example11m.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/cookbook/wave_stab.py b/doc/examples/cookbook/wave_stab.py
index 1a2c840..282cf9a 100644
--- a/doc/examples/cookbook/wave_stab.py
+++ b/doc/examples/cookbook/wave_stab.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Antony Hallam
diff --git a/doc/examples/cookbook/wavesolver2d001.py b/doc/examples/cookbook/wavesolver2d001.py
index 8464a91..d03e211 100644
--- a/doc/examples/cookbook/wavesolver2d001.py
+++ b/doc/examples/cookbook/wavesolver2d001.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# You can shorten the execution time by reducing variable tend from 60 to 0.5
diff --git a/doc/examples/cookbook/wavesolver2d002.py b/doc/examples/cookbook/wavesolver2d002.py
index 38e49a5..1367672 100644
--- a/doc/examples/cookbook/wavesolver2d002.py
+++ b/doc/examples/cookbook/wavesolver2d002.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# You can shorten the execution time by reducing variable tend from 60 to 0.5
diff --git a/doc/examples/cookbook/wavesolver2d003.py b/doc/examples/cookbook/wavesolver2d003.py
index 576b0c4..9a3afd9 100644
--- a/doc/examples/cookbook/wavesolver2d003.py
+++ b/doc/examples/cookbook/wavesolver2d003.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# You can shorten the execution time by reducing variable tend from 60 to 0.5
diff --git a/doc/examples/cookbook/wavesolver2d004.py b/doc/examples/cookbook/wavesolver2d004.py
index e7162ae..0a663fd 100644
--- a/doc/examples/cookbook/wavesolver2d004.py
+++ b/doc/examples/cookbook/wavesolver2d004.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# You can shorten the execution time by reducing variable tend from 60 to 0.5
diff --git a/doc/examples/geotutorial/backward_euler.py b/doc/examples/geotutorial/backward_euler.py
index c3e6576..3be8b03 100644
--- a/doc/examples/geotutorial/backward_euler.py
+++ b/doc/examples/geotutorial/backward_euler.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# import tools
diff --git a/doc/examples/geotutorial/forward_euler.py b/doc/examples/geotutorial/forward_euler.py
index b976d98..bf493dc 100644
--- a/doc/examples/geotutorial/forward_euler.py
+++ b/doc/examples/geotutorial/forward_euler.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# import tools
diff --git a/doc/examples/geotutorial/myfirstscript.py b/doc/examples/geotutorial/myfirstscript.py
index ddd4254..64ac2b4 100644
--- a/doc/examples/geotutorial/myfirstscript.py
+++ b/doc/examples/geotutorial/myfirstscript.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import sys
diff --git a/doc/examples/geotutorial/steadystate.py b/doc/examples/geotutorial/steadystate.py
index 6bd3fd3..3cb5218 100644
--- a/doc/examples/geotutorial/steadystate.py
+++ b/doc/examples/geotutorial/steadystate.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# import tools
diff --git a/doc/examples/geotutorial/steadystate_variablek.py b/doc/examples/geotutorial/steadystate_variablek.py
index 4f78a95..cdf50b3 100644
--- a/doc/examples/geotutorial/steadystate_variablek.py
+++ b/doc/examples/geotutorial/steadystate_variablek.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# import tools
diff --git a/doc/examples/inversion/create_netcdf.py b/doc/examples/inversion/create_netcdf.py
index 66d308f..ed64b66 100644
--- a/doc/examples/inversion/create_netcdf.py
+++ b/doc/examples/inversion/create_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/inversion/dc_forward.py b/doc/examples/inversion/dc_forward.py
index 4b41023..358ec8c 100644
--- a/doc/examples/inversion/dc_forward.py
+++ b/doc/examples/inversion/dc_forward.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/inversion/grav_ermapper.py b/doc/examples/inversion/grav_ermapper.py
index 52e18b3..bee7439 100644
--- a/doc/examples/inversion/grav_ermapper.py
+++ b/doc/examples/inversion/grav_ermapper.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
"""3D gravity inversion example using ER Mapper data"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/grav_netcdf.py b/doc/examples/inversion/grav_netcdf.py
index 11edaec..a6f3b88 100644
--- a/doc/examples/inversion/grav_netcdf.py
+++ b/doc/examples/inversion/grav_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
"""3D gravity inversion example using netCDF data"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/gravmag_netcdf.py b/doc/examples/inversion/gravmag_netcdf.py
index 00da435..901e0ff 100644
--- a/doc/examples/inversion/gravmag_netcdf.py
+++ b/doc/examples/inversion/gravmag_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
"""3D gravity/magnetic joint inversion example using netCDF data"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/gravmag_nodriver.py b/doc/examples/inversion/gravmag_nodriver.py
index 049b3fa..962a3f3 100644
--- a/doc/examples/inversion/gravmag_nodriver.py
+++ b/doc/examples/inversion/gravmag_nodriver.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,11 +19,11 @@ Advanced 3D gravity/magnetic joint inversion example without using any
inversion drivers
"""
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/gravmag_wgs84_nodriver.py b/doc/examples/inversion/gravmag_wgs84_nodriver.py
index 792ab5a..97c77e0 100644
--- a/doc/examples/inversion/gravmag_wgs84_nodriver.py
+++ b/doc/examples/inversion/gravmag_wgs84_nodriver.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,11 +19,11 @@ Advanced 3D gravity/magnetic joint inversion example without using any
inversion drivers
"""
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/mag_netcdf.py b/doc/examples/inversion/mag_netcdf.py
index 656118a..679289f 100644
--- a/doc/examples/inversion/mag_netcdf.py
+++ b/doc/examples/inversion/mag_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
"""3D magnetic inversion example using netCDF data"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/mag_wgs84_netcdf.py b/doc/examples/inversion/mag_wgs84_netcdf.py
index 098f761..e15ad27 100644
--- a/doc/examples/inversion/mag_wgs84_netcdf.py
+++ b/doc/examples/inversion/mag_wgs84_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@ from __future__ import division, print_function
"""3D magnetic inversion example using netCDF data"""
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/plot_ermapper.py b/doc/examples/inversion/plot_ermapper.py
index b58e453..5bcfb73 100644
--- a/doc/examples/inversion/plot_ermapper.py
+++ b/doc/examples/inversion/plot_ermapper.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/inversion/plot_netcdf.py b/doc/examples/inversion/plot_netcdf.py
index c292785..0094c75 100644
--- a/doc/examples/inversion/plot_netcdf.py
+++ b/doc/examples/inversion/plot_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/inversion/strong_gravmag_netcdf.py b/doc/examples/inversion/strong_gravmag_netcdf.py
index 4b9259f..f8633db 100644
--- a/doc/examples/inversion/strong_gravmag_netcdf.py
+++ b/doc/examples/inversion/strong_gravmag_netcdf.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@ from __future__ import division, print_function
"""3D gravity/magnetic joint inversion example using netCDF data"""
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# Import required modules
diff --git a/doc/examples/inversion/synthetic_HTI.py b/doc/examples/inversion/synthetic_HTI.py
index af8cecf..81010b6 100644
--- a/doc/examples/inversion/synthetic_HTI.py
+++ b/doc/examples/inversion/synthetic_HTI.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
@@ -16,8 +16,8 @@ from __future__ import print_function, division
__copyright__="""Copyright (c) 2003-2015 by University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/inversion/synthetic_TTI.py b/doc/examples/inversion/synthetic_TTI.py
index 1be4358..88f10c6 100644
--- a/doc/examples/inversion/synthetic_TTI.py
+++ b/doc/examples/inversion/synthetic_TTI.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
@@ -13,11 +13,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/inversion/synthetic_VTI.py b/doc/examples/inversion/synthetic_VTI.py
index 67de9b4..9a49527 100644
--- a/doc/examples/inversion/synthetic_VTI.py
+++ b/doc/examples/inversion/synthetic_VTI.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
@@ -13,11 +13,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/inversion/synthetic_sonic.py b/doc/examples/inversion/synthetic_sonic.py
index 9d3faf2..bad37cc 100644
--- a/doc/examples/inversion/synthetic_sonic.py
+++ b/doc/examples/inversion/synthetic_sonic.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
@@ -13,11 +13,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/inversion/synthetic_sonicHTI.py b/doc/examples/inversion/synthetic_sonicHTI.py
index 8cff398..7d4098f 100644
--- a/doc/examples/inversion/synthetic_sonicHTI.py
+++ b/doc/examples/inversion/synthetic_sonicHTI.py
@@ -2,12 +2,12 @@ from __future__ import division
from __future__ import print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
@@ -15,11 +15,11 @@ from __future__ import print_function
##############################################################################
from __future__ import print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/inversion/test_commemi1.py b/doc/examples/inversion/test_commemi1.py
index fa7051d..a701528 100644
--- a/doc/examples/inversion/test_commemi1.py
+++ b/doc/examples/inversion/test_commemi1.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/inversion/test_commemi4.py b/doc/examples/inversion/test_commemi4.py
index cafbebf..9d3c6a0 100644
--- a/doc/examples/inversion/test_commemi4.py
+++ b/doc/examples/inversion/test_commemi4.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/usersguide/brick.py b/doc/examples/usersguide/brick.py
index 44e62e9..6a7d9d7 100644
--- a/doc/examples/usersguide/brick.py
+++ b/doc/examples/usersguide/brick.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/brick_stl.py b/doc/examples/usersguide/brick_stl.py
index c89a507..7f3addf 100644
--- a/doc/examples/usersguide/brick_stl.py
+++ b/doc/examples/usersguide/brick_stl.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/darcy.py b/doc/examples/usersguide/darcy.py
index c1b3b1b..4c0fb78 100644
--- a/doc/examples/usersguide/darcy.py
+++ b/doc/examples/usersguide/darcy.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/diffusion.py b/doc/examples/usersguide/diffusion.py
index e5638a0..f2c3fc1 100644
--- a/doc/examples/usersguide/diffusion.py
+++ b/doc/examples/usersguide/diffusion.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/dirac.py b/doc/examples/usersguide/dirac.py
index 6997a54..90f2389 100644
--- a/doc/examples/usersguide/dirac.py
+++ b/doc/examples/usersguide/dirac.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ example to demonstrate the use of Dirac Delta functions
"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/doc/examples/usersguide/fluid.py b/doc/examples/usersguide/fluid.py
index 0686bba..dc72a03 100644
--- a/doc/examples/usersguide/fluid.py
+++ b/doc/examples/usersguide/fluid.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2008-2015 by The University of Queensland
+# Copyright (c) 2008-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/usersguide/heatedblock.py b/doc/examples/usersguide/heatedblock.py
index eb51ea3..b66999d 100644
--- a/doc/examples/usersguide/heatedblock.py
+++ b/doc/examples/usersguide/heatedblock.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/helmholtz.py b/doc/examples/usersguide/helmholtz.py
index 1fe67bf..701f35b 100644
--- a/doc/examples/usersguide/helmholtz.py
+++ b/doc/examples/usersguide/helmholtz.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/int_save.py b/doc/examples/usersguide/int_save.py
index d693c2a..c6dd3b4 100644
--- a/doc/examples/usersguide/int_save.py
+++ b/doc/examples/usersguide/int_save.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/doc/examples/usersguide/lame.py b/doc/examples/usersguide/lame.py
index e7a9ee1..2d66398 100644
--- a/doc/examples/usersguide/lame.py
+++ b/doc/examples/usersguide/lame.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/usersguide/lid_driven_cavity.py b/doc/examples/usersguide/lid_driven_cavity.py
index 6cebfad..f272bd4 100644
--- a/doc/examples/usersguide/lid_driven_cavity.py
+++ b/doc/examples/usersguide/lid_driven_cavity.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# $Id:$
diff --git a/doc/examples/usersguide/mount.py b/doc/examples/usersguide/mount.py
index e1b268a..da6f0fd 100644
--- a/doc/examples/usersguide/mount.py
+++ b/doc/examples/usersguide/mount.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
from esys.escript.models import Mountains
diff --git a/doc/examples/usersguide/poisson.py b/doc/examples/usersguide/poisson.py
index 2f9e856..0fd56c7 100644
--- a/doc/examples/usersguide/poisson.py
+++ b/doc/examples/usersguide/poisson.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/poisson_matplotlib.py b/doc/examples/usersguide/poisson_matplotlib.py
index c43377c..67d38d0 100644
--- a/doc/examples/usersguide/poisson_matplotlib.py
+++ b/doc/examples/usersguide/poisson_matplotlib.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import matplotlib
diff --git a/doc/examples/usersguide/poisson_vtk.py b/doc/examples/usersguide/poisson_vtk.py
index ff50400..b6ab474 100644
--- a/doc/examples/usersguide/poisson_vtk.py
+++ b/doc/examples/usersguide/poisson_vtk.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division, print_function
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/doc/examples/usersguide/quad.py b/doc/examples/usersguide/quad.py
index 9ca20a7..ddc3101 100644
--- a/doc/examples/usersguide/quad.py
+++ b/doc/examples/usersguide/quad.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/usersguide/refine.py b/doc/examples/usersguide/refine.py
index aa3af6b..da1040b 100644
--- a/doc/examples/usersguide/refine.py
+++ b/doc/examples/usersguide/refine.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/doc/examples/usersguide/slip.py b/doc/examples/usersguide/slip.py
index 3758b3f..ed7df6e 100644
--- a/doc/examples/usersguide/slip.py
+++ b/doc/examples/usersguide/slip.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/doc/examples/usersguide/trapezoid.py b/doc/examples/usersguide/trapezoid.py
index da04755..d2cf4a3 100644
--- a/doc/examples/usersguide/trapezoid.py
+++ b/doc/examples/usersguide/trapezoid.py
@@ -1,12 +1,12 @@
from __future__ import division
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@ from __future__ import division
#
##############################################################################
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.pycad import *
diff --git a/doc/examples/usersguide/voxet_reader.py b/doc/examples/usersguide/voxet_reader.py
index 7971fbc..2bff33a 100644
--- a/doc/examples/usersguide/voxet_reader.py
+++ b/doc/examples/usersguide/voxet_reader.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/examples/usersguide/wave.py b/doc/examples/usersguide/wave.py
index f9feea3..6f1ee85 100644
--- a/doc/examples/usersguide/wave.py
+++ b/doc/examples/usersguide/wave.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import matplotlib
diff --git a/doc/install/SConscript b/doc/install/SConscript
index d6e95e9..ea9fb5c 100644
--- a/doc/install/SConscript
+++ b/doc/install/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/allsrccommon.tex b/doc/install/allsrccommon.tex
index f607287..dc7dcfc 100644
--- a/doc/install/allsrccommon.tex
+++ b/doc/install/allsrccommon.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/binlinux.tex b/doc/install/binlinux.tex
index 69ad418..c111f31 100644
--- a/doc/install/binlinux.tex
+++ b/doc/install/binlinux.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/binmac.tex b/doc/install/binmac.tex
index a32c199..4fe7b88 100644
--- a/doc/install/binmac.tex
+++ b/doc/install/binmac.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/chcomp.tex b/doc/install/chcomp.tex
index c1c1c41..e36e476 100644
--- a/doc/install/chcomp.tex
+++ b/doc/install/chcomp.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2014-2015 by The University of Queensland
+% Copyright (c) 2014-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/compiler.tex b/doc/install/compiler.tex
index b792157..b93b03f 100644
--- a/doc/install/compiler.tex
+++ b/doc/install/compiler.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/debbin.tex b/doc/install/debbin.tex
index c57dff8..61e663d 100644
--- a/doc/install/debbin.tex
+++ b/doc/install/debbin.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/install.tex b/doc/install/install.tex
index 6ac37ac..633fd81 100644
--- a/doc/install/install.tex
+++ b/doc/install/install.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -53,7 +53,7 @@ Email: \email{esys at esscc.uq.edu.au}
\tableofcontents
\include{intro}
-\include{debbin}
+% \include{debbin}
\include{source}
\esysappendix
diff --git a/doc/install/install_defs.tex b/doc/install/install_defs.tex
index 24d88e2..0b0eedd 100644
--- a/doc/install/install_defs.tex
+++ b/doc/install/install_defs.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/intro.tex b/doc/install/intro.tex
index bd04154..a4db23b 100644
--- a/doc/install/intro.tex
+++ b/doc/install/intro.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -23,16 +23,17 @@ from launchpad.
\esfinley is primarily developed on Linux desktop, SGI ICE and \macosx systems.
-It can be installed in two ways:
-\begin{enumerate}
- \item Binary packages -- ready to run with no compilation required. These are available for recent Debian and Ubuntu distributions.
- \item From source -- that is, it must be compiled for your machine.
- This will be required if you are running anything other than Debian/Ubuntu
- or if extra functionality is required.
-\end{enumerate}
+This guide covers installing the packages from source.
+% It can be installed in two ways:
+% \begin{enumerate}
+% \item Binary packages -- ready to run with no compilation required. These are available for recent Debian and Ubuntu distributions.
+% \item From source -- that is, it must be compiled for your machine.
+% This will be required if you are running anything other than Debian/Ubuntu
+% or if extra functionality is required.
+% \end{enumerate}
See the site \url{https://answers.launchpad.net/escript-finley} for online help.
-Chapter~\ref{chap:bin} describes how to install binary packages on Debian/Ubuntu systems.
+% Chapter~\ref{chap:bin} describes how to install binary packages on Debian/Ubuntu systems.
Chapter~\ref{chap:source} covers installing from source.
diff --git a/doc/install/source.tex b/doc/install/source.tex
index d4bf047..8478837 100644
--- a/doc/install/source.tex
+++ b/doc/install/source.tex
@@ -1,11 +1,11 @@
%!TEX root = install.tex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2012-2015 by The University of Queensland
+% Copyright (c) 2012-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -41,9 +41,6 @@ Our current test compilers include:
\item intel icpc v15
\end{itemize}
-g++ 5 is known to have an optimisation bug that will cause \escript to
-crash. An alternate compiler will be required until this bug has been fixed.
-
Note that:
\begin{itemize}
\item OpenMP will not function correctly for g++ $\leq$ 4.2.1 (and is not currently supported by clang).
@@ -72,22 +69,22 @@ If not, then consult the documentation for your MPI libraries (or the compiler d
If you are using MacOSX, then see the next section, if not, then skip to Section~\ref{sec:build}.
\section{MacOS}
-This release of \escript has only been tested on OSX 10.9 and 10.10.
+This release of \escript has only been tested on OSX 10.11.
For this section we assume you are using either \texttt{homebrew} or \texttt{MacPorts} as a package
manager\footnote{Note that package managers will make changes to your computer based on programs configured by other people from
various places around the internet. It is important to satisfy yourself as to the security of those systems.}.
You can of course install prerequisite software in other other ways.
For example, we have had \emph{some} success changing the default
compilers used by those systems. However this is more complicated and we do not provide a guide here.
-Successful combinations of OSX and package managers are given in the table below.
-
-\begin{center}
-\begin{tabular}{|c|c|c|}\hline
- & \texttt{homebrew} & \texttt{MacPorts} \\\hline
-OSX 10.9 & Yes & No\\\hline
-OSX 10.10& Yes & Yes\\\hline
-\end{tabular}
-\end{center}
+% Successful combinations of OSX and package managers are given in the table below.
+%
+% \begin{center}
+% \begin{tabular}{|c|c|c|}\hline
+% & \texttt{homebrew} & \texttt{MacPorts} \\\hline
+% OSX 10.9 & Yes & No\\\hline
+% OSX 10.10& Yes & Yes\\\hline
+% \end{tabular}
+% \end{center}
\noindent Both of those systems require the XCode command line tools to be installed\footnote{As of OSX10.9, the
command \texttt{xcode-select --install} will allow you to download and install the commandline tools.}.
@@ -249,9 +246,7 @@ scons -j1 options_file=scons/templates/centos7_0_options.py
\noindent Now go to Section~\ref{sec:cleanup} for cleanup.
\subsection{Fedora}\label{sec:fedorasrc}
-These instructions were prepared using release $21.5$. Release $22$ by default
-uses gcc 5.2, which currently has an optimisation bug that will cause
-\escript to crash.
+These instructions were prepared using release $21.5$.
\noindent Install packages
\begin{shellCode}
@@ -273,7 +268,7 @@ scons -j1 py_tests options_file=scons/templates/fedora21_5_options.py
\noindent Now go to Section~\ref{sec:cleanup} for cleanup.
-\subsection{MacOS 10.10 (macports)}\label{sec:macportsrc}
+\subsection{MacOS 10.10/10.11 (macports)}\label{sec:macportsrc}
The following will install the capabilities needed for the \texttt{macports_10.10_options.py} file.
@@ -296,10 +291,10 @@ scons -j1 options_file=scons/templates/macports_10.10options.py
\end{shellCode}
-\subsection{MacOS 10.9, 10.10 (homebrew)}\label{sec:homebrewsrc}
+\subsection{10.10/10.11 (homebrew)}\label{sec:homebrewsrc}
The following will install the capabilities needed for the \texttt{homebrew_10.10_options.py} file.
-OSX 10.9 can use the same file.
+For OS 10.11 use \texttt{homebrew_11_options.py} instead.
\begin{shellCode}
brew install scons
diff --git a/doc/install/srcadditional.tex b/doc/install/srcadditional.tex
index 117062f..207a844 100644
--- a/doc/install/srcadditional.tex
+++ b/doc/install/srcadditional.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/srclinux.tex b/doc/install/srclinux.tex
index 9d3ee45..e651e48 100644
--- a/doc/install/srclinux.tex
+++ b/doc/install/srclinux.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/install/srcmac.tex b/doc/install/srcmac.tex
index 770a8da..6491f35 100644
--- a/doc/install/srcmac.tex
+++ b/doc/install/srcmac.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/CookDcRes.tex b/doc/inversion/CookDcRes.tex
index 486cf7f..caab6d4 100644
--- a/doc/inversion/CookDcRes.tex
+++ b/doc/inversion/CookDcRes.tex
@@ -1,11 +1,11 @@
%!TEX root = inversion.tex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/Forward2DMTTEMode.tex b/doc/inversion/Forward2DMTTEMode.tex
index c00f3b3..36cdec7 100644
--- a/doc/inversion/Forward2DMTTEMode.tex
+++ b/doc/inversion/Forward2DMTTEMode.tex
@@ -1,11 +1,11 @@
%!TEX root = inversion.tex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/ForwardDCRES.tex b/doc/inversion/ForwardDCRES.tex
index c7e53c3..2cc573b 100644
--- a/doc/inversion/ForwardDCRES.tex
+++ b/doc/inversion/ForwardDCRES.tex
@@ -1,11 +1,11 @@
%!TEX root = inversion.tex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/ForwardGravity.tex b/doc/inversion/ForwardGravity.tex
index 124c539..72807a8 100644
--- a/doc/inversion/ForwardGravity.tex
+++ b/doc/inversion/ForwardGravity.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/ForwardMagnetic.tex b/doc/inversion/ForwardMagnetic.tex
index 636c4c8..781e433 100644
--- a/doc/inversion/ForwardMagnetic.tex
+++ b/doc/inversion/ForwardMagnetic.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/ForwardSelfMagnetic.tex b/doc/inversion/ForwardSelfMagnetic.tex
index 06f33cb..f8b10ab 100644
--- a/doc/inversion/ForwardSelfMagnetic.tex
+++ b/doc/inversion/ForwardSelfMagnetic.tex
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/Minimization.tex b/doc/inversion/Minimization.tex
index 6f7057d..702a01f 100644
--- a/doc/inversion/Minimization.tex
+++ b/doc/inversion/Minimization.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/SConscript b/doc/inversion/SConscript
index b6fedaf..b3f84fc 100644
--- a/doc/inversion/SConscript
+++ b/doc/inversion/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/defs.tex b/doc/inversion/defs.tex
index 57311db..ecabdba 100644
--- a/doc/inversion/defs.tex
+++ b/doc/inversion/defs.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/intro.tex b/doc/inversion/intro.tex
index e73083f..1782990 100644
--- a/doc/inversion/intro.tex
+++ b/doc/inversion/intro.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/inversion/inversion.tex b/doc/inversion/inversion.tex
index 60e5a8e..5097396 100644
--- a/doc/inversion/inversion.tex
+++ b/doc/inversion/inversion.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -42,11 +42,11 @@ St. Lucia, QLD 4072, Australia.}
\maketitle
\begin{center}
-Copyright (c) 2012--2015 by The University of Queensland \\
+Copyright (c) 2012--2016 by The University of Queensland \\
\url{http://www.uq.edu.au} \\
Primary Business: Queensland, Australia \\
-Licensed under the Open Software License version 3.0 \\
-\url{http://www.opensource.org/licenses/osl-3.0.php} \\
+Licensed under the Apache License, version 2.0 \\
+\url{http://www.apache.org/licenses/LICENSE-2.0} \\
This work is supported by the AuScope National Collaborative Research Infrastructure Strategy,
the Queensland State Government and The University of Queensland.
diff --git a/doc/sphinx_api/SConscript b/doc/sphinx_api/SConscript
index 0167aa5..e570bec 100644
--- a/doc/sphinx_api/SConscript
+++ b/doc/sphinx_api/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/sphinx_api/genrst.py b/doc/sphinx_api/genrst.py
index 17d01f1..fd0eca3 100755
--- a/doc/sphinx_api/genrst.py
+++ b/doc/sphinx_api/genrst.py
@@ -1,12 +1,12 @@
#!/usr/bin/env python
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/Models.tex b/doc/user/Models.tex
index 16a5d27..a5c4b62 100644
--- a/doc/user/Models.tex
+++ b/doc/user/Models.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/SConscript b/doc/user/SConscript
index c82dc8e..039ef7e 100644
--- a/doc/user/SConscript
+++ b/doc/user/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/TutorialPDE.tex b/doc/user/TutorialPDE.tex
index 718b226..8d6f5d2 100644
--- a/doc/user/TutorialPDE.tex
+++ b/doc/user/TutorialPDE.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/appendix.tex b/doc/user/appendix.tex
index b9a8c3c..23e6392 100644
--- a/doc/user/appendix.tex
+++ b/doc/user/appendix.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/changes.tex b/doc/user/changes.tex
index 8c7fdc7..c685ac7 100644
--- a/doc/user/changes.tex
+++ b/doc/user/changes.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
@@ -16,6 +16,19 @@
\chapter{Changes from previous releases}
\label{app:changes}
+\subsection*{4.1 to 4.2}
+\begin{itemize}
+ \item UMFPACK fixes.
+ \item Work to support long indexes (very large numbers of elements)
+ \item Improved decomposition for larger numbers of threads.
+ \item Added build sanity check to build steps.
+ \item Ripley now uses MPI-IO.
+ \item Work to help with intended Debian packaging.
+ \item Fixes to keep clang happy.
+ \item Fixes to accomodate (OSX + clang)'s new library loading policies.
+ \item Other bug fixes.
+\end{itemize}
+
\subsection*{4.0 to 4.1}
\begin{itemize}
\item Added multi-resolution \ripley domains
diff --git a/doc/user/darcyflux.tex b/doc/user/darcyflux.tex
index 7df36e7..e7a2b77 100644
--- a/doc/user/darcyflux.tex
+++ b/doc/user/darcyflux.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/diffusion.tex b/doc/user/diffusion.tex
index f40fba5..9111fcd 100644
--- a/doc/user/diffusion.tex
+++ b/doc/user/diffusion.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/dirac.tex b/doc/user/dirac.tex
index 3ddc342..c678cfb 100644
--- a/doc/user/dirac.tex
+++ b/doc/user/dirac.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/escript.tex b/doc/user/escript.tex
index 5277a99..132b5e6 100644
--- a/doc/user/escript.tex
+++ b/doc/user/escript.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/execute.tex b/doc/user/execute.tex
index 572cc5c..301db14 100644
--- a/doc/user/execute.tex
+++ b/doc/user/execute.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/faultsystem.tex b/doc/user/faultsystem.tex
index 7fb4e96..0ea0af7 100644
--- a/doc/user/faultsystem.tex
+++ b/doc/user/faultsystem.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/finley.tex b/doc/user/finley.tex
index 09758bf..104ee61 100644
--- a/doc/user/finley.tex
+++ b/doc/user/finley.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/finleyelements.tex b/doc/user/finleyelements.tex
index 51e9bc5..a5ec829 100644
--- a/doc/user/finleyelements.tex
+++ b/doc/user/finleyelements.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/firststep.tex b/doc/user/firststep.tex
index 7f3b159..456e3df 100644
--- a/doc/user/firststep.tex
+++ b/doc/user/firststep.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/heatedblock.tex b/doc/user/heatedblock.tex
index ec708e2..a96010b 100644
--- a/doc/user/heatedblock.tex
+++ b/doc/user/heatedblock.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/levelset.tex b/doc/user/levelset.tex
index f01d01b..bca7097 100644
--- a/doc/user/levelset.tex
+++ b/doc/user/levelset.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/levelsetmodel.tex b/doc/user/levelsetmodel.tex
index b7ce774..c0f28fa 100644
--- a/doc/user/levelsetmodel.tex
+++ b/doc/user/levelsetmodel.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/linearPDE.tex b/doc/user/linearPDE.tex
index a1b8f58..245821c 100644
--- a/doc/user/linearPDE.tex
+++ b/doc/user/linearPDE.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/lumping.tex b/doc/user/lumping.tex
index 0368947..2223c4b 100644
--- a/doc/user/lumping.tex
+++ b/doc/user/lumping.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/modelframe.tex b/doc/user/modelframe.tex
index c2cbe53..2e22767 100644
--- a/doc/user/modelframe.tex
+++ b/doc/user/modelframe.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/nonlinearPDE.tex b/doc/user/nonlinearPDE.tex
index 075e726..433fc07 100644
--- a/doc/user/nonlinearPDE.tex
+++ b/doc/user/nonlinearPDE.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/notation.tex b/doc/user/notation.tex
index 22c71ff..4240e8c 100644
--- a/doc/user/notation.tex
+++ b/doc/user/notation.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/ourrefs.tex b/doc/user/ourrefs.tex
index e8bf226..e979b40 100644
--- a/doc/user/ourrefs.tex
+++ b/doc/user/ourrefs.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/py3.tex b/doc/user/py3.tex
index 1410c19..fc52399 100644
--- a/doc/user/py3.tex
+++ b/doc/user/py3.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/pycad.tex b/doc/user/pycad.tex
index 69ca436..0b790b1 100644
--- a/doc/user/pycad.tex
+++ b/doc/user/pycad.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/ripley.tex b/doc/user/ripley.tex
index ff63a3e..1b6dd35 100644
--- a/doc/user/ripley.tex
+++ b/doc/user/ripley.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/slip.tex b/doc/user/slip.tex
index fa21af2..ee387b9 100644
--- a/doc/user/slip.tex
+++ b/doc/user/slip.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/speckley.tex b/doc/user/speckley.tex
index fc6de9f..1391885 100644
--- a/doc/user/speckley.tex
+++ b/doc/user/speckley.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/stokesflow.tex b/doc/user/stokesflow.tex
index 472c572..1624cbe 100644
--- a/doc/user/stokesflow.tex
+++ b/doc/user/stokesflow.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/stokessolver.tex b/doc/user/stokessolver.tex
index 1f2cf74..ff1aefa 100644
--- a/doc/user/stokessolver.tex
+++ b/doc/user/stokessolver.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/subworlds.tex b/doc/user/subworlds.tex
index 24f7f85..bd794c9 100644
--- a/doc/user/subworlds.tex
+++ b/doc/user/subworlds.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2015 by The University of Queensland
+% Copyright (c) 2015-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development from 2014 by Centre for Geoscience Computing (GeoComp)
%
diff --git a/doc/user/symbolic.tex b/doc/user/symbolic.tex
index af5c8a1..a1ba35c 100644
--- a/doc/user/symbolic.tex
+++ b/doc/user/symbolic.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/user.tex b/doc/user/user.tex
index ebcc471..2d4153a 100644
--- a/doc/user/user.tex
+++ b/doc/user/user.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/user_defs.tex b/doc/user/user_defs.tex
index 1d8ee0a..4136122 100644
--- a/doc/user/user_defs.tex
+++ b/doc/user/user_defs.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/wave.tex b/doc/user/wave.tex
index 0fa06ea..8d7bd27 100644
--- a/doc/user/wave.tex
+++ b/doc/user/wave.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/user/weipa.tex b/doc/user/weipa.tex
index b61e8e2..830071c 100644
--- a/doc/user/weipa.tex
+++ b/doc/user/weipa.tex
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Copyright (c) 2003-2015 by The University of Queensland
+% Copyright (c) 2003-2016 by The University of Queensland
% http://www.uq.edu.au
%
% Primary Business: Queensland, Australia
-% Licensed under the Open Software License version 3.0
-% http://www.opensource.org/licenses/osl-3.0.php
+% Licensed under the Apache License, version 2.0
+% http://www.apache.org/licenses/LICENSE-2.0
%
% Development until 2012 by Earth Systems Science Computational Center (ESSCC)
% Development 2012-2013 by School of Earth Sciences
diff --git a/doc/verinfo.tex b/doc/verinfo.tex
index 6097256..36aebb8 100644
--- a/doc/verinfo.tex
+++ b/doc/verinfo.tex
@@ -1,7 +1,7 @@
+\newcommand{\relver}{4.2}
+\newcommand{\reldate}{15 January 2016}
+
%\newcommand{\relver}{development}
%\newcommand{\reldate}{\today}
-
-\newcommand{\relver}{4.1}
-\newcommand{\reldate}{24 July 2015}
diff --git a/downunder/py_src/SConscript b/downunder/py_src/SConscript
index 5d0ad21..8b44b44 100644
--- a/downunder/py_src/SConscript
+++ b/downunder/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/downunder/py_src/__init__.py b/downunder/py_src/__init__.py
index d23290e..bc3b956 100644
--- a/downunder/py_src/__init__.py
+++ b/downunder/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from .costfunctions import *
diff --git a/downunder/py_src/coordinates.py b/downunder/py_src/coordinates.py
index 4432cad..2d36cac 100644
--- a/downunder/py_src/coordinates.py
+++ b/downunder/py_src/coordinates.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,18 +18,19 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['ReferenceSystem', 'CartesianReferenceSystem',
'GeodeticReferenceSystem', 'SphericalReferenceSystem',
'WGS84ReferenceSystem', 'GRS80ReferenceSystem',
'SpatialCoordinateTransformation', 'GeodeticCoordinateTransformation',
- 'CartesianCoordinateTransformation', 'makeTranformation']
+ 'CartesianCoordinateTransformation', 'makeTranformation',
+ 'makeTransformation']
from esys.escript import unitsSI as U
import esys.escript as esc
@@ -424,6 +425,25 @@ class GeodeticCoordinateTransformation(SpatialCoordinateTransformation):
def makeTranformation(domain, coordinates=None):
"""
+ DEPRECATED
+
+ returns a `SpatialCoordinateTransformation` for the given domain
+
+ :param domain: domain in the domain of the coordinate transformation
+ :type domain: `esys.escript.AbstractDomain`
+ :param coordinates: the reference system or spatial coordinate system.
+ :type coordinates: `ReferenceSystem` or `SpatialCoordinateTransformation`
+ :return: the spatial coordinate system for the given domain of the specified
+ reference system ``coordinates``. If ``coordinates`` is already spatial coordinate system based on the
+ riven domain ``coordinates`` is returned. Otherwise an appropriate spatial coordinate system
+ is created.
+ :rtype: `SpatialCoordinateTransformation`
+ """
+ print("WARNING: makeTranformation is deprecated, use makeTransformation")
+ return makeTransformation(domain, coordinates)
+
+def makeTransformation(domain, coordinates=None):
+ """
returns a `SpatialCoordinateTransformation` for the given domain
:param domain: domain in the domain of the coordinate transformation
diff --git a/downunder/py_src/costfunctions.py b/downunder/py_src/costfunctions.py
index 74cc981..a26a4e8 100644
--- a/downunder/py_src/costfunctions.py
+++ b/downunder/py_src/costfunctions.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = [ 'CostFunction', 'MeteredCostFunction' ]
diff --git a/downunder/py_src/datasources.py b/downunder/py_src/datasources.py
index 87dd0b7..0864cf3 100644
--- a/downunder/py_src/datasources.py
+++ b/downunder/py_src/datasources.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['DataSource', 'ErMapperData', 'NumpyData', \
@@ -726,6 +726,7 @@ class NetCdfData(DataSource):
# this should give us about meter-accuracy with lat/lon coords
r=5
self.__delta=[np.round(lengths[i]/self.__nPts[i],r) for i in range(2)]
+ del longitude, latitude, d, datavar
f.close()
def getDataExtents(self):
diff --git a/downunder/py_src/dcresistivityforwardmodeling.py b/downunder/py_src/dcresistivityforwardmodeling.py
index b607e65..acac872 100644
--- a/downunder/py_src/dcresistivityforwardmodeling.py
+++ b/downunder/py_src/dcresistivityforwardmodeling.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/downunder/py_src/domainbuilder.py b/downunder/py_src/domainbuilder.py
index 8187c18..71d6cb7 100644
--- a/downunder/py_src/domainbuilder.py
+++ b/downunder/py_src/domainbuilder.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['DomainBuilder']
diff --git a/downunder/py_src/forwardmodels/__init__.py b/downunder/py_src/forwardmodels/__init__.py
index f92c981..d749504 100644
--- a/downunder/py_src/forwardmodels/__init__.py
+++ b/downunder/py_src/forwardmodels/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ from __future__ import print_function, division
"""Collection of forward models that define the inversion problem"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from .base import *
diff --git a/downunder/py_src/forwardmodels/acoustic.py b/downunder/py_src/forwardmodels/acoustic.py
index 7503581..2eca830 100644
--- a/downunder/py_src/forwardmodels/acoustic.py
+++ b/downunder/py_src/forwardmodels/acoustic.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,17 +16,17 @@
"""Forward model for acoustic wave forms"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['AcousticWaveForm']
from .base import ForwardModel
-from esys.downunder.coordinates import makeTranformation
+from esys.downunder.coordinates import makeTransformation
from esys.escript import Data, DiracDeltaFunctions, FunctionOnBoundary
from esys.escript.linearPDEs import LinearPDE, SolverOptions
from esys.escript.util import *
@@ -82,7 +82,7 @@ class AcousticWaveForm(ForwardModel):
:type fixAtBottom: ``bool``
"""
super(AcousticWaveForm, self).__init__()
- self.__trafo = makeTranformation(domain, coordinates)
+ self.__trafo = makeTransformation(domain, coordinates)
if not self.getCoordinateTransformation().isCartesian():
raise ValueError("Non-Cartesian Coordinates are not supported yet.")
if not isinstance(data, Data):
diff --git a/downunder/py_src/forwardmodels/base.py b/downunder/py_src/forwardmodels/base.py
index a797757..2ad7422 100644
--- a/downunder/py_src/forwardmodels/base.py
+++ b/downunder/py_src/forwardmodels/base.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,16 +17,16 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['ForwardModel','ForwardModelWithPotential']
-from esys.downunder.coordinates import makeTranformation
+from esys.downunder.coordinates import makeTransformation
from esys.escript.linearPDEs import LinearSinglePDE
from esys.escript.util import *
import numpy as np
@@ -87,7 +87,7 @@ class ForwardModelWithPotential(ForwardModel):
"""
super(ForwardModelWithPotential, self).__init__()
self.__domain = domain
- self.__trafo = makeTranformation(domain, coordinates)
+ self.__trafo = makeTransformation(domain, coordinates)
try:
n=len(w)
diff --git a/downunder/py_src/forwardmodels/dcresistivity.py b/downunder/py_src/forwardmodels/dcresistivity.py
index 9313155..7098a9b 100644
--- a/downunder/py_src/forwardmodels/dcresistivity.py
+++ b/downunder/py_src/forwardmodels/dcresistivity.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,17 +16,17 @@
"""Forward model for DC Resistivity"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['DcRes']
from .base import ForwardModel
-from esys.downunder.coordinates import makeTranformation
+from esys.downunder.coordinates import makeTransformation
from esys.escript import Scalar, DiracDeltaFunctions
from esys.escript.pdetools import Locator
from esys.escript.linearPDEs import LinearPDE
@@ -81,7 +81,7 @@ class DcRes(ForwardModel):
if not len(w) == len(delphiIn):
raise ValueError("Number of confidence factors and number of potential input values don't match.")
- self.__trafo = makeTranformation(domain, coordinates)
+ self.__trafo = makeTransformation(domain, coordinates)
if not self.getCoordinateTransformation().isCartesian():
raise ValueError("Non-Cartesian Coordinates are not supported yet.")
if not isinstance(locator, Locator):
diff --git a/downunder/py_src/forwardmodels/gravity.py b/downunder/py_src/forwardmodels/gravity.py
index 20c7ea7..e7bd247 100644
--- a/downunder/py_src/forwardmodels/gravity.py
+++ b/downunder/py_src/forwardmodels/gravity.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
"""Forward model for gravity (Bouguer) anomaly"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['GravityModel']
diff --git a/downunder/py_src/forwardmodels/magnetic.py b/downunder/py_src/forwardmodels/magnetic.py
index 2fd349e..29db21b 100644
--- a/downunder/py_src/forwardmodels/magnetic.py
+++ b/downunder/py_src/forwardmodels/magnetic.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@ from __future__ import division, print_function
"""Forward models for magnetic fields"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['MagneticModel', 'SelfDemagnetizationModel']
diff --git a/downunder/py_src/forwardmodels/magnetotelluric2d.py b/downunder/py_src/forwardmodels/magnetotelluric2d.py
index 9a328fc..8cdc515 100644
--- a/downunder/py_src/forwardmodels/magnetotelluric2d.py
+++ b/downunder/py_src/forwardmodels/magnetotelluric2d.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,17 +17,17 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['MT2DModelTEMode', 'MT2DModelTMMode']
from .base import ForwardModel
-from esys.downunder.coordinates import makeTranformation
+from esys.downunder.coordinates import makeTransformation
from esys.escript import Data, Scalar, Vector, Function, FunctionOnBoundary, Solution
from esys.escript.linearPDEs import LinearPDE, SolverOptions
from esys.escript.util import *
@@ -39,10 +39,9 @@ class MT2DBase(ForwardModel):
Base class for 2D MT forward models. See `MT2DModelTEMode` and
`MT2DModelTMMode` for actual implementations.
"""
- def __init__(self, domain, omega, x, Z, eta=None, w0=1., mu=4*PI*1e-7,
- Ftop=1., fixAtTop=False, fixAboveLevel=None, Fbottom=0.,
- fixAtBottom=False, coordinates=None, tol=1e-8,
- saveMemory=False, directSolver=True):
+ def __init__(self, domain, omega, x, Z, eta=None, w0=1., mu=4*PI*1e-7, sigma0=0.01,
+ airLayerLevel=None, fixAirLayer=False,
+ coordinates=None, tol=1e-8, saveMemory=False, directSolver=True):
"""
initializes a new forward model.
@@ -60,21 +59,13 @@ class MT2DBase(ForwardModel):
:type w0: ``None`` or a list of positive ``float``
:param mu: permeability
:type mu: ``float``
- :param Ftop: value of field at top of the domain, see `fixAtTop` and
- `fixAboveLevel`
- :type Ftop: ``float``, ``complex`` or ``Data`` of shape (2,)
- :param fixAtTop: if true F is set to Ftop at the top of the domain.
- If both `fixAtTop` and `fixAboveLevel` are set, then
- `fixAboveLevel` takes precedence.
- :type fixAtTop: ``bool``
- :param fixAboveLevel: level above which F is set to Ftop (typically
- the level of the air layer).
- Use `fixAtTop` *or* `fixAboveLevel`, not both.
- :type fixAboveLevel : ``float`` or ``None``
- :param Fbottom: value of field at base of the domain
- :type Fbottom: ``float``, ``complex`` or ``Data`` of shape (2,)
- :param fixAtBottom: if true F is set to Fbottom at the bottom of the domain
- :type fixAtBottom: ``bool``
+ :param sigma0: background conductivity
+ :type sigma0: ``float``
+ :param airLayerLevel: position of the air layer from to bottom of the domain. If not set
+ the air layer starts at the top of the domain
+ :type airLayerLevel : ``float`` or ``None``
+ :param fixAirLayer: fix air layer (TM mode)
+ :type fixAirLayer: ``bool``
:param coordinates: defines coordinate system to be used (not supported yet)
:type coordinates: `ReferenceSystem` or `SpatialCoordinateTransformation`
:param tol: tolerance of underlying PDE
@@ -89,7 +80,7 @@ class MT2DBase(ForwardModel):
:type directSolver: ``bool``
"""
super(MT2DBase, self).__init__()
- self.__trafo = makeTranformation(domain, coordinates)
+ self.__trafo = makeTransformation(domain, coordinates)
if not self.getCoordinateTransformation().isCartesian():
raise ValueError("Non-Cartesian coordinates are not supported yet.")
if len(x) != len(Z):
@@ -110,6 +101,7 @@ class MT2DBase(ForwardModel):
self.__domain = domain
self._omega_mu = omega * mu
+ self._ks=sqrt(self._omega_mu * sigma0 /2.)
xx=Function(domain).getX()
totalS=0
@@ -130,44 +122,30 @@ class MT2DBase(ForwardModel):
if not totalS > 0:
raise ValueError("Scaling of weight factors failed as sum is zero.")
+
DIM = domain.getDim()
z = domain.getX()[DIM-1]
- self._ztop = sup(z)
+ self._ztop= sup(z)
self._zbottom = inf(z)
- self._q=Vector(0.,Solution(domain))
- self._r=Vector(0.,Solution(domain))
- #====================================
- if fixAtTop or fixAboveLevel is not None:
- if fixAboveLevel is not None:
- m=whereNonNegative(z-fixAboveLevel)
- else:
- m=whereZero(z-self._ztop)
- if isinstance(Ftop, float) or isinstance(Ftop, int):
- d = Data((Ftop,0), Solution(domain))
- elif isinstance(Ftop, tuple):
- d = Data((Ftop[0],Ftop[1]), Solution(domain))
- elif isinstance(Ftop, complex):
- d = Data((Ftop.real,Ftop.imag), Solution(domain))
- else:
- if not Ftop.getShape() == (2,):
- raise ValueError("Expected shape of top value is (2,)")
- d = Ftop
- self._r+=m*d
- self._q+=m*[1.,1.]
- if fixAtBottom:
- m=whereZero(z-self._zbottom)
- if isinstance(Fbottom, float) or isinstance(Fbottom, int) :
- d = Data((Fbottom,0), Solution(domain))
- elif isinstance(Fbottom, tuple):
- d = Data((Fbottom[0],Fbottom[1]), Solution(domain))
- elif isinstance(Fbottom, complex):
- d = Data((Fbottom.real,Fbottom.imag), Solution(domain))
- else:
- if not Fbottom.getShape() == (2,):
- raise ValueError("Expected shape of top value is (2,)")
- d = Fbottom
- self._r+=m*d
- self._q+=m*[1.,1.]
+ if airLayerLevel is None:
+ airLayerLevel=self._ztop
+ self._airLayerLevel=airLayerLevel
+
+ # botton:
+ mask0=whereZero(z-self._zbottom)
+ r=mask0* [ exp(self._ks*(self._zbottom -airLayerLevel))*cos(self._ks*(self._zbottom -airLayerLevel)),
+ exp(self._ks*(self._zbottom -airLayerLevel))*sin(self._ks*(self._zbottom -airLayerLevel))]
+
+ #top:
+ if fixAirLayer:
+ mask1=whereNonNegative(z-airLayerLevel)
+ r+=mask1*[ 1, 0 ]
+ else:
+ mask1=whereZero(z-self._ztop)
+ r+=mask1*[ self._ks*(self._ztop-airLayerLevel)+1, self._ks*(self._ztop-airLayerLevel) ]
+
+ self._q=(mask0+mask1)*[1,1]
+ self._r=r
#====================================
self.__tol = tol
self._directSolver = directSolver
@@ -267,13 +245,12 @@ class MT2DModelTEMode(MT2DBase):
* -E_{x,ii} - i omega * mu * sigma * E_x = 0
- where by default the normal derivative of E_x at the top of the domain
- is set to Ex_n=1 and E_x is set to zero at the bottom. Homogeneous Neuman
- conditions are assumed elsewhere. If fixAtTop is set E_x is set to Ex_top.
+ where E_x at top and bottom is set to solution for background field. Homogeneous Neuman
+ conditions are assumed elsewhere.
"""
- def __init__(self, domain, omega, x, Z_XY, eta=None, w0=1., mu=4*PI*1e-7,
- Ex_n=1, coordinates=None, Ex_top=1, fixAtTop=False, tol=1e-8,
- saveMemory=False, directSolver=True):
+ def __init__(self, domain, omega, x, Z_XY, eta=None, w0=1., mu=4*PI*1e-7, sigma0=0.01,
+ airLayerLevel=None, coordinates=None, Ex_top=1, fixAtTop=False,
+ tol=1e-8, saveMemory=False, directSolver=True):
"""
initializes a new forward model. See base class for a description of
the arguments.
@@ -281,10 +258,9 @@ class MT2DModelTEMode(MT2DBase):
f = -1./(complex(0,1)*omega*mu)
scaledZXY = [ z*f for z in Z_XY ]
- self.__Ex_n=complex(Ex_n)
super(MT2DModelTEMode, self).__init__(domain=domain, omega=omega, x=x,
- Z=scaledZXY, eta=eta, w0=w0, mu=mu,
- Ftop=Ex_top, fixAtTop=fixAtTop, fixAboveLevel= None, Fbottom=0., fixAtBottom=True,
+ Z=scaledZXY, eta=eta, w0=w0, mu=mu, sigma0=sigma0,
+ airLayerLevel= airLayerLevel, fixAirLayer=False,
coordinates=coordinates, tol=tol, saveMemory=saveMemory, directSolver=directSolver)
@@ -306,9 +282,8 @@ class MT2DModelTEMode(MT2DBase):
A= pde.getCoefficient('A')
A[0,:,0,:]=kronecker(DIM)
A[1,:,1,:]=kronecker(DIM)
-
- Z = FunctionOnBoundary(self.getDomain()).getX()[DIM-1]
- pde.setValue(A=A, D=D, y=whereZero(Z-self._ztop)*[self.__Ex_n.real,self.__Ex_n.imag], r=self._r)
+
+ pde.setValue(A=A, D=D, r=self._r)
u = pde.getSolution()
return u, grad(u)[:,1]
@@ -415,25 +390,20 @@ class MT2DModelTMMode(MT2DBase):
* -(rho*H_{x,i})_{,i} + i omega * mu * H_x = 0
- where H_x is set to Hx_top on the top of the domain. Homogeneous Neuman
- conditions are assumed elsewhere. If fixAtBottom is set H_x is set to Hx_bottom
- at the bottom of the domain overwrtining the Neuman condition.
- If fixAboveLevel is set then H_x is set to Hx_top for any location above and including fixAboveLevel
- typically including teh top boundary.
+ where H_x at top and bottom is set to solution for background field.
+ Homogeneous Neuman conditions are assumed elsewhere.
"""
- def __init__(self, domain, omega, x, Z_YX, eta=None, w0=1., mu=4*PI*1e-7,
- fixAboveLevel=None, Hx_top=1, coordinates=None, Hx_bottom=1.,
- fixAtBottom=False, tol=1e-8, saveMemory=False,
+ def __init__(self, domain, omega, x, Z_YX, eta=None, w0=1., mu=4*PI*1e-7, sigma0=0.01,
+ airLayerLevel=None, coordinates=None, tol=1e-8, saveMemory=False,
directSolver=True):
"""
initializes a new forward model. See base class for a description of
the arguments.
"""
super(MT2DModelTMMode, self).__init__(domain=domain, omega=omega, x=x,
- Z=Z_YX, eta=eta, w0=w0, mu=mu, Ftop=Hx_top, fixAtTop=True,
- fixAboveLevel=fixAboveLevel, Fbottom=Hx_bottom,
- fixAtBottom=fixAtBottom, coordinates=coordinates, tol=tol,
- saveMemory=saveMemory, directSolver=directSolver)
+ Z=Z_YX, eta=eta, w0=w0, mu=mu, sigma0=sigma0,
+ airLayerLevel=airLayerLevel, fixAirLayer=True,
+ coordinates=coordinates, tol=tol,saveMemory=saveMemory, directSolver=directSolver)
def getArguments(self, rho):
"""
diff --git a/downunder/py_src/forwardmodels/pressure.py b/downunder/py_src/forwardmodels/pressure.py
index ec50c00..0f3f331 100644
--- a/downunder/py_src/forwardmodels/pressure.py
+++ b/downunder/py_src/forwardmodels/pressure.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,16 +16,16 @@
"""Isostatic Pressure calculation"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['IsostaticPressure']
-from esys.downunder.coordinates import makeTranformation
+from esys.downunder.coordinates import makeTransformation
from esys.escript import unitsSI as U
from esys.escript import Scalar, Vector, Function
from esys.escript.linearPDEs import LinearSinglePDE
@@ -59,7 +59,7 @@ class IsostaticPressure(object):
"""
DIM=domain.getDim()
self.__domain = domain
- self.__trafo=makeTranformation(domain, coordinates)
+ self.__trafo=makeTransformation(domain, coordinates)
self.__pde=LinearSinglePDE(domain)
self.__pde.getSolverOptions().setTolerance(tol)
self.__pde.setSymmetryOn()
diff --git a/downunder/py_src/forwardmodels/subsidence.py b/downunder/py_src/forwardmodels/subsidence.py
index 70a3607..382c910 100644
--- a/downunder/py_src/forwardmodels/subsidence.py
+++ b/downunder/py_src/forwardmodels/subsidence.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
"""Forward model for Subsidence modelling"""
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['Subsidence']
diff --git a/downunder/py_src/inversioncostfunctions.py b/downunder/py_src/inversioncostfunctions.py
index 87093d3..8e18866 100644
--- a/downunder/py_src/inversioncostfunctions.py
+++ b/downunder/py_src/inversioncostfunctions.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = [ 'InversionCostFunction']
diff --git a/downunder/py_src/inversions.py b/downunder/py_src/inversions.py
index 7fb4a99..967e2c1 100644
--- a/downunder/py_src/inversions.py
+++ b/downunder/py_src/inversions.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['InversionDriver', 'GravityInversion','MagneticInversion', 'JointGravityMagneticInversion', 'StrongJointGravityMagneticInversion']
@@ -40,7 +40,7 @@ from .mappings import *
from .minimizers import *
from .regularizations import Regularization
from .datasources import DataSource
-from .coordinates import makeTranformation
+from .coordinates import makeTransformation
class InversionDriver(object):
"""
@@ -259,7 +259,7 @@ class GravityInversion(InversionDriver):
"""
self.logger.info('Retrieving domain...')
dom=domainbuilder.getDomain()
- trafo=makeTranformation(dom, domainbuilder.getReferenceSystem())
+ trafo=makeTransformation(dom, domainbuilder.getReferenceSystem())
DIM=dom.getDim()
rho_mask = domainbuilder.getSetDensityMask()
#========================
@@ -371,7 +371,7 @@ class MagneticInversion(InversionDriver):
self.logger.info('Retrieving domain...')
dom=domainbuilder.getDomain()
DIM=dom.getDim()
- trafo=makeTranformation(dom, domainbuilder.getReferenceSystem())
+ trafo=makeTransformation(dom, domainbuilder.getReferenceSystem())
#========================
self.logger.info('Creating mapping ...')
k_mask = domainbuilder.getSetSusceptibilityMask()
@@ -503,7 +503,7 @@ class JointGravityMagneticInversion(InversionDriver):
self.logger.info('Retrieving domain...')
dom=domainbuilder.getDomain()
DIM=dom.getDim()
- trafo=makeTranformation(dom, domainbuilder.getReferenceSystem())
+ trafo=makeTransformation(dom, domainbuilder.getReferenceSystem())
#========================
self.logger.info('Creating mappings ...')
rho_mask=domainbuilder.getSetDensityMask()
@@ -693,7 +693,7 @@ class StrongJointGravityMagneticInversion(InversionDriver):
self.logger.info('Retrieving domain...')
dom=domainbuilder.getDomain()
DIM=dom.getDim()
- trafo=makeTranformation(dom, domainbuilder.getReferenceSystem())
+ trafo=makeTransformation(dom, domainbuilder.getReferenceSystem())
rock_mask=wherePositive(domainbuilder.getSetDensityMask() + domainbuilder.getSetSusceptibilityMask())
#========================
diff --git a/downunder/py_src/magtel1d.py b/downunder/py_src/magtel1d.py
index 383edb8..d029006 100644
--- a/downunder/py_src/magtel1d.py
+++ b/downunder/py_src/magtel1d.py
@@ -5,8 +5,8 @@
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,8 +19,8 @@ from __future__ import print_function, division
__copyright__="""Copyright (c) 2015 by University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/downunder/py_src/magtel2d.py b/downunder/py_src/magtel2d.py
index 249f4e1..aaaf46c 100644
--- a/downunder/py_src/magtel2d.py
+++ b/downunder/py_src/magtel2d.py
@@ -5,8 +5,8 @@
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,8 +19,8 @@ from __future__ import print_function, division
__copyright__="""Copyright (c) 2015 by University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
@@ -44,7 +44,12 @@ import types
from . import magtel1d as mt1d
import esys.weipa as weipa
import esys.escript as escript
-import esys.finley as finley
+try:
+ import esys.finley as finley
+ HAVE_FINLEY = True
+except ImportError:
+ HAVE_FINLEY = False
+
import esys.escript.pdetools as pdetools
import esys.escript.linearPDEs as pde
@@ -196,6 +201,8 @@ class MT_2D(object):
self.boundary_mask :: Dirichlet mask at boundaries
"""
+ if not HAVE_FINLEY:
+ raise ImportError("Finley module not available")
#make python3 compatible, since long disappeared in python 3
if sys.version_info[0] == 3:
long_type = int
diff --git a/downunder/py_src/mappings.py b/downunder/py_src/mappings.py
index 925392e..77c46a9 100644
--- a/downunder/py_src/mappings.py
+++ b/downunder/py_src/mappings.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ from __future__ import print_function, division
"""Collection of parametrizations that map physical values to model parameters
and back"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['Mapping', 'DensityMapping', 'SusceptibilityMapping',\
diff --git a/downunder/py_src/minimizers.py b/downunder/py_src/minimizers.py
index f7a2303..8f1371d 100644
--- a/downunder/py_src/minimizers.py
+++ b/downunder/py_src/minimizers.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['MinimizerException', 'MinimizerIterationIncurableBreakDown',\
diff --git a/downunder/py_src/regularizations.py b/downunder/py_src/regularizations.py
index 4266fd1..f5fdf92 100644
--- a/downunder/py_src/regularizations.py
+++ b/downunder/py_src/regularizations.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['Regularization']
@@ -31,7 +31,7 @@ import numpy as np
from esys.escript import Function, outer, Data, Scalar, grad, inner, integrate, interpolate, kronecker, boundingBoxEdgeLengths, vol, sqrt, length,Lsup, transpose
from esys.escript.linearPDEs import LinearPDE, IllegalCoefficientValue,SolverOptions
from esys.escript.pdetools import ArithmeticTuple
-from .coordinates import makeTranformation
+from .coordinates import makeTransformation
from .costfunctions import CostFunction
class Regularization(CostFunction):
@@ -111,7 +111,7 @@ class Regularization(CostFunction):
self.__domain=domain
DIM=self.__domain.getDim()
self.__numLevelSets=numLevelSets
- self.__trafo=makeTranformation(domain, coordinates)
+ self.__trafo=makeTransformation(domain, coordinates)
self.__pde=LinearPDE(self.__domain, numEquations=self.__numLevelSets, numSolutions=self.__numLevelSets)
self.__pde.getSolverOptions().setTolerance(tol)
self.__pde.setSymmetryOn()
diff --git a/downunder/py_src/seismic.py b/downunder/py_src/seismic.py
index 8a207f8..57c5250 100644
--- a/downunder/py_src/seismic.py
+++ b/downunder/py_src/seismic.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['SimpleSEGYWriter', 'Ricker', 'WaveBase', 'SonicWave', 'VTIWave',
diff --git a/downunder/py_src/splitinversioncostfunctions.py b/downunder/py_src/splitinversioncostfunctions.py
index 948626a..d33d0fa 100644
--- a/downunder/py_src/splitinversioncostfunctions.py
+++ b/downunder/py_src/splitinversioncostfunctions.py
@@ -1,12 +1,12 @@
from __future__ import division, print_function
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@ from __future__ import division, print_function
"""Cost functions for inversions with one or more forward models"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = [ 'SplitInversionCostFunction']
@@ -98,37 +98,37 @@ class SplitInversionCostFunction(MeteredCostFunction):
self.numLevelSets=numLevelSets
self.splitworld=splitworld
- splitworld.addVariable("regularization", makeLocalOnly)
- splitworld.addVariable("mappings", makeLocalOnly)
- splitworld.addVariable("fwdmodels", makeLocalOnly)
- splitworld.addVariable("initial_guess", makeLocalOnly) # Used to load the initial guess
- splitworld.addVariable("model_args", makeLocalOnly) # arguments for models stored on that world
- splitworld.addVariable("props", makeLocalOnly) # Properties for the current guess
- splitworld.addVariable("current_point", makeLocalOnly) # Current approximate solution. Starts out as initial_guess
- splitworld.addVariable("mu_model", makeLocalOnly)
-
- splitworld.addVariable("phi_a", makeScalarReducer, "SUM")
- splitworld.addVariable("Jx_original", makeScalarReducer,"SET")
- splitworld.addVariable("Jx", makeScalarReducer, "SUM")
- splitworld.addVariable("Jx_old", makeScalarReducer,"SET")
- splitworld.addVariable("g_Jx_0", makeDataReducer, "SUM")
- splitworld.addVariable("g_Jx_1", makeLocalOnly) # This component is not merged with values from other worlds
-
- splitworld.addVariable("old_g_Jx_0", makeDataReducer, "SUM")
- splitworld.addVariable("old_g_Jx_1", makeLocalOnly) # This component is not merged with values from other worlds
+ splitworld.addVariable("regularization", "local")
+ splitworld.addVariable("mappings", "local")
+ splitworld.addVariable("fwdmodels", "local")
+ splitworld.addVariable("initial_guess", "local") # Used to load the initial guess
+ splitworld.addVariable("model_args", "local") # arguments for models stored on that world
+ splitworld.addVariable("props", "local") # Properties for the current guess
+ splitworld.addVariable("current_point", "local") # Current approximate solution. Starts out as initial_guess
+ splitworld.addVariable("mu_model", "local")
+
+ splitworld.addVariable("phi_a", "float", "SUM")
+ splitworld.addVariable("Jx_original", "float","SET")
+ splitworld.addVariable("Jx", "float", "SUM")
+ splitworld.addVariable("Jx_old", "float","SET")
+ splitworld.addVariable("g_Jx_0", "Data", "SUM")
+ splitworld.addVariable("g_Jx_1", "local") # This component is not merged with values from other worlds
+
+ splitworld.addVariable("old_g_Jx_0", "Data", "SUM")
+ splitworld.addVariable("old_g_Jx_1", "local") # This component is not merged with values from other worlds
- splitworld.addVariable("search_direction", makeDataReducer, "SET")
+ splitworld.addVariable("search_direction", "Data", "SET")
- splitworld.addVariable("s_and_y", makeLocalOnly)
- splitworld.addVariable("gphi0", makeLocalOnly)
- splitworld.addVariable("old_phi_a", makeLocalOnly)
- splitworld.addVariable("phi0", makeLocalOnly)
- splitworld.addVariable("base_point", makeLocalOnly)
+ splitworld.addVariable("s_and_y", "local")
+ splitworld.addVariable("gphi0", "local")
+ splitworld.addVariable("old_phi_a", "local")
+ splitworld.addVariable("phi0", "local")
+ splitworld.addVariable("base_point", "local")
- splitworld.addVariable("conv_flag", makeLocalOnly)
- splitworld.addVariable("dp_result", makeLocalOnly)
- splitworld.addVariable("break_down", makeLocalOnly)
+ splitworld.addVariable("conv_flag", "local")
+ splitworld.addVariable("dp_result", "float", "SET")
+ splitworld.addVariable("break_down", "local")
howmany=splitworld.getSubWorldCount()
rlen=int(math.ceil(numModels/howmany))
@@ -604,8 +604,6 @@ class SplitInversionCostFunction(MeteredCostFunction):
J=z
else:
J+=z
- print("Final J =", str(J))
-
if isinstance(vname, str):
self.exportValue(vname, J)
else:
@@ -761,7 +759,7 @@ class SplitInversionCostFunction(MeteredCostFunction):
if self.swid==0:
Y=g_J[0] # Because g_J==(Y,X) Y_k=dKer/dm_k
else:
- Y=Data(0, g_J[0].getShape(), g_J[0].getForwardModel())
+ Y=Data(0, g_J[0].getShape(), g_J[0].getFunctionSpace())
for i in range(len(mods)):
mu=mu_model[i]
f, idx_f=mods[i]
diff --git a/downunder/py_src/splitminimizers.py b/downunder/py_src/splitminimizers.py
index c651f3e..130a247 100644
--- a/downunder/py_src/splitminimizers.py
+++ b/downunder/py_src/splitminimizers.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -88,7 +88,7 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
# Now we will only run this on one world and rely on getDouble to ship it
f.splitworld.addJob( FunctionJob, dual_p_g_Jx_new)
f.splitworld.runJobs()
- res=f.splitworld.getDoubleVariable("dp_result")
+ res=f.splitworld.getFloatVariable("dp_result")
return res
#End of grad_phi
@@ -105,7 +105,7 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
f.splitworld.addJobPerWorld( FunctionJob, SplitMinimizerLBFGS.move_point_from_base, alpha=alpha, imports=['base_point', 'search_direction'])
f.splitworld.runJobs()
f.calculateValue('phi_a')
- phi_a=f.splitworld.getDoubleVariable('phi_a')
+ phi_a=f.splitworld.getFloatVariable('phi_a')
#zoomlogger.debug("iteration %d, alpha=%e, phi(alpha)=%e"%(i,alpha,phi_a))
if phi_a > phi0+c1*alpha*gphi0 or phi_a >= phi_lo:
alpha_hi=alpha
@@ -161,7 +161,6 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
regular=self.importValue("regularization")
phi0=Jx
- print("Type of phi0=", type(phi0),phi0)
# In the original, this part calls getDualProduct on f
# However, since that only ends up referring to the
# regularisation term, I've called that directly
@@ -203,7 +202,7 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
# Now we will only run this on one world and rely on getDouble to ship it
f.splitworld.addJob( FunctionJob, dual_p_g_Jx_new)
f.splitworld.runJobs()
- res=f.splitworld.getDoubleValue("dp_result")
+ res=f.splitworld.getFloatVariable("dp_result")
return res
#End of grad_phi
@@ -213,10 +212,10 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
f.splitworld.runJobs()
f.calculateValue('phi_a')
#lslogger.debug("iteration %d, alpha=%e, phi(alpha)=%e"%(i,alpha,phi_a))
- phi_a=f.splitworld.getDoubleVariable('phi_a')
- phi0=f.splitworld.getDoubleVariable('phi0')
- gphi0=f.splitworld.getDoubleVariable('gphi0')
- old_phi_a=f.splitworld.getDoubleVariable('old_phi_a')
+ phi_a=f.splitworld.getFloatVariable('phi_a')
+ phi0=f.splitworld.getFloatVariable('phi0')
+ gphi0=f.splitworld.getFloatVariable('gphi0')
+ old_phi_a=f.splitworld.getFloatVariable('old_phi_a')
if (phi_a > phi0+c1*alpha*gphi0) or ((phi_a>=old_phi_a) and (i>1)):
alpha, phi_a, gphi_a = _zoom(f, old_alpha, alpha, old_phi_a, phi_a, c1, c2, phi0, gphi0)
break
@@ -313,7 +312,6 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
# this function returns a scaling alpha for the search
# direction as well as the cost function evaluation and
# gradient for the new solution approximation x_new=x+alpha*p
- print("alpha=",alpha)
self.logger.debug("\tSearch direction scaling alpha=%e"%alpha)
# execute the step
@@ -321,11 +319,11 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
#delta_x = alpha*p
#x_new = x + delta_x
- Jx=splitworld.getDoubleVariable("Jx")
+ Jx=splitworld.getFloatVariable("Jx")
converged = True
if self._J_tol:
- Jx_old=splitworld.getDoubleVariable("Jx_old")
- Jx_original=splitworld.getDoubleVariable("Jx_original")
+ Jx_old=splitworld.getFloatVariable("Jx_old")
+ Jx_original=splitworld.getFloatVariable("Jx_original")
flag=abs(Jx-Jx_old) <= self._J_tol * abs(Jx-Jx_original)
#flag=abs(Jx_new-Jx) <= self._J_tol * abs(Jx_new-Jx_0)
if self.logger.isEnabledFor(logging.DEBUG):
@@ -353,9 +351,9 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
#self.logger.debug("Solution checked: dx, x*m_tol = %e, %e"%(norm_dx,norm_x*self._m_tol))
self.exportValue('conv_flag', flag)
# End of converged_check
- addJobPerWorld(self.getCostFunction().splitworld, FunctionJob, converged_check, alpha=alpha, m_tol=self._m_tol, imports=["regularization", "search_direction", "current_point"])
+ self.getCostFunction().splitworld.addJobPerWorld(FunctionJob, converged_check, alpha=alpha, m_tol=self._m_tol, imports=["regularization", "search_direction", "current_point"])
self.getCostFunction().splitworld.runJobs()
- flag=self.getCostFunction().splitworld.getDoubleVariable("conv_flag")>0.001
+ flag=self.getCostFunction().splitworld.getFloatVariable("conv_flag")>0.001
converged = converged and flag
#Already done in the line_search call
@@ -395,10 +393,10 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
# End run_worker
# Only one world has s_and_y - so its important that only single jobs be run that manipulate
# s_and_y
- addJob(self.getCostFunction().splitworld, FunctionJob, run_worker, alpha=alpha, need_trunc=(k>=self._truncation))
+ self.getCostFunction().splitworld.addJob( FunctionJob, run_worker, alpha=alpha, need_trunc=(k>=self._truncation))
self.getCostFunction().splitworld.runJobs()
- break_down=(splitworld.getDoubleVariable("break_down")>0.001)
+ break_down=(splitworld.getLocalObjectVariable("break_down")>0.001)
self.getCostFunction().updateHessian()
#g_Jx=g_Jx_new
#Jx=Jx_new
@@ -493,11 +491,10 @@ class SplitMinimizerLBFGS(AbstractMinimizer):
r = r + s * (a-beta)
# In the original version, the caller negated the result
self.exportValue("search_direction", -r)
- print ("prior to twoloop call ",splitworld.getVarList())
# Note: this is only running on world world (of possibly many)
# Any jobs which also need the variables exported here
# need to be shared or the jobs need to run on the same world
- addJob(splitworld, FunctionJob, two_loop_worker, reset=reset, imports=["current_point", "regularization", "g_Jx_0", "g_Jx_1"])
+ splitworld.addJob(FunctionJob, two_loop_worker, reset=reset, imports=["current_point", "regularization", "g_Jx_0", "g_Jx_1"])
splitworld.runJobs()
diff --git a/downunder/py_src/splitregularizations.py b/downunder/py_src/splitregularizations.py
index c6830e5..4c3f3a1 100644
--- a/downunder/py_src/splitregularizations.py
+++ b/downunder/py_src/splitregularizations.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__all__ = ['SplitRegularization']
@@ -31,7 +31,7 @@ import numpy as np
from esys.escript import Function, outer, Data, Scalar, grad, inner, integrate, interpolate, kronecker, boundingBoxEdgeLengths, vol, sqrt, length,Lsup, transpose
from esys.escript.linearPDEs import LinearPDE, IllegalCoefficientValue,SolverOptions
from esys.escript.pdetools import ArithmeticTuple
-from .coordinates import makeTranformation
+from .coordinates import makeTransformation
from .costfunctions import CostFunction
class SplitRegularization(CostFunction):
@@ -113,7 +113,7 @@ class SplitRegularization(CostFunction):
self.__domain=domain
DIM=self.__domain.getDim()
self.__numLevelSets=numLevelSets
- self.__trafo=makeTranformation(domain, coordinates)
+ self.__trafo=makeTransformation(domain, coordinates)
self.__pde=LinearPDE(self.__domain, numEquations=self.__numLevelSets, numSolutions=self.__numLevelSets)
self.__pde.getSolverOptions().setTolerance(tol)
self.__pde.setSymmetryOn()
diff --git a/downunder/test/python/SConscript b/downunder/test/python/SConscript
index 366e0b8..0bc76e7 100644
--- a/downunder/test/python/SConscript
+++ b/downunder/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/downunder/test/python/inversion_acoustictest_2d.py b/downunder/test/python/inversion_acoustictest_2d.py
index 8792067..ba47ef4 100644
--- a/downunder/test/python/inversion_acoustictest_2d.py
+++ b/downunder/test/python/inversion_acoustictest_2d.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -22,11 +22,11 @@ from __future__ import print_function, division
"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/downunder/test/python/run_comm1.py b/downunder/test/python/run_comm1.py
index 1863ed3..c449bbc 100644
--- a/downunder/test/python/run_comm1.py
+++ b/downunder/test/python/run_comm1.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ from __future__ import print_function, division
Test script to run test model COMMEMI-4
"""
-__copyright__="""Copyright (c) 2015 by The University of Queensland
+__copyright__="""Copyright (c) 2015-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
try:
@@ -44,22 +44,18 @@ import numpy
import datetime
import esys.downunder.magtel2d as mt2d
import esys.escript as escript
-import esys.finley as finley
import esys.escript.pdetools as pdetools
-
-
-
-
-# this is mainly to avoid warning messages
-logging.basicConfig(format='%(name)s: %(message)s', level=logging.INFO)
-
try:
- from esys.finley import Rectangle as fRect, Brick as fBrick
+ import esys.finley as finley
HAVE_FINLEY = True
except ImportError:
HAVE_FINLEY = False
+HAVE_GMSH = escript.getEscriptParamInt("GMSH_SUPPORT")
+
+# this is mainly to avoid warning messages
+logging.basicConfig(format='%(name)s: %(message)s', level=logging.INFO)
def makeLayerCake(x_start,x_extent,z_layers):
@@ -380,6 +376,7 @@ def generateCommemi1Mesh():
class Test_COMMEMI1(unittest.TestCase):
@unittest.skipIf(not HAVE_FINLEY, "Test requires finley to be available")
+ @unittest.skipIf(not HAVE_GMSH, "Test requires gmsh to be available")
@unittest.skipIf(not escript.getEscriptParamInt("PASO_DIRECT"), "Missing direct solvers")
@unittest.skipIf(escript.getMPISizeWorld() > 1,
"Direct solvers and multiple MPI processes are currently incompatible")
diff --git a/downunder/test/python/run_comm4.py b/downunder/test/python/run_comm4.py
index db34e0b..8857743 100644
--- a/downunder/test/python/run_comm4.py
+++ b/downunder/test/python/run_comm4.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -36,8 +36,14 @@ import numpy
import datetime
import esys.downunder.magtel2d as mt2d
import esys.escript as escript
-import esys.finley as finley
import esys.escript.pdetools as pdetools
+try:
+ import esys.finley as finley
+ HAVE_FINLEY = True
+except ImportError:
+ HAVE_FINLEY = False
+
+HAVE_GMSH = escript.getEscriptParamInt("GMSH_SUPPORT")
# Matplotlib uses outdated code -- ignore the warnings until an update is available:
import warnings
@@ -46,11 +52,6 @@ import logging
# this is mainly to avoid warning messages
logging.basicConfig(format='%(name)s: %(message)s', level=logging.INFO)
-try:
- from esys.finley import Rectangle as fRect, Brick as fBrick
- HAVE_FINLEY = True
-except ImportError:
- HAVE_FINLEY = False
# ==========================================================
# ==========================================================
@@ -451,6 +452,7 @@ def generateCommemi4Mesh():
class Test_COMMEMI4(unittest.TestCase):
@unittest.skipIf(not HAVE_FINLEY, "Test requires finley to be available")
+ @unittest.skipIf(not HAVE_GMSH, "Test requires gmsh to be available")
@unittest.skipIf(not escript.getEscriptParamInt("PASO_DIRECT"), "Missing direct solvers")
@unittest.skipIf(escript.getMPISizeWorld() > 1, "Direct solvers and MPI are currently incompatible")
def test_comm4(self):
diff --git a/downunder/test/python/run_coordinates.py b/downunder/test/python/run_coordinates.py
index 1c97fb7..c8a844b 100644
--- a/downunder/test/python/run_coordinates.py
+++ b/downunder/test/python/run_coordinates.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/downunder/test/python/run_datasources.py b/downunder/test/python/run_datasources.py
index c154082..b9c9821 100644
--- a/downunder/test/python/run_datasources.py
+++ b/downunder/test/python/run_datasources.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import logging
diff --git a/downunder/test/python/run_dcforward.py b/downunder/test/python/run_dcforward.py
index 119372e..5053163 100644
--- a/downunder/test/python/run_dcforward.py
+++ b/downunder/test/python/run_dcforward.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/downunder/test/python/run_domainbuilder.py b/downunder/test/python/run_domainbuilder.py
index f941bb2..f19545d 100644
--- a/downunder/test/python/run_domainbuilder.py
+++ b/downunder/test/python/run_domainbuilder.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import logging
diff --git a/downunder/test/python/run_forward.py b/downunder/test/python/run_forward.py
index 18e6f32..8c3f022 100644
--- a/downunder/test/python/run_forward.py
+++ b/downunder/test/python/run_forward.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import logging
@@ -430,13 +430,15 @@ class TestMT2DModelTEMode(unittest.TestCase):
def test_API(self):
domain=ripRectangle(25, 25, d1=mpisize)
omega=2.
+ SIGMA=15.
+
x=[ [0.2,0.5], [0.3,0.5] ]
Z_XY=[ complex(1.2,1.5), complex(1.3,2.5) ]
+
eta=1.
w0=1.
- Ex0=1.
# now we do a real one
- model=MT2DModelTEMode(domain, omega, x, Z_XY, eta, w0=w0, Ex_top=Ex0)
+ model=MT2DModelTEMode(domain, omega, x, Z_XY, eta, sigma0=SIGMA, w0=w0)
self.assertEqual(model.getDomain(), domain)
pde=model.setUpPDE()
self.assertIsInstance(pde, LinearPDE)
@@ -445,12 +447,12 @@ class TestMT2DModelTEMode(unittest.TestCase):
self.assertEqual(pde.getDomain(), domain)
# other things that should work
- model=MT2DModelTEMode(domain, omega, x, Z_XY, eta=None, w0=[2.,3.], Ex_top=complex(4.5,6) )
+ model=MT2DModelTEMode(domain, omega, x, Z_XY, eta=None, w0=[2.,3.] , sigma0=SIGMA, airLayerLevel=1.)
# these shouldn't work
- self.assertRaises(ValueError, MT2DModelTEMode, domain, omega, x, [3.], eta=[1.,1.], w0=[2.,3.], Ex_top=complex(4.5,6) )
- self.assertRaises(ValueError, MT2DModelTEMode, domain, omega, x, Z_XY, eta=[1.], w0=[2.,3.], Ex_top=complex(4.5,6) )
- self.assertRaises(ValueError, MT2DModelTEMode, domain, omega, [(6.7,5)], Z_XY, eta=[1.,1.], w0=[2.,3.], Ex_top=complex(4.5,6) )
+ self.assertRaises(ValueError, MT2DModelTEMode, domain, omega, x, [3.], eta=[1.,1.], w0=[2.,3.], sigma0=SIGMA)
+ self.assertRaises(ValueError, MT2DModelTEMode, domain, omega, x, Z_XY, eta=[1.], w0=[2.,3.] , sigma0=SIGMA)
+ self.assertRaises(ValueError, MT2DModelTEMode, domain, omega, [(6.7,5)], Z_XY, eta=[1.,1.], w0=[2.,3.] , sigma0=SIGMA)
def test_PDE(self):
omega=1.
@@ -465,19 +467,20 @@ class TestMT2DModelTEMode(unittest.TestCase):
X1=(int(0.3/H)+0.5)*H
X2=(int(0.6/H)+0.5)*H
- IMP=-(1j*omega*mu0)/k*(cmath.exp(k*Z0)-cmath.exp(-k*Z0))/(cmath.exp(k*Z0)+cmath.exp(-k*Z0))
+
+ IMP=-(1j*omega*mu0)/k*cmath.exp(k*Z0)/cmath.exp(k*Z0)
Z_XY=[ IMP, IMP ]
x=[ [X1,Z0], [X2,Z0] ]
eta=None
z=domain.getX()[1]
- Ex0_ex=cos(k.imag*z)*(exp(k.real*z)-exp(-k.real*z))
- Ex0_ex_z=-sin(k.imag*z)*k.imag*(exp(k.real*z)-exp(-k.real*z))+cos(k.imag*z)*(exp(k.real*z)+exp(-k.real*z))*k.real
- Ex1_ex=sin(k.imag*z)*(exp(k.real*z)+exp(-k.real*z))
- Ex1_ex_z=cos(k.imag*z)*k.imag*(exp(k.real*z)+exp(-k.real*z))+sin(k.imag*z)*(exp(k.real*z)-exp(-k.real*z))*k.real
+ Ex0_ex=cos(k.imag*(z-1))*exp(k.real*(z-1))
+ Ex1_ex=sin(k.imag*(z-1))*exp(k.real*(z-1))
+ Ex0_ex_z=-sin(k.imag*(z-1))*k.imag*exp(k.real*(z-1))+cos(k.imag*(z-1))*exp(k.real*(z-1))*k.real
+ Ex1_ex_z=cos(k.imag*(z-1))*k.imag*exp(k.real*(z-1))+sin(k.imag*(z-1))*exp(k.real*(z-1))*k.real
- model=MT2DModelTEMode(domain, omega, x, Z_XY, eta, mu=mu0, fixAtTop=True, Ex_top=Ex0_ex*[1.,0]+ Ex1_ex*[0,1.], tol=1e-9, directSolver=True)
+ model=MT2DModelTEMode(domain, omega, x, Z_XY, eta, mu=mu0, tol=1e-9, directSolver=True, sigma0=SIGMA)
args=model.getArguments(SIGMA)
Ex=args[0]
@@ -498,10 +501,10 @@ class TestMT2DModelTEMode(unittest.TestCase):
self.assertTrue( d <= 3e-3 * ref ) # d should be zero (some sort of)
z=ReducedFunction(domain).getX()[1]
- Ex0_ex=cos(k.imag*z)*(exp(k.real*z)-exp(-k.real*z))
- Ex1_ex=sin(k.imag*z)*(exp(k.real*z)+exp(-k.real*z))
- Ex0_ex_z=-sin(k.imag*z)*k.imag*(exp(k.real*z)-exp(-k.real*z))+cos(k.imag*z)*(exp(k.real*z)+exp(-k.real*z))*k.real
- Ex1_ex_z=cos(k.imag*z)*k.imag*(exp(k.real*z)+exp(-k.real*z))+sin(k.imag*z)*(exp(k.real*z)-exp(-k.real*z))*k.real
+ Ex0_ex=cos(k.imag*(z-1))*exp(k.real*(z-1))
+ Ex1_ex=sin(k.imag*(z-1))*exp(k.real*(z-1))
+ Ex0_ex_z=-sin(k.imag*(z-1))*k.imag*exp(k.real*(z-1))+cos(k.imag*(z-1))*exp(k.real*(z-1))*k.real
+ Ex1_ex_z=cos(k.imag*(z-1))*k.imag*exp(k.real*(z-1))+sin(k.imag*(z-1))*exp(k.real*(z-1))*k.real
# and this should be zero
d0=model.getDefect(SIGMA, Ex0_ex*[1.,0]+ Ex1_ex*[0,1.], Ex0_ex_z*[1.,0]+ Ex1_ex_z*[0,1.])
self.assertTrue( d0 <= 1e-8 * ref ) # d should be zero (some sort of)
@@ -537,7 +540,7 @@ class TestMT2DModelTEMode(unittest.TestCase):
Ex1_ex=sin(k.imag*z)*(exp(k.real*z)+exp(-k.real*z))
Ex1_ex_z=cos(k.imag*z)*k.imag*(exp(k.real*z)+exp(-k.real*z))+sin(k.imag*z)*(exp(k.real*z)-exp(-k.real*z))*k.real
- model=MT2DModelTEMode(domain, omega, x, Z_XY, eta, mu=mu0, fixAtTop=True, Ex_top=Ex0_ex*[1.,0]+ Ex1_ex*[0,1.], tol=1e-9, directSolver=True)
+ model=MT2DModelTEMode(domain, omega, x, Z_XY, eta, mu=mu0, sigma0=SIGMA, tol=1e-9, directSolver=True, airLayerLevel=1.)
# this is the base line:
xx=domain.getX()[0]
@@ -578,13 +581,14 @@ class TestMT2DModelTMMode(unittest.TestCase):
def test_API(self):
domain=ripRectangle(25, 25, d0=mpisize)
omega=2.
+ SIGMA=15.
x=[ [0.2,0.5], [0.3,0.5] ]
Z_XY=[ complex(1.2,1.5), complex(1.3,2.5) ]
eta=1.
w0=1.
Hx0=1.
# now we do a real one
- model=MT2DModelTMMode(domain, omega, x, Z_XY, eta, w0=w0, Hx_bottom=Hx0)
+ model=MT2DModelTMMode(domain, omega, x, Z_XY, eta, w0=w0, sigma0=SIGMA)
self.assertEqual(model.getDomain(), domain)
pde=model.setUpPDE()
self.assertIsInstance(pde, LinearPDE)
@@ -593,19 +597,20 @@ class TestMT2DModelTMMode(unittest.TestCase):
self.assertEqual(pde.getDomain(), domain)
# other things that should work
- model=MT2DModelTMMode(domain, omega, x, Z_XY, eta=None, w0=[2.,3.], Hx_bottom=complex(4.5,6) )
+ model=MT2DModelTMMode(domain, omega, x, Z_XY, eta=None, w0=[2.,3.], sigma0=SIGMA, airLayerLevel=1.)
# these shouldn't work
- self.assertRaises(ValueError, MT2DModelTMMode, domain, omega, x, [3.], eta=[1.,1.], w0=[2.,3.], Hx_bottom=complex(4.5,6) )
- self.assertRaises(ValueError, MT2DModelTMMode, domain, omega, x, Z_XY, eta=[1.], w0=[2.,3.], Hx_bottom=complex(4.5,6) )
- self.assertRaises(ValueError, MT2DModelTMMode, domain, omega, [(6.7,5)], Z_XY, eta=[1.,1.], w0=[2.,3.], Hx_bottom=complex(4.5,6) )
+ self.assertRaises(ValueError, MT2DModelTMMode, domain, omega, x, [3.], eta=[1.,1.], w0=[2.,3.], sigma0=SIGMA)
+ self.assertRaises(ValueError, MT2DModelTMMode, domain, omega, x, Z_XY, eta=[1.], w0=[2.,3.], sigma0=SIGMA)
+ self.assertRaises(ValueError, MT2DModelTMMode, domain, omega, [(6.7,5)], Z_XY, eta=[1.,1.], w0=[2.,3.], sigma0=SIGMA)
def test_PDE(self):
omega=10.
mu0=0.123
RHO=0.15
+ SIGMA=1/RHO
k=cmath.sqrt(1j*omega*mu0/RHO) # Hx=exp(k*z)
- NE=101
+ NE=151
L=1
domain=ripRectangle(NE,NE, d0=mpisize)
@@ -614,19 +619,19 @@ class TestMT2DModelTMMode(unittest.TestCase):
X1=(int(0.3/H)+0.5)*H
X2=(int(0.6/H)+0.5)*H
- IMP=RHO*k*(cmath.exp(k*(Z0-L))-cmath.exp(-k*(Z0-L)))/(cmath.exp(k*(Z0-L))+cmath.exp(-k*(Z0-L)))
+ IMP=RHO*k*cmath.exp(k*(Z0-L))/cmath.exp(k*(Z0-L))
Z_XY=[ IMP, IMP ]
x=[ [X1,Z0], [X2,Z0] ]
eta=None
z=domain.getX()[1]
- Hx0_ex=cos(k.imag*(z-L))*(exp(k.real*(z-L))+exp(-k.real*(z-L)))/2
- Hx0_ex_z=(-sin(k.imag*(z-L))*k.imag*(exp(k.real*(z-L))+exp(-k.real*(z-L)))+cos(k.imag*(z-L))*(exp(k.real*(z-L))-exp(-k.real*(z-L)))*k.real)/2
- Hx1_ex=sin(k.imag*(z-L))*(exp(k.real*(z-L))-exp(-k.real*(z-L)))/2
- Hx1_ex_z=(cos(k.imag*(z-L))*k.imag*(exp(k.real*(z-L))-exp(-k.real*(z-L)))+sin(k.imag*(z-L))*(exp(k.real*(z-L))+exp(-k.real*(z-L)))*k.real)/2
+ Hx0_ex=cos(k.imag*(z-L))*exp(k.real*(z-L))
+ Hx1_ex=sin(k.imag*(z-L))*exp(k.real*(z-L))
+ Hx0_ex_z=-sin(k.imag*(z-L))*k.imag*exp(k.real*(z-L))+cos(k.imag*(z-L))*exp(k.real*(z-L))*k.real
+ Hx1_ex_z=cos(k.imag*(z-L))*k.imag*exp(k.real*(z-L))+sin(k.imag*(z-L))*exp(k.real*(z-L))*k.real
- model=MT2DModelTMMode(domain, omega, x, Z_XY, eta, mu=mu0, fixAtBottom=True, Hx_bottom=Hx0_ex*[1.,0]+ Hx1_ex*[0,1.], tol=1e-9, directSolver=True)
+ model=MT2DModelTMMode(domain, omega, x, Z_XY, eta, mu=mu0, sigma0=SIGMA, tol=1e-9, directSolver=True, airLayerLevel=1.)
args=model.getArguments(RHO)
Hx=args[0]
@@ -648,10 +653,10 @@ class TestMT2DModelTMMode(unittest.TestCase):
self.assertTrue( d <= 3e-3 * ref ) # d should be zero (some sort of)
z=ReducedFunction(domain).getX()[1]
- Hx0_ex=cos(k.imag*(z-L))*(exp(k.real*(z-L))+exp(-k.real*(z-L)))/2
- Hx0_ex_z=(-sin(k.imag*(z-L))*k.imag*(exp(k.real*(z-L))+exp(-k.real*(z-L)))+cos(k.imag*(z-L))*(exp(k.real*(z-L))-exp(-k.real*(z-L)))*k.real)/2
- Hx1_ex=sin(k.imag*(z-L))*(exp(k.real*(z-L))-exp(-k.real*(z-L)))/2
- Hx1_ex_z=(cos(k.imag*(z-L))*k.imag*(exp(k.real*(z-L))-exp(-k.real*(z-L)))+sin(k.imag*(z-L))*(exp(k.real*(z-L))+exp(-k.real*(z-L)))*k.real)/2
+ Hx0_ex=cos(k.imag*(z-L))*exp(k.real*(z-L))
+ Hx1_ex=sin(k.imag*(z-L))*exp(k.real*(z-L))
+ Hx0_ex_z=-sin(k.imag*(z-L))*k.imag*exp(k.real*(z-L))+cos(k.imag*(z-L))*exp(k.real*(z-L))*k.real
+ Hx1_ex_z=cos(k.imag*(z-L))*k.imag*exp(k.real*(z-L))+sin(k.imag*(z-L))*exp(k.real*(z-L))*k.real
g_Hx = Data(0, (2,2), Hx0_ex_z.getFunctionSpace())
g_Hx[0,1] = Hx0_ex_z
g_Hx[1,1] = Hx1_ex_z
@@ -670,6 +675,7 @@ class TestMT2DModelTMMode(unittest.TestCase):
omega=5.
mu0=0.123
RHO=0.15
+ SIGMA=1/RHO
k=cmath.sqrt(1j*omega*mu0*1/RHO) # Hx=exp(k*z)
L=1
@@ -685,7 +691,7 @@ class TestMT2DModelTMMode(unittest.TestCase):
x=[ [X1,Z0], [X2,Z0] ]
eta=None
- model=MT2DModelTMMode(domain, omega, x, Z_XY, eta, mu=mu0, tol=1e-9, directSolver=True)
+ model=MT2DModelTMMode(domain, omega, x, Z_XY, eta, mu=mu0, tol=1e-9, sigma0=SIGMA, directSolver=True)
# this is the base line:
xx=domain.getX()[0]
@@ -719,7 +725,6 @@ class TestMT2DModelTMMode(unittest.TestCase):
d1=model.getDefect(RHO1, *args1)
self.assertLess( abs( d1-d0-integrate(dg0*p) ), 1e-2*abs(d1-d0) )
-
if __name__ == '__main__':
run_tests(__name__, exit_on_failure=True)
diff --git a/downunder/test/python/run_gravity.py b/downunder/test/python/run_gravity.py
index ff80ac2..40cd99e 100644
--- a/downunder/test/python/run_gravity.py
+++ b/downunder/test/python/run_gravity.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@ from __future__ import print_function, division
"""2D gravity inversion example using synthetic data"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/downunder/test/python/run_inversion_gravmag_2d.py b/downunder/test/python/run_inversion_gravmag_2d.py
index 74f0b85..1d3258a 100644
--- a/downunder/test/python/run_inversion_gravmag_2d.py
+++ b/downunder/test/python/run_inversion_gravmag_2d.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@ from __future__ import print_function, division
"""2D magnetic/gravity joint inversion example using synthetic data"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/downunder/test/python/run_inversioncostfunction.py b/downunder/test/python/run_inversioncostfunction.py
index a875cbd..991ea8b 100644
--- a/downunder/test/python/run_inversioncostfunction.py
+++ b/downunder/test/python/run_inversioncostfunction.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
@@ -53,7 +53,7 @@ class LinearMappingX(Mapping):
class SimpleModel(ForwardModel):
def __init__(self, domain, coordinates, numComps=1):
self.domain = domain
- self.trafo=makeTranformation(domain, coordinates)
+ self.trafo=makeTransformation(domain, coordinates)
self.numComps=numComps
def getCoordinateTransformation(self):
diff --git a/downunder/test/python/run_magnetic.py b/downunder/test/python/run_magnetic.py
index fe2d2e5..2fcf45b 100644
--- a/downunder/test/python/run_magnetic.py
+++ b/downunder/test/python/run_magnetic.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/downunder/test/python/run_mappings.py b/downunder/test/python/run_mappings.py
index 466aa0f..3ec044e 100644
--- a/downunder/test/python/run_mappings.py
+++ b/downunder/test/python/run_mappings.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/downunder/test/python/run_minimizers.py b/downunder/test/python/run_minimizers.py
index f592af8..5339040 100644
--- a/downunder/test/python/run_minimizers.py
+++ b/downunder/test/python/run_minimizers.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import logging
diff --git a/downunder/test/python/run_regularization.py b/downunder/test/python/run_regularization.py
index 811f047..d198983 100644
--- a/downunder/test/python/run_regularization.py
+++ b/downunder/test/python/run_regularization.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/downunder/test/python/run_seismic.py b/downunder/test/python/run_seismic.py
index 1d6493c..1a75608 100644
--- a/downunder/test/python/run_seismic.py
+++ b/downunder/test/python/run_seismic.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import logging
diff --git a/dudley/benchmarks/dudleybench.py b/dudley/benchmarks/dudleybench.py
index 2998c59..31f392a 100644
--- a/dudley/benchmarks/dudleybench.py
+++ b/dudley/benchmarks/dudleybench.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/benchmarks/runbenchmark.py b/dudley/benchmarks/runbenchmark.py
index e136676..5f90872 100755
--- a/dudley/benchmarks/runbenchmark.py
+++ b/dudley/benchmarks/runbenchmark.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/py_src/SConscript b/dudley/py_src/SConscript
index 2efe84d..61735e3 100644
--- a/dudley/py_src/SConscript
+++ b/dudley/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/py_src/__init__.py b/dudley/py_src/__init__.py
index fb38930..37f12b4 100644
--- a/dudley/py_src/__init__.py
+++ b/dudley/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,11 +19,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escript # This is just to ensure required libraries are loaded
diff --git a/dudley/py_src/factorywrappers.py b/dudley/py_src/factorywrappers.py
index 47a7cde..e96023c 100644
--- a/dudley/py_src/factorywrappers.py
+++ b/dudley/py_src/factorywrappers.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2014-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2014-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# This file copied and adapted from the equivalent factorywrappers.py in finley
diff --git a/dudley/py_src/readers.py b/dudley/py_src/readers.py
index 76f18a7..ce54531 100644
--- a/dudley/py_src/readers.py
+++ b/dudley/py_src/readers.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/src/Assemble.h b/dudley/src/Assemble.h
index 50f2e31..9fb4685 100644
--- a/dudley/src/Assemble.h
+++ b/dudley/src/Assemble.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_AverageElementData.cpp b/dudley/src/Assemble_AverageElementData.cpp
index 58bda8d..f401c4f 100644
--- a/dudley/src/Assemble_AverageElementData.cpp
+++ b/dudley/src/Assemble_AverageElementData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_CopyElementData.cpp b/dudley/src/Assemble_CopyElementData.cpp
index cac9731..3349f39 100644
--- a/dudley/src/Assemble_CopyElementData.cpp
+++ b/dudley/src/Assemble_CopyElementData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_CopyNodalData.cpp b/dudley/src/Assemble_CopyNodalData.cpp
index c6d361f..300e45a 100644
--- a/dudley/src/Assemble_CopyNodalData.cpp
+++ b/dudley/src/Assemble_CopyNodalData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_LumpedSystem.cpp b/dudley/src/Assemble_LumpedSystem.cpp
index f7e3440..366bc4a 100644
--- a/dudley/src/Assemble_LumpedSystem.cpp
+++ b/dudley/src/Assemble_LumpedSystem.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_NodeCoordinates.cpp b/dudley/src/Assemble_NodeCoordinates.cpp
index 3ba6198..062ede2 100644
--- a/dudley/src/Assemble_NodeCoordinates.cpp
+++ b/dudley/src/Assemble_NodeCoordinates.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE.cpp b/dudley/src/Assemble_PDE.cpp
index 325660e..8e7fb61 100644
--- a/dudley/src/Assemble_PDE.cpp
+++ b/dudley/src/Assemble_PDE.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_Points.cpp b/dudley/src/Assemble_PDE_Points.cpp
index 0146cd3..6535432 100644
--- a/dudley/src/Assemble_PDE_Points.cpp
+++ b/dudley/src/Assemble_PDE_Points.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_Single2_1D.cpp b/dudley/src/Assemble_PDE_Single2_1D.cpp
index e5a8ecb..b7cf147 100644
--- a/dudley/src/Assemble_PDE_Single2_1D.cpp
+++ b/dudley/src/Assemble_PDE_Single2_1D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_Single2_2D.cpp b/dudley/src/Assemble_PDE_Single2_2D.cpp
index 8ad1aba..1bbb523 100644
--- a/dudley/src/Assemble_PDE_Single2_2D.cpp
+++ b/dudley/src/Assemble_PDE_Single2_2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_Single2_3D.cpp b/dudley/src/Assemble_PDE_Single2_3D.cpp
index 3345199..82daca1 100644
--- a/dudley/src/Assemble_PDE_Single2_3D.cpp
+++ b/dudley/src/Assemble_PDE_Single2_3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_System2_1D.cpp b/dudley/src/Assemble_PDE_System2_1D.cpp
index bde4309..c119fd2 100644
--- a/dudley/src/Assemble_PDE_System2_1D.cpp
+++ b/dudley/src/Assemble_PDE_System2_1D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_System2_2D.cpp b/dudley/src/Assemble_PDE_System2_2D.cpp
index b53aa39..a089101 100644
--- a/dudley/src/Assemble_PDE_System2_2D.cpp
+++ b/dudley/src/Assemble_PDE_System2_2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_PDE_System2_3D.cpp b/dudley/src/Assemble_PDE_System2_3D.cpp
index 87c9c63..abde0db 100644
--- a/dudley/src/Assemble_PDE_System2_3D.cpp
+++ b/dudley/src/Assemble_PDE_System2_3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_addToSystemMatrix.cpp b/dudley/src/Assemble_addToSystemMatrix.cpp
index f8d8f83..51b4a8c 100644
--- a/dudley/src/Assemble_addToSystemMatrix.cpp
+++ b/dudley/src/Assemble_addToSystemMatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_getAssembleParameters.cpp b/dudley/src/Assemble_getAssembleParameters.cpp
index ba4b35f..1c8117e 100644
--- a/dudley/src/Assemble_getAssembleParameters.cpp
+++ b/dudley/src/Assemble_getAssembleParameters.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_getSize.cpp b/dudley/src/Assemble_getSize.cpp
index cd2913b..94eca49 100644
--- a/dudley/src/Assemble_getSize.cpp
+++ b/dudley/src/Assemble_getSize.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_gradient.cpp b/dudley/src/Assemble_gradient.cpp
index 689cf66..aff3a52 100644
--- a/dudley/src/Assemble_gradient.cpp
+++ b/dudley/src/Assemble_gradient.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_integrate.cpp b/dudley/src/Assemble_integrate.cpp
index 6701b28..e8a31dd 100644
--- a/dudley/src/Assemble_integrate.cpp
+++ b/dudley/src/Assemble_integrate.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_interpolate.cpp b/dudley/src/Assemble_interpolate.cpp
index 7c39bfa..ddd4a8d 100644
--- a/dudley/src/Assemble_interpolate.cpp
+++ b/dudley/src/Assemble_interpolate.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_jacobeans.cpp b/dudley/src/Assemble_jacobeans.cpp
index e1026d3..df33872 100644
--- a/dudley/src/Assemble_jacobeans.cpp
+++ b/dudley/src/Assemble_jacobeans.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Assemble_setNormal.cpp b/dudley/src/Assemble_setNormal.cpp
index 6fc8004..ea7fd54 100644
--- a/dudley/src/Assemble_setNormal.cpp
+++ b/dudley/src/Assemble_setNormal.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/DudleyAdapterException.cpp b/dudley/src/CPPAdapter/DudleyAdapterException.cpp
index e0f6880..03a42e0 100644
--- a/dudley/src/CPPAdapter/DudleyAdapterException.cpp
+++ b/dudley/src/CPPAdapter/DudleyAdapterException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/DudleyAdapterException.h b/dudley/src/CPPAdapter/DudleyAdapterException.h
index 4c79777..15ce534 100644
--- a/dudley/src/CPPAdapter/DudleyAdapterException.h
+++ b/dudley/src/CPPAdapter/DudleyAdapterException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/DudleyError.cpp b/dudley/src/CPPAdapter/DudleyError.cpp
index f91fcf1..de23e72 100644
--- a/dudley/src/CPPAdapter/DudleyError.cpp
+++ b/dudley/src/CPPAdapter/DudleyError.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/DudleyError.h b/dudley/src/CPPAdapter/DudleyError.h
index 5816ca6..8b20f85 100644
--- a/dudley/src/CPPAdapter/DudleyError.h
+++ b/dudley/src/CPPAdapter/DudleyError.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/MeshAdapter.cpp b/dudley/src/CPPAdapter/MeshAdapter.cpp
index 60c943f..e952b7e 100644
--- a/dudley/src/CPPAdapter/MeshAdapter.cpp
+++ b/dudley/src/CPPAdapter/MeshAdapter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/MeshAdapter.h b/dudley/src/CPPAdapter/MeshAdapter.h
index 399ec3f..81ab65d 100644
--- a/dudley/src/CPPAdapter/MeshAdapter.h
+++ b/dudley/src/CPPAdapter/MeshAdapter.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/MeshAdapterFactory.cpp b/dudley/src/CPPAdapter/MeshAdapterFactory.cpp
index df8a4be..3abe831 100644
--- a/dudley/src/CPPAdapter/MeshAdapterFactory.cpp
+++ b/dudley/src/CPPAdapter/MeshAdapterFactory.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/MeshAdapterFactory.h b/dudley/src/CPPAdapter/MeshAdapterFactory.h
index 52e9ca7..eef4abe 100644
--- a/dudley/src/CPPAdapter/MeshAdapterFactory.h
+++ b/dudley/src/CPPAdapter/MeshAdapterFactory.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/CPPAdapter/dudleycpp.cpp b/dudley/src/CPPAdapter/dudleycpp.cpp
index 9bf9f9c..906042b 100644
--- a/dudley/src/CPPAdapter/dudleycpp.cpp
+++ b/dudley/src/CPPAdapter/dudleycpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -109,7 +109,7 @@ BOOST_PYTHON_MODULE(dudleycpp)
,"Creates a rectangular mesh with n0 x n1 x n2 elements over the brick [0,l0] x [0,l1] x [0,l2]."
"\n\n:param n0: number of elements in direction 0\n:type n0: ``int``\n:param n1: number of elements in direction 1\n:type n1: ``int``\n"
":param n2:number of elements in direction 2\n:type n2: ``int``\n"
-":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"
+":param order: gives the order of shape function. Only for compatibility with finley, must be 1.\n"
":param l0: length of side 0\n"
":type l0: ``float``\n"
":param l1: length of side 1\n"
diff --git a/dudley/src/CPPAdapter/system_dep.h b/dudley/src/CPPAdapter/system_dep.h
index 0f10b97..85ab30c 100644
--- a/dudley/src/CPPAdapter/system_dep.h
+++ b/dudley/src/CPPAdapter/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Dudley.cpp b/dudley/src/Dudley.cpp
index fa64bd8..35b6314 100644
--- a/dudley/src/Dudley.cpp
+++ b/dudley/src/Dudley.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Dudley.h b/dudley/src/Dudley.h
index c48ada0..1820b7d 100644
--- a/dudley/src/Dudley.h
+++ b/dudley/src/Dudley.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/DudleyVersion.h b/dudley/src/DudleyVersion.h
index c8c5ef1..17a7619 100644
--- a/dudley/src/DudleyVersion.h
+++ b/dudley/src/DudleyVersion.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -17,6 +17,6 @@
#ifndef INC_DUDLEYVERSION
#define INC_DUDLEYVERSION
-char Dudley_Version[] = "$Revision: 5593 $";
+char Dudley_Version[] = "$Revision: 6109 $";
#endif
diff --git a/dudley/src/ElementFile.cpp b/dudley/src/ElementFile.cpp
index e5b5a9f..eb75579 100644
--- a/dudley/src/ElementFile.cpp
+++ b/dudley/src/ElementFile.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile.h b/dudley/src/ElementFile.h
index 4bc6055..0682fe1 100644
--- a/dudley/src/ElementFile.h
+++ b/dudley/src/ElementFile.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_allocTable.cpp b/dudley/src/ElementFile_allocTable.cpp
index 4b41785..03c4e55 100644
--- a/dudley/src/ElementFile_allocTable.cpp
+++ b/dudley/src/ElementFile_allocTable.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_copyTable.cpp b/dudley/src/ElementFile_copyTable.cpp
index b3a701d..41c2dac 100644
--- a/dudley/src/ElementFile_copyTable.cpp
+++ b/dudley/src/ElementFile_copyTable.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_createColoring.cpp b/dudley/src/ElementFile_createColoring.cpp
index 7550a06..c202b75 100644
--- a/dudley/src/ElementFile_createColoring.cpp
+++ b/dudley/src/ElementFile_createColoring.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_distributeByRankOfDOF.cpp b/dudley/src/ElementFile_distributeByRankOfDOF.cpp
index 46b3263..66af4d7 100644
--- a/dudley/src/ElementFile_distributeByRankOfDOF.cpp
+++ b/dudley/src/ElementFile_distributeByRankOfDOF.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_gather.cpp b/dudley/src/ElementFile_gather.cpp
index b2b7412..e6b5dcd 100644
--- a/dudley/src/ElementFile_gather.cpp
+++ b/dudley/src/ElementFile_gather.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (SUCCESS)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_jacobeans.cpp b/dudley/src/ElementFile_jacobeans.cpp
index b5e754c..3f5c603 100644
--- a/dudley/src/ElementFile_jacobeans.cpp
+++ b/dudley/src/ElementFile_jacobeans.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_markNodes.cpp b/dudley/src/ElementFile_markNodes.cpp
index b67433a..b8dd2d6 100644
--- a/dudley/src/ElementFile_markNodes.cpp
+++ b/dudley/src/ElementFile_markNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_optimizeOrdering.cpp b/dudley/src/ElementFile_optimizeOrdering.cpp
index 8aa8b4b..77070a6 100644
--- a/dudley/src/ElementFile_optimizeOrdering.cpp
+++ b/dudley/src/ElementFile_optimizeOrdering.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_relableNodes.cpp b/dudley/src/ElementFile_relableNodes.cpp
index 1ef5587..0e92ff0 100644
--- a/dudley/src/ElementFile_relableNodes.cpp
+++ b/dudley/src/ElementFile_relableNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_scatter.cpp b/dudley/src/ElementFile_scatter.cpp
index 4a1eec8..072be8a 100644
--- a/dudley/src/ElementFile_scatter.cpp
+++ b/dudley/src/ElementFile_scatter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_setCoordinates.cpp b/dudley/src/ElementFile_setCoordinates.cpp
index e13716b..3ad658e 100644
--- a/dudley/src/ElementFile_setCoordinates.cpp
+++ b/dudley/src/ElementFile_setCoordinates.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_setNodeRange.cpp b/dudley/src/ElementFile_setNodeRange.cpp
index b95f45e..11fa165 100644
--- a/dudley/src/ElementFile_setNodeRange.cpp
+++ b/dudley/src/ElementFile_setNodeRange.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementFile_setTags.cpp b/dudley/src/ElementFile_setTags.cpp
index 58e2f03..b32f7f2 100644
--- a/dudley/src/ElementFile_setTags.cpp
+++ b/dudley/src/ElementFile_setTags.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementType.cpp b/dudley/src/ElementType.cpp
index 04b1d6c..eb89b0a 100644
--- a/dudley/src/ElementType.cpp
+++ b/dudley/src/ElementType.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2010-2015 by The University of Queensland
+* Copyright (c) 2010-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ElementType.h b/dudley/src/ElementType.h
index 08be24b..18bf316 100644
--- a/dudley/src/ElementType.h
+++ b/dudley/src/ElementType.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2010-2015 by The University of Queensland
+* Copyright (c) 2010-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/IndexList.cpp b/dudley/src/IndexList.cpp
index 74e73fd..3f85c47 100644
--- a/dudley/src/IndexList.cpp
+++ b/dudley/src/IndexList.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/IndexList.h b/dudley/src/IndexList.h
index b483f32..6677ed9 100644
--- a/dudley/src/IndexList.h
+++ b/dudley/src/IndexList.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh.cpp b/dudley/src/Mesh.cpp
index 5ed39f4..4f22057 100644
--- a/dudley/src/Mesh.cpp
+++ b/dudley/src/Mesh.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh.h b/dudley/src/Mesh.h
index 9e2699d..a52640f 100644
--- a/dudley/src/Mesh.h
+++ b/dudley/src/Mesh.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_createNodeFileMappings.cpp b/dudley/src/Mesh_createNodeFileMappings.cpp
index c960117..3fd4fdc 100644
--- a/dudley/src/Mesh_createNodeFileMappings.cpp
+++ b/dudley/src/Mesh_createNodeFileMappings.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_distributeByRankOfDOF.cpp b/dudley/src/Mesh_distributeByRankOfDOF.cpp
index f774c60..20a1d15 100644
--- a/dudley/src/Mesh_distributeByRankOfDOF.cpp
+++ b/dudley/src/Mesh_distributeByRankOfDOF.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_findMatchingFaces.cpp b/dudley/src/Mesh_findMatchingFaces.cpp
index b4dbe36..ae160b3 100644
--- a/dudley/src/Mesh_findMatchingFaces.cpp
+++ b/dudley/src/Mesh_findMatchingFaces.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_getPattern.cpp b/dudley/src/Mesh_getPattern.cpp
index 2a3c028..49531fe 100644
--- a/dudley/src/Mesh_getPattern.cpp
+++ b/dudley/src/Mesh_getPattern.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_markNodes.cpp b/dudley/src/Mesh_markNodes.cpp
index 454ffe5..2a8cea2 100644
--- a/dudley/src/Mesh_markNodes.cpp
+++ b/dudley/src/Mesh_markNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_optimizeDOFDistribution.cpp b/dudley/src/Mesh_optimizeDOFDistribution.cpp
index 5d5ae27..7ac2f83 100644
--- a/dudley/src/Mesh_optimizeDOFDistribution.cpp
+++ b/dudley/src/Mesh_optimizeDOFDistribution.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_optimizeDOFLabeling.cpp b/dudley/src/Mesh_optimizeDOFLabeling.cpp
index 5594e4d..863b0c9 100644
--- a/dudley/src/Mesh_optimizeDOFLabeling.cpp
+++ b/dudley/src/Mesh_optimizeDOFLabeling.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_prepare.cpp b/dudley/src/Mesh_prepare.cpp
index b572e8d..16785f5 100644
--- a/dudley/src/Mesh_prepare.cpp
+++ b/dudley/src/Mesh_prepare.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_print.cpp b/dudley/src/Mesh_print.cpp
index 1731a6b..6ea4fd4 100644
--- a/dudley/src/Mesh_print.cpp
+++ b/dudley/src/Mesh_print.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_read.cpp b/dudley/src/Mesh_read.cpp
index c63ade9..66c1b3f 100644
--- a/dudley/src/Mesh_read.cpp
+++ b/dudley/src/Mesh_read.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_readGmsh.cpp b/dudley/src/Mesh_readGmsh.cpp
index 3cd8355..08b45fc 100644
--- a/dudley/src/Mesh_readGmsh.cpp
+++ b/dudley/src/Mesh_readGmsh.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_relableElementNodes.cpp b/dudley/src/Mesh_relableElementNodes.cpp
index 56165fb..e3ccfca 100644
--- a/dudley/src/Mesh_relableElementNodes.cpp
+++ b/dudley/src/Mesh_relableElementNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_resolveNodeIds.cpp b/dudley/src/Mesh_resolveNodeIds.cpp
index c5e4345..0bb347e 100644
--- a/dudley/src/Mesh_resolveNodeIds.cpp
+++ b/dudley/src/Mesh_resolveNodeIds.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_setCoordinates.cpp b/dudley/src/Mesh_setCoordinates.cpp
index ca638ee..d2dd03e 100644
--- a/dudley/src/Mesh_setCoordinates.cpp
+++ b/dudley/src/Mesh_setCoordinates.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_tagmaps.cpp b/dudley/src/Mesh_tagmaps.cpp
index 811c7ae..230fa3e 100644
--- a/dudley/src/Mesh_tagmaps.cpp
+++ b/dudley/src/Mesh_tagmaps.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_tet4.cpp b/dudley/src/Mesh_tet4.cpp
index c5bb2bf..360fee8 100644
--- a/dudley/src/Mesh_tet4.cpp
+++ b/dudley/src/Mesh_tet4.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_tri3.cpp b/dudley/src/Mesh_tri3.cpp
index bcc1aee..8285f04 100644
--- a/dudley/src/Mesh_tri3.cpp
+++ b/dudley/src/Mesh_tri3.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Mesh_write.cpp b/dudley/src/Mesh_write.cpp
index f886c94..8487e51 100644
--- a/dudley/src/Mesh_write.cpp
+++ b/dudley/src/Mesh_write.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile.cpp b/dudley/src/NodeFile.cpp
index 27b4846..715ddc9 100644
--- a/dudley/src/NodeFile.cpp
+++ b/dudley/src/NodeFile.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile.h b/dudley/src/NodeFile.h
index 9a9221c..f0bcf39 100644
--- a/dudley/src/NodeFile.h
+++ b/dudley/src/NodeFile.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_allocTable.cpp b/dudley/src/NodeFile_allocTable.cpp
index befaab4..992a543 100644
--- a/dudley/src/NodeFile_allocTable.cpp
+++ b/dudley/src/NodeFile_allocTable.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_copyTable.cpp b/dudley/src/NodeFile_copyTable.cpp
index b936668..05d4c09 100644
--- a/dudley/src/NodeFile_copyTable.cpp
+++ b/dudley/src/NodeFile_copyTable.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_createDenseLabelings.cpp b/dudley/src/NodeFile_createDenseLabelings.cpp
index fb2c2b6..23942b7 100644
--- a/dudley/src/NodeFile_createDenseLabelings.cpp
+++ b/dudley/src/NodeFile_createDenseLabelings.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_gather.cpp b/dudley/src/NodeFile_gather.cpp
index 86eb8db..a3b1f96 100644
--- a/dudley/src/NodeFile_gather.cpp
+++ b/dudley/src/NodeFile_gather.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_scatter.cpp b/dudley/src/NodeFile_scatter.cpp
index 0fca4fa..6686376 100644
--- a/dudley/src/NodeFile_scatter.cpp
+++ b/dudley/src/NodeFile_scatter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_setCoordinates.cpp b/dudley/src/NodeFile_setCoordinates.cpp
index 5fba5ca..d5a9c26 100644
--- a/dudley/src/NodeFile_setCoordinates.cpp
+++ b/dudley/src/NodeFile_setCoordinates.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_setIdRange.cpp b/dudley/src/NodeFile_setIdRange.cpp
index 689ead6..6a75559 100644
--- a/dudley/src/NodeFile_setIdRange.cpp
+++ b/dudley/src/NodeFile_setIdRange.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeFile_setTags.cpp b/dudley/src/NodeFile_setTags.cpp
index 3d3e03a..91dd58a 100644
--- a/dudley/src/NodeFile_setTags.cpp
+++ b/dudley/src/NodeFile_setTags.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeMapping.cpp b/dudley/src/NodeMapping.cpp
index 4a79389..d60da45 100644
--- a/dudley/src/NodeMapping.cpp
+++ b/dudley/src/NodeMapping.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/NodeMapping.h b/dudley/src/NodeMapping.h
index b7a2afa..e1195a0 100644
--- a/dudley/src/NodeMapping.h
+++ b/dudley/src/NodeMapping.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/SConscript b/dudley/src/SConscript
index e7fc75b..c278c86 100644
--- a/dudley/src/SConscript
+++ b/dudley/src/SConscript
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ShapeTable.cpp b/dudley/src/ShapeTable.cpp
index 6242961..b025222 100644
--- a/dudley/src/ShapeTable.cpp
+++ b/dudley/src/ShapeTable.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/ShapeTable.h b/dudley/src/ShapeTable.h
index 6ff1641..51630fc 100644
--- a/dudley/src/ShapeTable.h
+++ b/dudley/src/ShapeTable.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/TagMap.cpp b/dudley/src/TagMap.cpp
index 03dc78f..909a4dd 100644
--- a/dudley/src/TagMap.cpp
+++ b/dudley/src/TagMap.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/TagMap.h b/dudley/src/TagMap.h
index c6e7467..4a9e3a0 100644
--- a/dudley/src/TagMap.h
+++ b/dudley/src/TagMap.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/TriangularMesh.h b/dudley/src/TriangularMesh.h
index 30c689e..5eb3be6 100644
--- a/dudley/src/TriangularMesh.h
+++ b/dudley/src/TriangularMesh.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Util.cpp b/dudley/src/Util.cpp
index eb1611b..6d95c66 100644
--- a/dudley/src/Util.cpp
+++ b/dudley/src/Util.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/Util.h b/dudley/src/Util.h
index a30929e..7600419 100644
--- a/dudley/src/Util.h
+++ b/dudley/src/Util.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/src/generateReferenceElementList.py b/dudley/src/generateReferenceElementList.py
index 5d1fe2d..ce009c2 100644
--- a/dudley/src/generateReferenceElementList.py
+++ b/dudley/src/generateReferenceElementList.py
@@ -1,11 +1,11 @@
#*******************************************************
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/test/MeshAdapterTestCase.cpp b/dudley/test/MeshAdapterTestCase.cpp
index c0412ed..5512e2c 100644
--- a/dudley/test/MeshAdapterTestCase.cpp
+++ b/dudley/test/MeshAdapterTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/test/MeshAdapterTestCase.h b/dudley/test/MeshAdapterTestCase.h
index cf2acd9..84f3f02 100644
--- a/dudley/test/MeshAdapterTestCase.h
+++ b/dudley/test/MeshAdapterTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/test/SConscript b/dudley/test/SConscript
index 2f949c5..9708ccb 100644
--- a/dudley/test/SConscript
+++ b/dudley/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -24,7 +24,7 @@ if local_env['cppunit']:
testname='dudley_UnitTest'
# build the executable
- local_env.Append(LIBS=['dudley', 'escript', 'paso', 'esysUtils']+env['cppunit_libs'])
+ local_env.Prepend(LIBS=['dudley', 'pasowrap', 'paso', 'escript', 'esysUtils']+env['cppunit_libs'])
program = local_env.Program(testname, sources)
# run the tests - but only if test_targets are stale
diff --git a/dudley/test/dudley_UnitTests.cpp b/dudley/test/dudley_UnitTests.cpp
index 7da6582..4ea53eb 100644
--- a/dudley/test/dudley_UnitTests.cpp
+++ b/dudley/test/dudley_UnitTests.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/test/python/FCT_benchmark.py b/dudley/test/python/FCT_benchmark.py
index 5d73a20..0249d1c 100755
--- a/dudley/test/python/FCT_benchmark.py
+++ b/dudley/test/python/FCT_benchmark.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/dudley/test/python/FCT_test1.py b/dudley/test/python/FCT_test1.py
index ea1be79..1b3bfa9 100644
--- a/dudley/test/python/FCT_test1.py
+++ b/dudley/test/python/FCT_test1.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/dudley/test/python/FCT_test2.py b/dudley/test/python/FCT_test2.py
index f48ba30..40851f2 100644
--- a/dudley/test/python/FCT_test2.py
+++ b/dudley/test/python/FCT_test2.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/dudley/test/python/OutTest.py b/dudley/test/python/OutTest.py
index 97759ac..9cbec7c 100644
--- a/dudley/test/python/OutTest.py
+++ b/dudley/test/python/OutTest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/PoissonSolverTest.py b/dudley/test/python/PoissonSolverTest.py
index 39d72f4..6b034cc 100644
--- a/dudley/test/python/PoissonSolverTest.py
+++ b/dudley/test/python/PoissonSolverTest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/RT2D.py b/dudley/test/python/RT2D.py
index 45fb39f..5993cf0 100644
--- a/dudley/test/python/RT2D.py
+++ b/dudley/test/python/RT2D.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/RecTest.py b/dudley/test/python/RecTest.py
index 389fe00..0b46f6a 100644
--- a/dudley/test/python/RecTest.py
+++ b/dudley/test/python/RecTest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import sys
diff --git a/dudley/test/python/SConscript b/dudley/test/python/SConscript
index c34e458..0716d38 100644
--- a/dudley/test/python/SConscript
+++ b/dudley/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/dudley/test/python/axisymm-splitB.py b/dudley/test/python/axisymm-splitB.py
index 4cb4615..170a47f 100755
--- a/dudley/test/python/axisymm-splitB.py
+++ b/dudley/test/python/axisymm-splitB.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/dudley/test/python/blocktest.py b/dudley/test/python/blocktest.py
index ea56272..2a5151b 100755
--- a/dudley/test/python/blocktest.py
+++ b/dudley/test/python/blocktest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -28,11 +28,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/brick.py b/dudley/test/python/brick.py
index 717e9d8..e2d97d4 100644
--- a/dudley/test/python/brick.py
+++ b/dudley/test/python/brick.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/convection.py b/dudley/test/python/convection.py
index 92a6112..dac8dd0 100644
--- a/dudley/test/python/convection.py
+++ b/dudley/test/python/convection.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -21,11 +21,11 @@ It is solved in dimensionless form
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/fixme_run_generators.py b/dudley/test/python/fixme_run_generators.py
index fca2667..3b40478 100644
--- a/dudley/test/python/fixme_run_generators.py
+++ b/dudley/test/python/fixme_run_generators.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/generate_dumps.py b/dudley/test/python/generate_dumps.py
index 08189f3..fe4f13b 100644
--- a/dudley/test/python/generate_dumps.py
+++ b/dudley/test/python/generate_dumps.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
this script generates dump files of various data type (scalar, vector, tensor)
diff --git a/dudley/test/python/generate_meshes.py b/dudley/test/python/generate_meshes.py
index 54ef273..db5470b 100644
--- a/dudley/test/python/generate_meshes.py
+++ b/dudley/test/python/generate_meshes.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
this script generates a variety of meshes in the fly format on a unit square with a
diff --git a/dudley/test/python/linearElastic.py b/dudley/test/python/linearElastic.py
index b9347df..d6d3924 100755
--- a/dudley/test/python/linearElastic.py
+++ b/dudley/test/python/linearElastic.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/rayleigh_taylor_instabilty.py b/dudley/test/python/rayleigh_taylor_instabilty.py
index c3b33d4..58a3ca9 100644
--- a/dudley/test/python/rayleigh_taylor_instabilty.py
+++ b/dudley/test/python/rayleigh_taylor_instabilty.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/dudley/test/python/rectangle.py b/dudley/test/python/rectangle.py
index c1ee5c2..ca3469e 100644
--- a/dudley/test/python/rectangle.py
+++ b/dudley/test/python/rectangle.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/run_escriptOnDudley.py b/dudley/test/python/run_escriptOnDudley.py
index 924a6da..4c8771b 100644
--- a/dudley/test/python/run_escriptOnDudley.py
+++ b/dudley/test/python/run_escriptOnDudley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/dudley/test/python/run_inputOutput.py b/dudley/test/python/run_inputOutput.py
index 7bd6763..ab464ba 100644
--- a/dudley/test/python/run_inputOutput.py
+++ b/dudley/test/python/run_inputOutput.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/run_linearPDEsOnDudley1.py b/dudley/test/python/run_linearPDEsOnDudley1.py
index d30e760..f9fb3d1 100644
--- a/dudley/test/python/run_linearPDEsOnDudley1.py
+++ b/dudley/test/python/run_linearPDEsOnDudley1.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/run_linearPDEsOnDudley2.py b/dudley/test/python/run_linearPDEsOnDudley2.py
index 1ad322e..4568a5e 100644
--- a/dudley/test/python/run_linearPDEsOnDudley2.py
+++ b/dudley/test/python/run_linearPDEsOnDudley2.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/run_models.py b/dudley/test/python/run_models.py
index 5456a0b..b95a5f7 100644
--- a/dudley/test/python/run_models.py
+++ b/dudley/test/python/run_models.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/dudley/test/python/run_nlpde2dOnDudley.py b/dudley/test/python/run_nlpde2dOnDudley.py
index 977056a..2597f50 100644
--- a/dudley/test/python/run_nlpde2dOnDudley.py
+++ b/dudley/test/python/run_nlpde2dOnDudley.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/run_nlpde3dOnDudley.py b/dudley/test/python/run_nlpde3dOnDudley.py
index 8815877..bb530fe 100644
--- a/dudley/test/python/run_nlpde3dOnDudley.py
+++ b/dudley/test/python/run_nlpde3dOnDudley.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/run_simplesolve.py b/dudley/test/python/run_simplesolve.py
index e8dbf1e..272630c 100644
--- a/dudley/test/python/run_simplesolve.py
+++ b/dudley/test/python/run_simplesolve.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
@@ -172,77 +172,6 @@ class Test_SimpleSolve_Rectangle_Order1_SystemPDE_Paso_PCG_Jacobi(unittest.TestC
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Rectangle_Order2_SinglePDE_Paso_PCG_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Rectangle(NE0,NE1,2,l0=1.,l1=1,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=1.+2.*x[0]+3.*x[1]+4.*x[0]**2+5.*x[1]*x[0]+6.*x[1]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(2,),Solution(domain))
- g_ex[0]=2.+8.*x[0]+5.*x[1]
- g_ex[1]=3.+5.*x[0]+12.*x[1]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=1)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask)
- pde.setValue(A=kronecker(2),y=inner(g_ex,domain.getNormal()),Y=-20.)
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.PCG)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Rectangle_Order2_SystemPDE_Paso_PCG_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Rectangle(NE0,NE1,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=Vector(0,Solution(domain))
- u_ex[0]=1.+2.*x[0]+3.*x[1]+4.*x[0]**2+5.*x[1]*x[0]+6.*x[1]**2
- u_ex[1]=-1.+4.*x[0]+2.*x[1]+1.*x[0]**2+6.*x[1]*x[0]+4.*x[1]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(2,2),Solution(domain))
- g_ex[0,0]=2.+8.*x[0]+5.*x[1]
- g_ex[0,1]=3.+5.*x[0]+12.*x[1]
- g_ex[1,0]=4.+2.*x[0]+6.*x[1]
- g_ex[1,1]=2.+6.*x[0]+8.*x[1]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=2)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask*numpy.ones(2,))
- A=Tensor4(0,Function(domain))
- A[0,:,0,:]=kronecker(2)
- A[1,:,1,:]=kronecker(2)
- Y=Vector(0.,Function(domain))
- Y[0]=u_ex[0]*FAC_DIAG+u_ex[1]*FAC_OFFDIAG
- Y[1]=u_ex[1]*FAC_DIAG+u_ex[0]*FAC_OFFDIAG
- pde.setValue(A=A,
- D=kronecker(2)*(FAC_DIAG-FAC_OFFDIAG)+numpy.ones((2,2))*FAC_OFFDIAG,
- Y=Y-[20.,10.],
- y=matrixmult(g_ex,domain.getNormal()))
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.PCG)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
class Test_SimpleSolve_Brick_Order1_SinglePDE_Paso_PCG_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Brick(NE0,NE1,NE2,1,optimize=OPTIMIZE)
@@ -320,86 +249,6 @@ class Test_SimpleSolve_Brick_Order1_SystemPDE_Paso_PCG_Jacobi(unittest.TestCase)
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Brick_Order2_SinglePDE_Paso_PCG_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Brick(NE0,NE1,NE2,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=1.+2.*x[0]+3.*x[1]+4.*x[2]+6.*x[0]*x[1]+7.*x[1]*x[2]+8.*x[2]*x[0]+9.*x[0]**2+10.*x[1]**2+11.*x[2]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(3,),Solution(domain))
- g_ex[0]=2.+6.*x[1]+8.*x[2]+18.*x[0]
- g_ex[1]=3.+6.*x[0]+7.*x[2]+20.*x[1]
- g_ex[2]=4.+7.*x[1]+8.*x[0]+22.*x[2]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=1)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask)
- pde.setValue(A=kronecker(3),y=inner(g_ex,domain.getNormal()),Y=-60.)
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.PCG)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Brick_Order2_SystemPDE_Paso_PCG_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Brick(NE0,NE1,NE2,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=Vector(0,Solution(domain))
- u_ex[0]=1.+2.*x[0]+3.*x[1]+4.*x[2]+6.*x[0]*x[1]+7.*x[1]*x[2]+8.*x[2]*x[0]+9.*x[0]**2+10.*x[1]**2+11.*x[2]**2
- u_ex[1]=2.+4.*x[0]+1.*x[1]-6.*x[2]+3.*x[0]*x[1]+2.*x[1]*x[2]-8.*x[2]*x[0]-2.*x[0]**2+7.*x[1]**2+5.*x[2]**2
- u_ex[2]=-2.+7.*x[0]+9.*x[1]+2*x[2]-6.*x[0]*x[1]+8.*x[1]*x[2]+2.*x[2]*x[0]+2.*x[0]**2+8.*x[1]**2+1.*x[2]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(3,3),Solution(domain))
- g_ex[0,0]=2.+6.*x[1]+8.*x[2]+18.*x[0]
- g_ex[0,1]=3.+6.*x[0]+7.*x[2]+20.*x[1]
- g_ex[0,2]=4.+7.*x[1]+8.*x[0]+22.*x[2]
- g_ex[1,0]=4.+3.*x[1]-8.*x[2]-4.*x[0]
- g_ex[1,1]=1+3.*x[0]+2.*x[2]+14.*x[1]
- g_ex[1,2]=-6.+2.*x[1]-8.*x[0]+10.*x[2]
- g_ex[2,0]=7.-6.*x[1]+2.*x[2]+4.*x[0]
- g_ex[2,1]=9.-6.*x[0]+8.*x[2]+16.*x[1]
- g_ex[2,2]=2+8.*x[1]+2.*x[0]+2.*x[2]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=3)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask*numpy.ones(3,))
- Y=Vector(0.,Function(domain))
- Y[0]=u_ex[0]*FAC_DIAG+u_ex[2]*FAC_OFFDIAG+u_ex[1]*FAC_OFFDIAG
- Y[1]=u_ex[1]*FAC_DIAG+u_ex[0]*FAC_OFFDIAG+u_ex[2]*FAC_OFFDIAG
- Y[2]=u_ex[2]*FAC_DIAG+u_ex[1]*FAC_OFFDIAG+u_ex[0]*FAC_OFFDIAG
- A=Tensor4(0,Function(domain))
- A[0,:,0,:]=kronecker(3)
- A[1,:,1,:]=kronecker(3)
- A[2,:,2,:]=kronecker(3)
- pde.setValue(A=A,
- D=kronecker(3)*(FAC_DIAG-FAC_OFFDIAG)+numpy.ones((3,3))*FAC_OFFDIAG,
- Y=Y-numpy.array([60.,20.,22.]),
- y=matrixmult(g_ex,domain.getNormal()))
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.PCG)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
class Test_SimpleSolve_Rectangle_Order1_SinglePDE_Paso_TFQMR_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Rectangle(NE0,NE1,1, optimize=OPTIMIZE)
@@ -430,35 +279,6 @@ class Test_SimpleSolve_Rectangle_Order1_SinglePDE_Paso_TFQMR_Jacobi(unittest.Tes
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Rectangle_Order2_SinglePDE_Paso_TFQMR_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Rectangle(NE0,NE1,2,l0=1.,l1=1,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=1.+2.*x[0]+3.*x[1]+4.*x[0]**2+5.*x[1]*x[0]+6.*x[1]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(2,),Solution(domain))
- g_ex[0]=2.+8.*x[0]+5.*x[1]
- g_ex[1]=3.+5.*x[0]+12.*x[1]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=1)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask)
- pde.setValue(A=kronecker(2),y=inner(g_ex,domain.getNormal()),Y=-20.)
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.TFQMR)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
class Test_SimpleSolve_Rectangle_Order1_SystemPDE_Paso_TFQMR_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Rectangle(NE0,NE1,1,optimize=OPTIMIZE)
@@ -500,48 +320,6 @@ class Test_SimpleSolve_Rectangle_Order1_SystemPDE_Paso_TFQMR_Jacobi(unittest.Tes
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Rectangle_Order2_SystemPDE_Paso_TFQMR_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Rectangle(NE0,NE1,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=Vector(0,Solution(domain))
- u_ex[0]=1.+2.*x[0]+3.*x[1]+4.*x[0]**2+5.*x[1]*x[0]+6.*x[1]**2
- u_ex[1]=-1.+4.*x[0]+2.*x[1]+1.*x[0]**2+6.*x[1]*x[0]+4.*x[1]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(2,2),Solution(domain))
- g_ex[0,0]=2.+8.*x[0]+5.*x[1]
- g_ex[0,1]=3.+5.*x[0]+12.*x[1]
- g_ex[1,0]=4.+2.*x[0]+6.*x[1]
- g_ex[1,1]=2.+6.*x[0]+8.*x[1]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=2)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask*numpy.ones(2,))
- A=Tensor4(0,Function(domain))
- A[0,:,0,:]=kronecker(2)
- A[1,:,1,:]=kronecker(2)
- Y=Vector(0.,Function(domain))
- Y[0]=u_ex[0]*FAC_DIAG+u_ex[1]*FAC_OFFDIAG
- Y[1]=u_ex[1]*FAC_DIAG+u_ex[0]*FAC_OFFDIAG
- pde.setValue(A=A,
- D=kronecker(2)*(FAC_DIAG-FAC_OFFDIAG)+numpy.ones((2,2))*FAC_OFFDIAG,
- Y=Y-[20.,10.],
- y=matrixmult(g_ex,domain.getNormal()))
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.TFQMR)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
class Test_SimpleSolve_Brick_Order1_SinglePDE_Paso_TFQMR_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Brick(NE0,NE1,NE2,1,optimize=OPTIMIZE)
@@ -619,87 +397,6 @@ class Test_SimpleSolve_Brick_Order1_SystemPDE_Paso_TFQMR_Jacobi(unittest.TestCas
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Brick_Order2_SinglePDE_Paso_TFQMR_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Brick(NE0,NE1,NE2,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=1.+2.*x[0]+3.*x[1]+4.*x[2]+6.*x[0]*x[1]+7.*x[1]*x[2]+8.*x[2]*x[0]+9.*x[0]**2+10.*x[1]**2+11.*x[2]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(3,),Solution(domain))
- g_ex[0]=2.+6.*x[1]+8.*x[2]+18.*x[0]
- g_ex[1]=3.+6.*x[0]+7.*x[2]+20.*x[1]
- g_ex[2]=4.+7.*x[1]+8.*x[0]+22.*x[2]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=1)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask)
- pde.setValue(A=kronecker(3),y=inner(g_ex,domain.getNormal()),Y=-60.)
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.TFQMR)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Brick_Order2_SystemPDE_Paso_TFQMR_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Brick(NE0,NE1,NE2,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=Vector(0,Solution(domain))
- u_ex[0]=1.+2.*x[0]+3.*x[1]+4.*x[2]+6.*x[0]*x[1]+7.*x[1]*x[2]+8.*x[2]*x[0]+9.*x[0]**2+10.*x[1]**2+11.*x[2]**2
- u_ex[1]=2.+4.*x[0]+1.*x[1]-6.*x[2]+3.*x[0]*x[1]+2.*x[1]*x[2]-8.*x[2]*x[0]-2.*x[0]**2+7.*x[1]**2+5.*x[2]**2
- u_ex[2]=-2.+7.*x[0]+9.*x[1]+2*x[2]-6.*x[0]*x[1]+8.*x[1]*x[2]+2.*x[2]*x[0]+2.*x[0]**2+8.*x[1]**2+1.*x[2]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(3,3),Solution(domain))
- g_ex[0,0]=2.+6.*x[1]+8.*x[2]+18.*x[0]
- g_ex[0,1]=3.+6.*x[0]+7.*x[2]+20.*x[1]
- g_ex[0,2]=4.+7.*x[1]+8.*x[0]+22.*x[2]
- g_ex[1,0]=4.+3.*x[1]-8.*x[2]-4.*x[0]
- g_ex[1,1]=1+3.*x[0]+2.*x[2]+14.*x[1]
- g_ex[1,2]=-6.+2.*x[1]-8.*x[0]+10.*x[2]
- g_ex[2,0]=7.-6.*x[1]+2.*x[2]+4.*x[0]
- g_ex[2,1]=9.-6.*x[0]+8.*x[2]+16.*x[1]
- g_ex[2,2]=2+8.*x[1]+2.*x[0]+2.*x[2]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=3)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask*numpy.ones(3,))
- Y=Vector(0.,Function(domain))
- Y[0]=u_ex[0]*FAC_DIAG+u_ex[2]*FAC_OFFDIAG+u_ex[1]*FAC_OFFDIAG
- Y[1]=u_ex[1]*FAC_DIAG+u_ex[0]*FAC_OFFDIAG+u_ex[2]*FAC_OFFDIAG
- Y[2]=u_ex[2]*FAC_DIAG+u_ex[1]*FAC_OFFDIAG+u_ex[0]*FAC_OFFDIAG
- A=Tensor4(0,Function(domain))
- A[0,:,0,:]=kronecker(3)
- A[1,:,1,:]=kronecker(3)
- A[2,:,2,:]=kronecker(3)
- pde.setValue(A=A,
- D=kronecker(3)*(FAC_DIAG-FAC_OFFDIAG)+numpy.ones((3,3))*FAC_OFFDIAG,
- Y=Y-numpy.array([60.,20.,22.]),
- y=matrixmult(g_ex,domain.getNormal()))
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.TFQMR)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
-
class Test_SimpleSolve_Rectangle_Order1_SinglePDE_Paso_MINRES_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Rectangle(NE0,NE1,1, optimize=OPTIMIZE)
@@ -731,35 +428,6 @@ class Test_SimpleSolve_Rectangle_Order1_SinglePDE_Paso_MINRES_Jacobi(unittest.Te
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Rectangle_Order2_SinglePDE_Paso_MINRES_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Rectangle(NE0,NE1,2,l0=1.,l1=1,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=1.+2.*x[0]+3.*x[1]+4.*x[0]**2+5.*x[1]*x[0]+6.*x[1]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(2,),Solution(domain))
- g_ex[0]=2.+8.*x[0]+5.*x[1]
- g_ex[1]=3.+5.*x[0]+12.*x[1]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=1)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask)
- pde.setValue(A=kronecker(2),y=inner(g_ex,domain.getNormal()),Y=-20.)
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.MINRES)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
class Test_SimpleSolve_Rectangle_Order1_SystemPDE_Paso_MINRES_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Rectangle(NE0,NE1,1,optimize=OPTIMIZE)
@@ -801,48 +469,6 @@ class Test_SimpleSolve_Rectangle_Order1_SystemPDE_Paso_MINRES_Jacobi(unittest.Te
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Rectangle_Order2_SystemPDE_Paso_MINRES_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Rectangle(NE0,NE1,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=Vector(0,Solution(domain))
- u_ex[0]=1.+2.*x[0]+3.*x[1]+4.*x[0]**2+5.*x[1]*x[0]+6.*x[1]**2
- u_ex[1]=-1.+4.*x[0]+2.*x[1]+1.*x[0]**2+6.*x[1]*x[0]+4.*x[1]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(2,2),Solution(domain))
- g_ex[0,0]=2.+8.*x[0]+5.*x[1]
- g_ex[0,1]=3.+5.*x[0]+12.*x[1]
- g_ex[1,0]=4.+2.*x[0]+6.*x[1]
- g_ex[1,1]=2.+6.*x[0]+8.*x[1]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=2)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask*numpy.ones(2,))
- A=Tensor4(0,Function(domain))
- A[0,:,0,:]=kronecker(2)
- A[1,:,1,:]=kronecker(2)
- Y=Vector(0.,Function(domain))
- Y[0]=u_ex[0]*FAC_DIAG+u_ex[1]*FAC_OFFDIAG
- Y[1]=u_ex[1]*FAC_DIAG+u_ex[0]*FAC_OFFDIAG
- pde.setValue(A=A,
- D=kronecker(2)*(FAC_DIAG-FAC_OFFDIAG)+numpy.ones((2,2))*FAC_OFFDIAG,
- Y=Y-[20.,10.],
- y=matrixmult(g_ex,domain.getNormal()))
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.MINRES)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
class Test_SimpleSolve_Brick_Order1_SinglePDE_Paso_MINRES_Jacobi(unittest.TestCase):
def test_solve(self):
domain=Brick(NE0,NE1,NE2,1,optimize=OPTIMIZE)
@@ -920,85 +546,5 @@ class Test_SimpleSolve_Brick_Order1_SystemPDE_Paso_MINRES_Jacobi(unittest.TestCa
error=Lsup(u-u_ex)
self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Brick_Order2_SinglePDE_Paso_MINRES_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Brick(NE0,NE1,NE2,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=1.+2.*x[0]+3.*x[1]+4.*x[2]+6.*x[0]*x[1]+7.*x[1]*x[2]+8.*x[2]*x[0]+9.*x[0]**2+10.*x[1]**2+11.*x[2]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(3,),Solution(domain))
- g_ex[0]=2.+6.*x[1]+8.*x[2]+18.*x[0]
- g_ex[1]=3.+6.*x[0]+7.*x[2]+20.*x[1]
- g_ex[2]=4.+7.*x[1]+8.*x[0]+22.*x[2]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=1)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask)
- pde.setValue(A=kronecker(3),y=inner(g_ex,domain.getNormal()),Y=-60.)
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.MINRES)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
- at unittest.skip("Test should be checked")
-class Test_SimpleSolve_Brick_Order2_SystemPDE_Paso_MINRES_Jacobi(unittest.TestCase):
- def test_solve(self):
- domain=Brick(NE0,NE1,NE2,2,optimize=OPTIMIZE)
- x=Solution(domain).getX()
- # --- set exact solution ----
- u_ex=Vector(0,Solution(domain))
- u_ex[0]=1.+2.*x[0]+3.*x[1]+4.*x[2]+6.*x[0]*x[1]+7.*x[1]*x[2]+8.*x[2]*x[0]+9.*x[0]**2+10.*x[1]**2+11.*x[2]**2
- u_ex[1]=2.+4.*x[0]+1.*x[1]-6.*x[2]+3.*x[0]*x[1]+2.*x[1]*x[2]-8.*x[2]*x[0]-2.*x[0]**2+7.*x[1]**2+5.*x[2]**2
- u_ex[2]=-2.+7.*x[0]+9.*x[1]+2*x[2]-6.*x[0]*x[1]+8.*x[1]*x[2]+2.*x[2]*x[0]+2.*x[0]**2+8.*x[1]**2+1.*x[2]**2
- # --- set exact gradient -----------
- g_ex=Data(0.,(3,3),Solution(domain))
- g_ex[0,0]=2.+6.*x[1]+8.*x[2]+18.*x[0]
- g_ex[0,1]=3.+6.*x[0]+7.*x[2]+20.*x[1]
- g_ex[0,2]=4.+7.*x[1]+8.*x[0]+22.*x[2]
- g_ex[1,0]=4.+3.*x[1]-8.*x[2]-4.*x[0]
- g_ex[1,1]=1+3.*x[0]+2.*x[2]+14.*x[1]
- g_ex[1,2]=-6.+2.*x[1]-8.*x[0]+10.*x[2]
- g_ex[2,0]=7.-6.*x[1]+2.*x[2]+4.*x[0]
- g_ex[2,1]=9.-6.*x[0]+8.*x[2]+16.*x[1]
- g_ex[2,2]=2+8.*x[1]+2.*x[0]+2.*x[2]
- # -------- test gradient --------------------------------
- self.assertTrue(Lsup(g_ex-grad(u_ex))<REL_TOL*Lsup(g_ex))
- # -------- set-up PDE -----------------------------------
- pde=LinearPDE(domain,numEquations=3)
- mask=whereZero(x[0])
- pde.setValue(r=u_ex,q=mask*numpy.ones(3,))
- Y=Vector(0.,Function(domain))
- Y[0]=u_ex[0]*FAC_DIAG+u_ex[2]*FAC_OFFDIAG+u_ex[1]*FAC_OFFDIAG
- Y[1]=u_ex[1]*FAC_DIAG+u_ex[0]*FAC_OFFDIAG+u_ex[2]*FAC_OFFDIAG
- Y[2]=u_ex[2]*FAC_DIAG+u_ex[1]*FAC_OFFDIAG+u_ex[0]*FAC_OFFDIAG
- A=Tensor4(0,Function(domain))
- A[0,:,0,:]=kronecker(3)
- A[1,:,1,:]=kronecker(3)
- A[2,:,2,:]=kronecker(3)
- pde.setValue(A=A,
- D=kronecker(3)*(FAC_DIAG-FAC_OFFDIAG)+numpy.ones((3,3))*FAC_OFFDIAG,
- Y=Y-numpy.array([60.,20.,22.]),
- y=matrixmult(g_ex,domain.getNormal()))
- # -------- get the solution ---------------------------
- pde.getSolverOptions().setTolerance(SOLVER_TOL)
- pde.getSolverOptions().setSolverMethod(SolverOptions.MINRES)
- pde.getSolverOptions().setPreconditioner(SolverOptions.JACOBI)
- pde.getSolverOptions().setPackage(SolverOptions.PASO)
- pde.getSolverOptions().setVerbosity(SOLVER_VERBOSE)
- u=pde.getSolution()
- # -------- test the solution ---------------------------
- error=Lsup(u-u_ex)
- self.assertTrue(error<REL_TOL*Lsup(u_ex), "solution error %s is too big."%error)
-
if __name__ == '__main__':
run_tests(__name__, exit_on_failure=True)
diff --git a/dudley/test/python/run_splitworldOnDudley.py b/dudley/test/python/run_splitworldOnDudley.py
index 05c11a9..a0e1c0c 100644
--- a/dudley/test/python/run_splitworldOnDudley.py
+++ b/dudley/test/python/run_splitworldOnDudley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2015 by The University of Queensland
+__copyright__="""Copyright (c) 2015-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/dudley/test/python/run_utilOnDudley.py b/dudley/test/python/run_utilOnDudley.py
index 6a66381..9b4876c 100644
--- a/dudley/test/python/run_utilOnDudley.py
+++ b/dudley/test/python/run_utilOnDudley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/dudley/test/python/seismic_wave.py b/dudley/test/python/seismic_wave.py
index 3b0f9e9..507f985 100644
--- a/dudley/test/python/seismic_wave.py
+++ b/dudley/test/python/seismic_wave.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/slip_stress_mesh_old.py b/dudley/test/python/slip_stress_mesh_old.py
index 991cde3..a645689 100644
--- a/dudley/test/python/slip_stress_mesh_old.py
+++ b/dudley/test/python/slip_stress_mesh_old.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/slip_stress_old.py b/dudley/test/python/slip_stress_old.py
index ea97a2b..ffbc4ec 100644
--- a/dudley/test/python/slip_stress_old.py
+++ b/dudley/test/python/slip_stress_old.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/stokes_problems.py b/dudley/test/python/stokes_problems.py
index 733e4e8..7fce77b 100644
--- a/dudley/test/python/stokes_problems.py
+++ b/dudley/test/python/stokes_problems.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/dudley/test/python/subduction1.py b/dudley/test/python/subduction1.py
index 7d401b7..763e1de 100644
--- a/dudley/test/python/subduction1.py
+++ b/dudley/test/python/subduction1.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# $Id$
diff --git a/dudley/test/python/subduction1_gen.py b/dudley/test/python/subduction1_gen.py
index 5275f2f..bc1840d 100644
--- a/dudley/test/python/subduction1_gen.py
+++ b/dudley/test/python/subduction1_gen.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/dudley/test/python/time_chunks.py b/dudley/test/python/time_chunks.py
index 205209b..af34ccd 100644
--- a/dudley/test/python/time_chunks.py
+++ b/dudley/test/python/time_chunks.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
NUM_THREADS=8
diff --git a/dudley/test/python/tp.py b/dudley/test/python/tp.py
index 6d48842..f4bbcdf 100644
--- a/dudley/test/python/tp.py
+++ b/dudley/test/python/tp.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/escript/py_src/SConscript b/escript/py_src/SConscript
index 55d370e..3f977a8 100644
--- a/escript/py_src/SConscript
+++ b/escript/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2013-2015 by The University of Queensland
+# Copyright (c) 2013-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
diff --git a/escript/py_src/__init__.py b/escript/py_src/__init__.py
index 896096e..c2e9b2d 100644
--- a/escript/py_src/__init__.py
+++ b/escript/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2013-2015 by The University of Queensland
+# Copyright (c) 2013-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development 2012-2013 by School of Earth Sciences
# Development from 2014 by Centre for Geoscience Computing (GeoComp)
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2013-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2013-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escriptcore.escriptcpp import *
diff --git a/escript/py_src/datamanager.py b/escript/py_src/datamanager.py
index 3ca7653..1f6a63c 100644
--- a/escript/py_src/datamanager.py
+++ b/escript/py_src/datamanager.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/linearPDEs.py b/escript/py_src/linearPDEs.py
index b6048cb..897033f 100644
--- a/escript/py_src/linearPDEs.py
+++ b/escript/py_src/linearPDEs.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/modelframe.py b/escript/py_src/modelframe.py
index 20d518b..4cbf3f6 100644
--- a/escript/py_src/modelframe.py
+++ b/escript/py_src/modelframe.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/models.py b/escript/py_src/models.py
index a3cfad8..c184689 100644
--- a/escript/py_src/models.py
+++ b/escript/py_src/models.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/pdetools.py b/escript/py_src/pdetools.py
index 6af4f2b..d4227a1 100644
--- a/escript/py_src/pdetools.py
+++ b/escript/py_src/pdetools.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/util.py b/escript/py_src/splitworld.py
similarity index 70%
copy from escript/py_src/util.py
copy to escript/py_src/splitworld.py
index f9361a9..d2fa00f 100644
--- a/escript/py_src/util.py
+++ b/escript/py_src/splitworld.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,4 +16,4 @@
from __future__ import print_function, division
-from esys.escriptcore.util import *
+from esys.escriptcore.splitworld import *
\ No newline at end of file
diff --git a/escript/py_src/symbolic.py b/escript/py_src/symbolic.py
index 9464d57..49f436f 100644
--- a/escript/py_src/symbolic.py
+++ b/escript/py_src/symbolic.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/unitsSI.py b/escript/py_src/unitsSI.py
index dd664fc..655b0fd 100644
--- a/escript/py_src/unitsSI.py
+++ b/escript/py_src/unitsSI.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escript/py_src/util.py b/escript/py_src/util.py
index f9361a9..3645849 100644
--- a/escript/py_src/util.py
+++ b/escript/py_src/util.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/py_src/SConscript b/escriptcore/py_src/SConscript
index 8044969..007c970 100644
--- a/escriptcore/py_src/SConscript
+++ b/escriptcore/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/py_src/__init__.py b/escriptcore/py_src/__init__.py
index bad7755..e755ae5 100644
--- a/escriptcore/py_src/__init__.py
+++ b/escriptcore/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/py_src/benchmark.py b/escriptcore/py_src/benchmark.py
index 16a213d..458ff88 100644
--- a/escriptcore/py_src/benchmark.py
+++ b/escriptcore/py_src/benchmark.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
filter# $Id:$
diff --git a/escriptcore/py_src/datamanager.py b/escriptcore/py_src/datamanager.py
index 67df185..fe136b4 100644
--- a/escriptcore/py_src/datamanager.py
+++ b/escriptcore/py_src/datamanager.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Lutz Gross, Cihan Altinay"
@@ -327,7 +327,7 @@ class DataManager(object):
pickle.dump(self._stamp, open(stamp_file, "wb"))
ff=self.__getDumpFilename("_domain", restartdir)
self._domain.dump(ff)
- for name, var in sorted(list(self._data.items(), key=lambda x: x[0])):
+ for name, var in sorted(list(self._data.items()), key=lambda x: x[0]):
ff=self.__getDumpFilename(name, restartdir)
var.dump(ff)
print(("Restart files saved in "+os.path.join(self._workdir, restartdir)))
diff --git a/escriptcore/py_src/domainCouplers.py b/escriptcore/py_src/domainCouplers.py
index 132f3cf..b6a7da5 100644
--- a/escriptcore/py_src/domainCouplers.py
+++ b/escriptcore/py_src/domainCouplers.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -23,11 +23,11 @@ must already support interpolation in at least one direction.
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2014-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2014-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escriptcore.escriptcpp import getMPISizeWorld, MPIBarrierWorld
diff --git a/escriptcore/py_src/faultsystems.py b/escriptcore/py_src/faultsystems.py
index 3bf1d1b..37fd9bf 100644
--- a/escriptcore/py_src/faultsystems.py
+++ b/escriptcore/py_src/faultsystems.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#from esys.escript import sqrt, EPSILON, cos, sin, Lsup, atan, length, matrixmult, wherePositive, matrix_mult, inner, Scalar, whereNonNegative, whereNonPositive, maximum, minimum, sign, whereNegative, whereZero
diff --git a/escriptcore/py_src/flows.py b/escriptcore/py_src/flows.py
index 7fb84ba..4b557b8 100644
--- a/escriptcore/py_src/flows.py
+++ b/escriptcore/py_src/flows.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/gmshrunner.py b/escriptcore/py_src/gmshrunner.py
index f2be953..32b068d 100644
--- a/escriptcore/py_src/gmshrunner.py
+++ b/escriptcore/py_src/gmshrunner.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/heat.py b/escriptcore/py_src/heat.py
index 868911a..3137124 100644
--- a/escriptcore/py_src/heat.py
+++ b/escriptcore/py_src/heat.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
@@ -87,21 +87,21 @@ class TemperatureCartesian(lpe.TransportPDE):
self.setInitialSolution(T)
def setValue(self,rhocp=None,v=None,k=None,Q=None,surface_flux=None,given_T_mask=None):
- if rhocp!=None:
+ if rhocp is not None:
self.__rhocp=rhocp
- if v!=None:
+ if v is not None:
self.__v=v
- if rhocp!=None:
+ if rhocp is not None:
super(TemperatureCartesian,self).setValue(M=self.__rhocp)
- if (rhocp!=None or v!=None) and self.__rhocp!=None and self.__v!=None:
+ if (rhocp is not None or v is not None) and self.__rhocp is not None and self.__v is not None:
super(TemperatureCartesian,self).setValue(C=-self.__rhocp*self.__v)
- if k!=None:
+ if k is not None:
super(TemperatureCartesian,self).setValue(A=-k*util.kronecker(self.getDomain()))
- if Q!=None:
+ if Q is not None:
super(TemperatureCartesian,self).setValue(Y=Q)
- if surface_flux!=None:
+ if surface_flux is not None:
super(TemperatureCartesian,self).setValue(y=surface_flux)
- if given_T_mask!=None:
+ if given_T_mask is not None:
super(TemperatureCartesian,self).setValue(q=given_T_mask)
def getTemperature(self,dt,**kwargs):
@@ -158,12 +158,12 @@ class Tracer(lpe.TransportPDE):
"""
self.setInitialSolution(C)
- def setValue(self,v=None,given_C_mask=None, k=None):
- if v!=None:
+ def setValue(self, v=None, given_C_mask=None, k=None):
+ if v is not None:
super(Tracer,self).setValue(C=-v)
- if k!=None:
+ if k is not None:
super(Tracer,self).setValue(A=-k*util.kronecker(self.getDomain()))
- if given_C_mask!=None:
+ if given_C_mask is not None:
super(Tracer,self).setValue(q=given_C_mask)
def getTracer(self,dt,**kwargs):
diff --git a/escriptcore/py_src/levelset.py b/escriptcore/py_src/levelset.py
index 67838d2..1f5092d 100644
--- a/escriptcore/py_src/levelset.py
+++ b/escriptcore/py_src/levelset.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.linearPDEs as lpe
diff --git a/escriptcore/py_src/linearPDEs.py b/escriptcore/py_src/linearPDEs.py
index 232f4f2..e98c9be 100644
--- a/escriptcore/py_src/linearPDEs.py
+++ b/escriptcore/py_src/linearPDEs.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/modelframe.py b/escriptcore/py_src/modelframe.py
index eed3547..f4ba3be 100644
--- a/escriptcore/py_src/modelframe.py
+++ b/escriptcore/py_src/modelframe.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/models.py b/escriptcore/py_src/models.py
index 7fa4506..aef3067 100644
--- a/escriptcore/py_src/models.py
+++ b/escriptcore/py_src/models.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/mountains.py b/escriptcore/py_src/mountains.py
index a185c36..91a7524 100644
--- a/escriptcore/py_src/mountains.py
+++ b/escriptcore/py_src/mountains.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/py_src/nonlinearPDE.py b/escriptcore/py_src/nonlinearPDE.py
index 94e2949..07c2baa 100644
--- a/escriptcore/py_src/nonlinearPDE.py
+++ b/escriptcore/py_src/nonlinearPDE.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/pdetools.py b/escriptcore/py_src/pdetools.py
index 83ea8a2..8f0c8ff 100644
--- a/escriptcore/py_src/pdetools.py
+++ b/escriptcore/py_src/pdetools.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
@@ -2008,4 +2008,25 @@ def MaskFromTag(domain,*tags):
pde.setValue(Y=d)
return util.whereNonZero(pde.getRightHandSide())
+def BoundaryValuesFromVolumeTag(domain,**values):
+ """
+ Creates a mask on the Solution(domain) function space where the value is
+ one for samples that touch regions tagged by tags.
+
+ Usage: m=BoundaryValuesFromVolumeTag(domain, ham=1, f=6)
+
+ :param domain: domain to be used
+ :type domain: `escript.Domain`
+ :return: a mask which marks samples that are touching the boundary tagged
+ by any of the given tags
+ :rtype: `escript.Data` of rank 0
+ """
+ pde=linearPDEs.LinearPDE(domain,numEquations=1, numSolutions=1)
+ out=escore.Scalar(0.,escore.FunctionOnBoundary(domain))
+ for t,v in values.items():
+ d=escore.Scalar(0.,escore.Function(domain))
+ d.setTaggedValue(t,1.)
+ pde.setValue(Y=d)
+ out+=v*util.whereZero(util.interpolate(util.whereNonZero(pde.getRightHandSide()), escore.FunctionOnBoundary(domain))-1.)
+ return out
diff --git a/escriptcore/py_src/rheologies.py b/escriptcore/py_src/rheologies.py
index 5f22384..5f06532 100644
--- a/escriptcore/py_src/rheologies.py
+++ b/escriptcore/py_src/rheologies.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
@@ -60,7 +60,7 @@ class PowerLaw(object):
:param numMaterials: number of materials
:type numMaterials: ``int``
- :param verbose: if ``True`` some informations are printed.
+ :param verbose: if ``True`` some information is printed.
:type verbose: ``bool``
"""
if numMaterials<1:
@@ -623,7 +623,7 @@ class IncompressibleIsotropicFlowCartesian(PowerLaw,Rheology, StokesProblemCarte
:type t: ``float``
:param numMaterials: number of materials
:type numMaterials: ``int``
- :param verbose: if ``True`` some informations are printed.
+ :param verbose: if ``True`` some information is printed.
:type verbose: ``bool``
"""
PowerLaw. __init__(self, numMaterials,verbose=verbose)
diff --git a/escriptcore/py_src/runmodel.py b/escriptcore/py_src/runmodel.py
index 366d509..9e86644 100644
--- a/escriptcore/py_src/runmodel.py
+++ b/escriptcore/py_src/runmodel.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/splitworld.py b/escriptcore/py_src/splitworld.py
index ca4c918..f8079ed 100644
--- a/escriptcore/py_src/splitworld.py
+++ b/escriptcore/py_src/splitworld.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2014-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2014-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Joel Fenwick"
@@ -121,6 +121,14 @@ class SplitWorld(object):
Returns the names of all declared variables and a boolean for each indicating whether they have values.
"""
return self.cpp_obj.getVarList()
+
+
+ def getVarInfo(self):
+ """
+ Returns the names of all declared variables and a description of type.
+ The details of the output are not fixed and may change without notice
+ """
+ return self.cpp_obj.getVarInfo()
def getFloatVariable(self, vname):
@@ -128,6 +136,14 @@ class SplitWorld(object):
Return the value of a floating point variable
"""
return self.cpp_obj.getDoubleVariable(vname)
+
+
+ def getLocalObjectVariable(self, vname):
+ """
+ Return the value of a local object variable - that is, an object (eg tuple) which does not need to
+ be reduced/shared between worlds
+ """
+ return self.cpp_obj.getLocalObjectVariable(vname)
def getSubWorldCount(self):
"""
diff --git a/escriptcore/py_src/start.py b/escriptcore/py_src/start.py
index 1521a83..384b49f 100644
--- a/escriptcore/py_src/start.py
+++ b/escriptcore/py_src/start.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# This file includes setup and tweaks that are required for escript core packages
diff --git a/escriptcore/py_src/symbolic/__init__.py b/escriptcore/py_src/symbolic/__init__.py
index b9b378e..5f84765 100644
--- a/escriptcore/py_src/symbolic/__init__.py
+++ b/escriptcore/py_src/symbolic/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from .symbol import *
diff --git a/escriptcore/py_src/symbolic/evaluator.py b/escriptcore/py_src/symbolic/evaluator.py
index 7c69581..6f21122 100644
--- a/escriptcore/py_src/symbolic/evaluator.py
+++ b/escriptcore/py_src/symbolic/evaluator.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Cihan Altinay"
diff --git a/escriptcore/py_src/symbolic/functions.py b/escriptcore/py_src/symbolic/functions.py
index b5e6707..acb6d6e 100644
--- a/escriptcore/py_src/symbolic/functions.py
+++ b/escriptcore/py_src/symbolic/functions.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/py_src/symbolic/pretty.py b/escriptcore/py_src/symbolic/pretty.py
index c757bfd..7e67bb8 100644
--- a/escriptcore/py_src/symbolic/pretty.py
+++ b/escriptcore/py_src/symbolic/pretty.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import numpy
diff --git a/escriptcore/py_src/symbolic/symbol.py b/escriptcore/py_src/symbolic/symbol.py
index 8b7600a..3a92790 100644
--- a/escriptcore/py_src/symbolic/symbol.py
+++ b/escriptcore/py_src/symbolic/symbol.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Cihan Altinay"
diff --git a/escriptcore/py_src/symbolic/symconstants.py b/escriptcore/py_src/symbolic/symconstants.py
index 301a4ff..58fa94f 100644
--- a/escriptcore/py_src/symbolic/symconstants.py
+++ b/escriptcore/py_src/symbolic/symconstants.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/py_src/symbolic/utils.py b/escriptcore/py_src/symbolic/utils.py
index 1de9cc6..58afa11 100644
--- a/escriptcore/py_src/symbolic/utils.py
+++ b/escriptcore/py_src/symbolic/utils.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Cihan Altinay"
diff --git a/escriptcore/py_src/testing.py b/escriptcore/py_src/testing.py
index 7cd72a4..eee6a09 100644
--- a/escriptcore/py_src/testing.py
+++ b/escriptcore/py_src/testing.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -52,11 +52,11 @@ Printing the list of skipped tests::
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2014-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2014-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/escriptcore/py_src/unitsSI.py b/escriptcore/py_src/unitsSI.py
index d426b8b..ee2925a 100644
--- a/escriptcore/py_src/unitsSI.py
+++ b/escriptcore/py_src/unitsSI.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -82,11 +82,11 @@ from __future__ import print_function, division
"""
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Lutz Gross, l.gross at uq.edu.au"
diff --git a/escriptcore/py_src/utestselect.py b/escriptcore/py_src/utestselect.py
index 9985696..1fbe52b 100644
--- a/escriptcore/py_src/utestselect.py
+++ b/escriptcore/py_src/utestselect.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2014-2015 by The University of Queensland
+# Copyright (c) 2014-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2014-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2014-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/py_src/util.py b/escriptcore/py_src/util.py
index ac23865..01b8262 100644
--- a/escriptcore/py_src/util.py
+++ b/escriptcore/py_src/util.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/src/AbstractContinuousDomain.cpp b/escriptcore/src/AbstractContinuousDomain.cpp
index eccbf5b..a02c252 100644
--- a/escriptcore/src/AbstractContinuousDomain.cpp
+++ b/escriptcore/src/AbstractContinuousDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractContinuousDomain.h b/escriptcore/src/AbstractContinuousDomain.h
index 9a026f0..7a5fc9b 100644
--- a/escriptcore/src/AbstractContinuousDomain.h
+++ b/escriptcore/src/AbstractContinuousDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractDomain.cpp b/escriptcore/src/AbstractDomain.cpp
index 322d631..6e8662b 100644
--- a/escriptcore/src/AbstractDomain.cpp
+++ b/escriptcore/src/AbstractDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractDomain.h b/escriptcore/src/AbstractDomain.h
index 0ac66ae..da30292 100644
--- a/escriptcore/src/AbstractDomain.h
+++ b/escriptcore/src/AbstractDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractReducer.cpp b/escriptcore/src/AbstractReducer.cpp
index 88fa2f6..fd45e8d 100644
--- a/escriptcore/src/AbstractReducer.cpp
+++ b/escriptcore/src/AbstractReducer.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractReducer.h b/escriptcore/src/AbstractReducer.h
index 627631c..4652cc7 100644
--- a/escriptcore/src/AbstractReducer.h
+++ b/escriptcore/src/AbstractReducer.h
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractSystemMatrix.cpp b/escriptcore/src/AbstractSystemMatrix.cpp
index b0a4cd4..1456e6f 100644
--- a/escriptcore/src/AbstractSystemMatrix.cpp
+++ b/escriptcore/src/AbstractSystemMatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractSystemMatrix.h b/escriptcore/src/AbstractSystemMatrix.h
index 619830c..264ce38 100644
--- a/escriptcore/src/AbstractSystemMatrix.h
+++ b/escriptcore/src/AbstractSystemMatrix.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractTransportProblem.cpp b/escriptcore/src/AbstractTransportProblem.cpp
index 7fa9997..82116f5 100644
--- a/escriptcore/src/AbstractTransportProblem.cpp
+++ b/escriptcore/src/AbstractTransportProblem.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/AbstractTransportProblem.h b/escriptcore/src/AbstractTransportProblem.h
index 68f11a8..f42225a 100644
--- a/escriptcore/src/AbstractTransportProblem.h
+++ b/escriptcore/src/AbstractTransportProblem.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/BinaryOp.h b/escriptcore/src/BinaryOp.h
index eecd79e..c5ff9ff 100644
--- a/escriptcore/src/BinaryOp.h
+++ b/escriptcore/src/BinaryOp.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Data.cpp b/escriptcore/src/Data.cpp
index 1118f1c..9edcd2b 100644
--- a/escriptcore/src/Data.cpp
+++ b/escriptcore/src/Data.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -1398,6 +1398,108 @@ Data::integrateWorker() const
}
Data
+Data::besselFirstKind(int order)
+{
+ return bessel(order,boost::math::cyl_bessel_j);
+}
+
+Data
+Data::besselSecondKind(int order)
+{
+ return bessel(order,boost::math::cyl_neumann);
+}
+
+Data
+Data::bessel(int order, double (*besselfunc) (int,double) )
+{
+ if (isEmpty()) // do this before we attempt to interpolate
+ {
+ throw DataException("Error - Operations (bessel) not permitted on instances of DataEmpty.");
+ }
+ if (isLazy())
+ {
+ resolve();
+ }
+ // Interpolate if necessary and find an appropriate function space
+ Data arg_0_Z = Data(*this);
+
+ // Get rank and shape of inputs
+ const DataTypes::ShapeType& shape0 = arg_0_Z.getDataPointShape();
+ int size0 = arg_0_Z.getDataPointSize();
+
+ // Declare output Data object
+ Data res;
+
+ if (arg_0_Z.isConstant()) {
+ res = Data(0.0, shape0, arg_0_Z.getFunctionSpace()); // DataConstant output
+ const double *ptr_0 = &(arg_0_Z.getDataAtOffsetRO(0));
+ double *ptr_2 = &(res.getDataAtOffsetRW(0));
+ for (int i = 0; i < size0; ++i) {
+ ptr_2[i] = besselfunc(order, ptr_0[i]);
+ }
+ }
+ else if (arg_0_Z.isTagged()) {
+
+ // Borrow DataTagged input from Data object
+ DataTagged* tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
+
+ // Prepare a DataTagged output 2
+ res = Data(0.0, shape0, arg_0_Z.getFunctionSpace()); // DataTagged output
+ res.tag();
+ DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
+
+ // Get the pointers to the actual data
+ const double *ptr_0 = &(tmp_0->getDefaultValueRO(0));
+ double *ptr_2 = &(tmp_2->getDefaultValueRW(0));
+ // Compute a result for the default
+ for (int i = 0; i < size0; ++i) {
+ ptr_2[i] = besselfunc(order, ptr_0[i]);
+ }
+ // Compute a result for each tag
+ const DataTagged::DataMapType& lookup_0=tmp_0->getTagLookup();
+ DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
+ for (i=lookup_0.begin();i!=lookup_0.end();i++) {
+ tmp_2->addTag(i->first);
+ const double *ptr_0 = &(tmp_0->getDataByTagRO(i->first,0));
+ double *ptr_2 = &(tmp_2->getDataByTagRW(i->first,0));
+ for (int i = 0; i < size0; ++i) {
+ ptr_2[i] = besselfunc(order, ptr_0[i]);
+ }
+
+ }
+
+ }
+ else if (arg_0_Z.isExpanded()) {
+
+ res = Data(0.0, shape0, arg_0_Z.getFunctionSpace(),true); // DataExpanded output
+ DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
+ DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
+
+ int sampleNo_0,dataPointNo_0;
+ int numSamples_0 = arg_0_Z.getNumSamples();
+ int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
+ #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
+ for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
+ dataPointNo_0=0;
+ // for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
+ int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
+ int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
+ const double *ptr_0 = &(arg_0_Z.getDataAtOffsetRO(offset_0));
+ double *ptr_2 = &(res.getDataAtOffsetRW(offset_2));
+ for (int i = 0; i < size0*numDataPointsPerSample_0; ++i) {
+ ptr_2[i] = besselfunc(order, ptr_0[i]);
+ }
+ // }
+ }
+ }
+ else {
+ throw DataException("Error - Bessel function: unknown combination of inputs");
+ }
+
+ return res;
+}
+
+Data
Data::sin() const
{
MAKELAZYOP(SIN);
@@ -2465,6 +2567,7 @@ Data::powD(const Data& right) const
return C_TensorBinaryOperation<double (*)(double, double)>(*this, right, ::pow);
}
+
//
// NOTE: It is essential to specify the namespace this operator belongs to
Data
diff --git a/escriptcore/src/Data.h b/escriptcore/src/Data.h
index 93df06e..c572fbd 100644
--- a/escriptcore/src/Data.h
+++ b/escriptcore/src/Data.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -41,6 +41,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/python/object.hpp>
#include <boost/python/tuple.hpp>
+#include <boost/math/special_functions/bessel.hpp>
namespace escript {
@@ -1156,6 +1157,35 @@ instead of manually manipulating process and point IDs.
/**
\brief
+ Bessel worker function.
+ *
+ */
+ ESCRIPT_DLL_API
+ Data
+ bessel(int order, double (*besselfunc) (int,double) );
+
+
+ /**
+ \brief
+ Return the Bessel function of the first kind for each data point of this Data object.
+ *
+ */
+ ESCRIPT_DLL_API
+ Data
+ besselFirstKind(int order);
+
+ /**
+ \brief
+ Return the Bessel function of the second kind for each data point of this Data object.
+ *
+ */
+ ESCRIPT_DLL_API
+ Data
+ besselSecondKind(int order);
+
+
+ /**
+ \brief
Return the tan of each data point of this Data object.
*
*/
diff --git a/escriptcore/src/DataAbstract.cpp b/escriptcore/src/DataAbstract.cpp
index c7fcd83..e830bf7 100644
--- a/escriptcore/src/DataAbstract.cpp
+++ b/escriptcore/src/DataAbstract.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataAbstract.h b/escriptcore/src/DataAbstract.h
index a7a566c..95c7191 100644
--- a/escriptcore/src/DataAbstract.h
+++ b/escriptcore/src/DataAbstract.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataAlgorithm.h b/escriptcore/src/DataAlgorithm.h
index 51cfdb5..48bf9b3 100644
--- a/escriptcore/src/DataAlgorithm.h
+++ b/escriptcore/src/DataAlgorithm.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataBlocks2D.cpp b/escriptcore/src/DataBlocks2D.cpp
index 6d17524..2723b0e 100644
--- a/escriptcore/src/DataBlocks2D.cpp
+++ b/escriptcore/src/DataBlocks2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataBlocks2D.h b/escriptcore/src/DataBlocks2D.h
index 56a901f..1ad47b0 100644
--- a/escriptcore/src/DataBlocks2D.h
+++ b/escriptcore/src/DataBlocks2D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataC.cpp b/escriptcore/src/DataC.cpp
index 5a7b221..3326f8a 100644
--- a/escriptcore/src/DataC.cpp
+++ b/escriptcore/src/DataC.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataC.h b/escriptcore/src/DataC.h
index af132ca..39600ef 100644
--- a/escriptcore/src/DataC.h
+++ b/escriptcore/src/DataC.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataConstant.cpp b/escriptcore/src/DataConstant.cpp
index 1bcf585..a66c6cf 100644
--- a/escriptcore/src/DataConstant.cpp
+++ b/escriptcore/src/DataConstant.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataConstant.h b/escriptcore/src/DataConstant.h
index 8402260..e39fc1b 100644
--- a/escriptcore/src/DataConstant.h
+++ b/escriptcore/src/DataConstant.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataEmpty.cpp b/escriptcore/src/DataEmpty.cpp
index d19df83..d032e6b 100644
--- a/escriptcore/src/DataEmpty.cpp
+++ b/escriptcore/src/DataEmpty.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataEmpty.h b/escriptcore/src/DataEmpty.h
index d048209..9a3b7b0 100644
--- a/escriptcore/src/DataEmpty.h
+++ b/escriptcore/src/DataEmpty.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataException.cpp b/escriptcore/src/DataException.cpp
index bca2211..9ffeef1 100644
--- a/escriptcore/src/DataException.cpp
+++ b/escriptcore/src/DataException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataException.h b/escriptcore/src/DataException.h
index d5922cc..5a1b877 100644
--- a/escriptcore/src/DataException.h
+++ b/escriptcore/src/DataException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataExpanded.cpp b/escriptcore/src/DataExpanded.cpp
index 4382b53..8540d94 100644
--- a/escriptcore/src/DataExpanded.cpp
+++ b/escriptcore/src/DataExpanded.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -15,35 +15,34 @@
*****************************************************************************/
#define ESNEEDPYTHON
-#include "esysUtils/first.h"
+#include <esysUtils/first.h>
+#include <esysUtils/Esys_MPI.h>
#include "Data.h"
-#include "DataExpanded.h"
-#include "DataException.h"
#include "DataConstant.h"
+#include "DataException.h"
+#include "DataExpanded.h"
+#include "DataMaths.h"
#include "DataTagged.h"
-#include <limits>
-
-#include "esysUtils/Esys_MPI.h"
+#include <limits>
#ifdef USE_NETCDF
#include <netcdfcpp.h>
#endif
-#include <boost/python/extract.hpp>
-#include "DataMaths.h"
-
-#include "esysUtils/EsysRandom.h"
-
using namespace std;
-using namespace boost::python;
-using namespace boost;
using namespace escript::DataTypes;
+#define CHECK_FOR_EX_WRITE do {\
+ if (!checkNoSharing()) {\
+ std::ostringstream ss;\
+ ss << "Attempt to modify shared object. Line " << __LINE__ << " in "\
+ << __FILE__;\
+ abort();\
+ throw DataException(ss.str());\
+ }\
+} while(0)
-// #define CHECK_FOR_EX_WRITE if (!checkNoSharing()) {throw DataException("Attempt to modify shared object");}
-
-#define CHECK_FOR_EX_WRITE if (!checkNoSharing()) {std::ostringstream ss; ss << " Attempt to modify shared object. line " << __LINE__ << " of " << __FILE__; abort();throw DataException(ss.str());}
namespace escript {
@@ -51,89 +50,75 @@ DataExpanded::DataExpanded(const WrappedArray& value,
const FunctionSpace& what)
: parent(what,value.getShape())
{
- //
- // initialise the data array for this object
- initialise(what.getNumSamples(),what.getNumDPPSample());
- //
- // copy the given value to every data point
- copy(value);
+ // initialise the data array for this object
+ initialise(what.getNumSamples(),what.getNumDPPSample());
+ // copy the given value to every data point
+ copy(value);
}
DataExpanded::DataExpanded(const DataExpanded& other)
: parent(other.getFunctionSpace(), other.getShape()),
- m_data(other.m_data)
+ m_data(other.m_data)
{
}
DataExpanded::DataExpanded(const DataConstant& other)
: parent(other.getFunctionSpace(), other.getShape())
{
- //
- // initialise the data array for this object
- initialise(other.getNumSamples(),other.getNumDPPSample());
- //
- // DataConstant only has one value, copy this to every data point
- copy(other);
+ // initialise the data array for this object
+ initialise(other.getNumSamples(),other.getNumDPPSample());
+ // DataConstant only has one value, copy this to every data point
+ copy(other);
}
DataExpanded::DataExpanded(const DataTagged& other)
: parent(other.getFunctionSpace(), other.getShape())
{
- //
- // initialise the data array for this object
- initialise(other.getNumSamples(),other.getNumDPPSample());
- //
- // for each data point in this object, extract and copy the corresponding data
- // value from the given DataTagged object
- int i,j;
- DataTypes::ValueType::size_type numRows=m_data.getNumRows();
- DataTypes::ValueType::size_type numCols=m_data.getNumCols();
- #pragma omp parallel for private(i,j) schedule(static)
- for (i=0;i<numRows;i++) {
- for (j=0;j<numCols;j++) {
- try {
- DataTypes::copyPoint(getVectorRW(), getPointOffset(i,j), getNoValues(),
- other.getVectorRO(),
- other.getPointOffset(i,j));
- }
- catch (std::exception& e) {
- cout << e.what() << endl;
- }
+ // initialise the data array for this object
+ initialise(other.getNumSamples(),other.getNumDPPSample());
+ // for each data point in this object, extract and copy the corresponding
+ // data value from the given DataTagged object
+ DataTypes::ValueType::size_type numRows=m_data.getNumRows();
+ DataTypes::ValueType::size_type numCols=m_data.getNumCols();
+#pragma omp parallel for
+ for (int i=0; i<numRows; i++) {
+ for (int j=0; j<numCols; j++) {
+ try {
+ DataTypes::copyPoint(getVectorRW(), getPointOffset(i,j),
+ getNoValues(), other.getVectorRO(),
+ other.getPointOffset(i,j));
+ } catch (std::exception& e) {
+ cerr << e.what() << endl;
+ }
+ }
}
- }
}
DataExpanded::DataExpanded(const DataExpanded& other,
const DataTypes::RegionType& region)
: parent(other.getFunctionSpace(),DataTypes::getResultSliceShape(region))
{
- //
- // get the shape of the slice
-// DataTypes::ShapeType shape(DataTypes::getResultSliceShape(region));
- //
- // initialise this Data object to the shape of the slice
- initialise(other.getNumSamples(),other.getNumDPPSample());
- //
- // copy the data
- DataTypes::RegionLoopRangeType region_loop_range=DataTypes::getSliceRegionLoopRange(region);
- DataTypes::ValueType::size_type numRows=m_data.getNumRows();
- DataTypes::ValueType::size_type numCols=m_data.getNumCols();
- int i,j;
- #pragma omp parallel for private(i,j) schedule(static)
- for (i=0;i<numRows;i++) {
- for (j=0;j<numCols;j++) {
- try {
- DataTypes::copySlice(getVectorRW(),getShape(),getPointOffset(i,j),
- other.getVectorRO(),
+ // initialise this Data object to the shape of the slice
+ initialise(other.getNumSamples(),other.getNumDPPSample());
+ // copy the data
+ DataTypes::RegionLoopRangeType region_loop_range =
+ DataTypes::getSliceRegionLoopRange(region);
+ DataTypes::ValueType::size_type numRows=m_data.getNumRows();
+ DataTypes::ValueType::size_type numCols=m_data.getNumCols();
+#pragma omp parallel for
+ for (int i=0; i<numRows; i++) {
+ for (int j=0; j<numCols; j++) {
+ try {
+ DataTypes::copySlice(getVectorRW(), getShape(),
+ getPointOffset(i,j), other.getVectorRO(),
other.getShape(),
other.getPointOffset(i,j),
region_loop_range);
- }
- catch (std::exception& e) {
- cout << e.what() << endl;
- }
+ } catch (std::exception& e) {
+ cerr << e.what() << endl;
+ }
+ }
}
- }
}
DataExpanded::DataExpanded(const FunctionSpace& what,
@@ -141,32 +126,23 @@ DataExpanded::DataExpanded(const FunctionSpace& what,
const DataTypes::ValueType &data)
: parent(what,shape)
{
- EsysAssert(data.size()%getNoValues()==0,
+ EsysAssert(data.size()%getNoValues()==0,
"DataExpanded Constructor - size of supplied data is not a multiple of shape size.");
- if (data.size()==getNoValues())
- {
- ValueType& vec=m_data.getData();
- //
- // create the view of the data
- initialise(what.getNumSamples(),what.getNumDPPSample());
- // now we copy this value to all elements
- for (int i=0;i<getLength();)
- {
- for (unsigned int j=0;j<getNoValues();++j,++i)
- {
- vec[i]=data[j];
+ if (data.size() == getNoValues()) {
+ ValueType& vec=m_data.getData();
+ // create the view of the data
+ initialise(what.getNumSamples(),what.getNumDPPSample());
+ // now we copy this value to all elements
+ for (int i=0; i<getLength();) {
+ for (unsigned int j=0;j<getNoValues();++j,++i) {
+ vec[i]=data[j];
+ }
}
- }
- }
- else
- {
- //
- // copy the data in the correct format
- m_data.getData()=data;
- }
-
-
+ } else {
+ // copy the data in the correct format
+ m_data.getData() = data;
+ }
}
DataExpanded::DataExpanded(const FunctionSpace& what,
@@ -174,691 +150,621 @@ DataExpanded::DataExpanded(const FunctionSpace& what,
const double v)
: parent(what,shape)
{
- ValueType& vec=m_data.getData();
- //
- // create the view of the data
- initialise(what.getNumSamples(),what.getNumDPPSample());
- // now we copy this value to all elements
- const int L=getLength();
- int i;
- #pragma omp parallel for schedule(static) private(i)
- for (i=0;i<L;++i)
- {
+ ValueType& vec=m_data.getData();
+ // create the view of the data
+ initialise(what.getNumSamples(),what.getNumDPPSample());
+ // now we copy this value to all elements
+ const int L=getLength();
+#pragma omp parallel for
+ for (int i=0; i<L; ++i) {
vec[i]=v;
- }
+ }
}
+DataExpanded::~DataExpanded()
+{
+}
+DataAbstract* DataExpanded::deepCopy()
+{
+ return new DataExpanded(*this);
+}
-DataExpanded::~DataExpanded()
+DataAbstract* DataExpanded::getSlice(const DataTypes::RegionType& region) const
{
+ return new DataExpanded(*this,region);
}
-DataAbstract*
-DataExpanded::deepCopy()
-{
- return new DataExpanded(*this);
-}
-
-
-DataAbstract*
-DataExpanded::getSlice(const DataTypes::RegionType& region) const
-{
- return new DataExpanded(*this,region);
-}
-
-void
-DataExpanded::setSlice(const DataAbstract* value,
- const DataTypes::RegionType& region)
-{
- const DataExpanded* tempDataExp=dynamic_cast<const DataExpanded*>(value);
- if (tempDataExp==0) {
- throw DataException("Programming error - casting to DataExpanded.");
- }
- CHECK_FOR_EX_WRITE
- //
- // get shape of slice
- DataTypes::ShapeType shape(DataTypes::getResultSliceShape(region));
- DataTypes::RegionLoopRangeType region_loop_range=DataTypes::getSliceRegionLoopRange(region);
- //
- // check shape
- if (getRank()!=region.size()) {
- throw DataException("Error - Invalid slice region.");
- }
- if (tempDataExp->getRank()>0 && !DataTypes::checkShape(value->getShape(), shape)) {
- throw DataException (DataTypes::createShapeErrorMessage(
- "Error - Couldn't copy slice due to shape mismatch.",shape, value->getShape()));
- }
- //
- // copy the data from the slice into this object
- DataTypes::ValueType::size_type numRows=m_data.getNumRows();
- DataTypes::ValueType::size_type numCols=m_data.getNumCols();
- int i, j;
- ValueType& vec=getVectorRW();
- const ShapeType& mshape=getShape();
- const ValueType& tVec=tempDataExp->getVectorRO();
- const ShapeType& tShape=tempDataExp->getShape();
- #pragma omp parallel for private(i,j) schedule(static)
- for (i=0;i<numRows;i++) {
- for (j=0;j<numCols;j++) {
- DataTypes::copySliceFrom(vec,mshape,getPointOffset(i,j),
- tVec,
- tShape,
- tempDataExp->getPointOffset(i,j),
- region_loop_range);
+void DataExpanded::setSlice(const DataAbstract* value,
+ const DataTypes::RegionType& region)
+{
+ const DataExpanded* tempDataExp=dynamic_cast<const DataExpanded*>(value);
+ if (!tempDataExp)
+ throw DataException("Programming error - casting to DataExpanded.");
+
+ CHECK_FOR_EX_WRITE;
+
+ // get shape of slice
+ DataTypes::ShapeType shape(DataTypes::getResultSliceShape(region));
+ DataTypes::RegionLoopRangeType region_loop_range =
+ DataTypes::getSliceRegionLoopRange(region);
+ // check shape
+ if (getRank() != region.size())
+ throw DataException("Error - Invalid slice region.");
+
+ if (tempDataExp->getRank() > 0 && !DataTypes::checkShape(value->getShape(), shape))
+ throw DataException(DataTypes::createShapeErrorMessage(
+ "Error - Couldn't copy slice due to shape mismatch.",
+ shape, value->getShape()));
+ // copy the data from the slice into this object
+ DataTypes::ValueType::size_type numRows = m_data.getNumRows();
+ DataTypes::ValueType::size_type numCols = m_data.getNumCols();
+ ValueType& vec=getVectorRW();
+ const ShapeType& mshape=getShape();
+ const ValueType& tVec=tempDataExp->getVectorRO();
+ const ShapeType& tShape=tempDataExp->getShape();
+#pragma omp parallel for
+ for (int i=0; i<numRows; i++) {
+ for (int j=0; j<numCols; j++) {
+ DataTypes::copySliceFrom(vec, mshape, getPointOffset(i,j), tVec,
+ tShape, tempDataExp->getPointOffset(i,j),
+ region_loop_range);
+ }
}
- }
}
-void
-DataExpanded::copy(const DataConstant& value)
+void DataExpanded::copy(const DataConstant& value)
{
- EsysAssert((checkShape(getShape(), value.getShape())),
- createShapeErrorMessage("Error - Couldn't copy due to shape mismatch.",value.getShape(),getShape()));
+ EsysAssert((checkShape(getShape(), value.getShape())),
+ createShapeErrorMessage("Error - Couldn't copy due to shape mismatch.", value.getShape(), getShape()));
- //
- // copy a single value to every data point in this object
- int nRows=m_data.getNumRows();
- int nCols=m_data.getNumCols();
- int i,j;
- #pragma omp parallel for private(i,j) schedule(static)
- for (i=0;i<nRows;i++) {
- for (j=0;j<nCols;j++) {
- DataTypes::copyPoint(getVectorRW(), getPointOffset(i,j), getNoValues(), value.getVectorRO(), 0);
+ // copy a single value to every data point in this object
+ int nRows=m_data.getNumRows();
+ int nCols=m_data.getNumCols();
+#pragma omp parallel for
+ for (int i=0; i<nRows; i++) {
+ for (int j=0; j<nCols; j++) {
+ DataTypes::copyPoint(getVectorRW(), getPointOffset(i,j),
+ getNoValues(), value.getVectorRO(), 0);
+ }
}
- }
}
-void
-DataExpanded::copy(const WrappedArray& value)
+void DataExpanded::copy(const WrappedArray& value)
{
- // check the input shape matches this shape
- if (!DataTypes::checkShape(getShape(),value.getShape())) {
- throw DataException(DataTypes::createShapeErrorMessage(
- "Error - (DataExpanded) Cannot copy due to shape mismatch.",
- value.getShape(),getShape()));
- }
- getVectorRW().copyFromArray(value, getNumDPPSample()*getNumSamples());
+ // check the input shape matches this shape
+ if (!DataTypes::checkShape(getShape(),value.getShape()))
+ throw DataException(DataTypes::createShapeErrorMessage(
+ "Error - (DataExpanded) Cannot copy due to shape mismatch.",
+ value.getShape(),getShape()));
+ getVectorRW().copyFromArray(value, getNumDPPSample()*getNumSamples());
}
-
-void
-DataExpanded::initialise(int noSamples,
- int noDataPointsPerSample)
+void DataExpanded::initialise(int noSamples, int noDataPointsPerSample)
{
- if (noSamples==0) //retain the default empty object
- {
- return;
- }
- //
- // resize data array to the required size
- m_data.resize(noSamples,noDataPointsPerSample,getNoValues());
+ if (noSamples==0) //retain the default empty object
+ return;
+
+ // resize data array to the required size
+ m_data.resize(noSamples, noDataPointsPerSample, getNoValues());
}
-bool
-DataExpanded::hasNaN() const
+
+bool DataExpanded::hasNaN() const
{
- bool haveNaN=false;
- const ValueType& v=m_data.getData();
- #pragma omp parallel for
- for (ValueType::size_type i=0;i<v.size();++i)
- {
- if (nancheck(v[i]))
- {
- #pragma omp critical
- {
- haveNaN=true;
- }
- }
+ bool haveNaN = false;
+ const ValueType& v = m_data.getData();
+#pragma omp parallel for
+ for (ValueType::size_type i=0; i<v.size(); ++i) {
+ if (nancheck(v[i])) {
+#pragma omp critical
+ {
+ haveNaN=true;
+ }
}
- return haveNaN;
+ }
+ return haveNaN;
}
-void
-DataExpanded::replaceNaN(double value)
+void DataExpanded::replaceNaN(double value)
{
- #pragma omp parallel for
- for (ValueType::size_type i=0;i<m_data.size();++i)
- {
- if (nancheck(m_data[i]))
- {
- m_data[i] = value;
- }
- }
+#pragma omp parallel for
+ for (ValueType::size_type i=0; i<m_data.size(); ++i) {
+ if (nancheck(m_data[i])) {
+ m_data[i] = value;
+ }
+ }
}
-
-string
-DataExpanded::toString() const
+string DataExpanded::toString() const
{
- stringstream temp;
- FunctionSpace fs=getFunctionSpace();
+ stringstream ss;
+ FunctionSpace fs=getFunctionSpace();
- int offset=0;
- for (int i=0;i<m_data.getNumRows();i++) {
- for (int j=0;j<m_data.getNumCols();j++) {
- offset=getPointOffset(i,j);
- stringstream suffix;
- suffix << "( id: " << i << ", ref: " << fs.getReferenceIDOfSample(i) << ", pnt: " << j << ")";
- temp << DataTypes::pointToString(getVectorRO(),getShape(),offset,suffix.str());
- if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {
- temp << endl;
- }
+ int offset=0;
+ for (int i=0; i<m_data.getNumRows(); i++) {
+ for (int j=0; j<m_data.getNumCols(); j++) {
+ offset = getPointOffset(i,j);
+ stringstream suffix;
+ suffix << "( id: " << i << ", ref: "
+ << fs.getReferenceIDOfSample(i) << ", pnt: " << j << ")";
+ ss << DataTypes::pointToString(getVectorRO(), getShape(), offset,
+ suffix.str());
+ if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {
+ ss << endl;
+ }
+ }
}
- }
- string result=temp.str();
- if (result.empty())
- {
- return "(data contains no samples)\n";
- }
- return temp.str();
+ string result(ss.str());
+ if (result.empty())
+ return "(data contains no samples)\n";
+
+ return result;
}
-DataTypes::ValueType::size_type
-DataExpanded::getPointOffset(int sampleNo,
- int dataPointNo) const
+DataTypes::ValueType::size_type DataExpanded::getPointOffset(int sampleNo,
+ int dataPointNo) const
{
- return m_data.index(sampleNo,dataPointNo);
+ return m_data.index(sampleNo,dataPointNo);
}
-DataTypes::ValueType::size_type
-DataExpanded::getPointOffset(int sampleNo,
- int dataPointNo)
+DataTypes::ValueType::size_type DataExpanded::getPointOffset(int sampleNo,
+ int dataPointNo)
{
- return m_data.index(sampleNo,dataPointNo);
+ return m_data.index(sampleNo,dataPointNo);
}
-DataTypes::ValueType::size_type
-DataExpanded::getLength() const
+DataTypes::ValueType::size_type DataExpanded::getLength() const
{
- return m_data.size();
+ return m_data.size();
}
+void DataExpanded::copyToDataPoint(int sampleNo, int dataPointNo, double value)
+{
+ CHECK_FOR_EX_WRITE;
+ // Get the number of samples and data-points per sample.
+ int numSamples = getNumSamples();
+ int numDataPointsPerSample = getNumDPPSample();
+ int dataPointRank = getRank();
+ ShapeType dataPointShape = getShape();
+ if (numSamples*numDataPointsPerSample > 0) {
+ //TODO: global error handling
+ if (sampleNo >= numSamples || sampleNo < 0)
+ throw DataException("DataExpanded::copyDataPoint: invalid sampleNo.");
+ if (dataPointNo >= numDataPointsPerSample || dataPointNo < 0)
+ throw DataException("DataExpanded::copyDataPoint: invalid dataPointNo.");
+ ValueType::size_type offset = getPointOffset(sampleNo, dataPointNo);
+ ValueType& vec = getVectorRW();
+ if (dataPointRank==0) {
+ vec[offset] = value;
+ } else if (dataPointRank==1) {
+ for (int i=0; i<dataPointShape[0]; i++) {
+ vec[offset+i] = value;
+ }
+ } else if (dataPointRank==2) {
+ for (int i=0; i<dataPointShape[0]; i++) {
+ for (int j=0; j<dataPointShape[1]; j++) {
+ vec[offset+getRelIndex(dataPointShape,i,j)] = value;
+ }
+ }
+ } else if (dataPointRank==3) {
+ for (int i=0; i<dataPointShape[0]; i++) {
+ for (int j=0; j<dataPointShape[1]; j++) {
+ for (int k=0; k<dataPointShape[2]; k++) {
+ vec[offset+getRelIndex(dataPointShape,i,j,k)] = value;
+ }
+ }
+ }
+ } else if (dataPointRank==4) {
+ for (int i=0; i<dataPointShape[0]; i++) {
+ for (int j=0; j<dataPointShape[1]; j++) {
+ for (int k=0; k<dataPointShape[2]; k++) {
+ for (int l=0; l<dataPointShape[3]; l++) {
+ vec[offset+getRelIndex(dataPointShape,i,j,k,l)] = value;
+ }
+ }
+ }
+ }
+ }
+ }
+}
-void
-DataExpanded::copyToDataPoint(const int sampleNo, const int dataPointNo, const double value) {
- CHECK_FOR_EX_WRITE
- //
- // Get the number of samples and data-points per sample.
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- int dataPointRank = getRank();
- ShapeType dataPointShape = getShape();
- if (numSamples*numDataPointsPerSample > 0) {
- //TODO: global error handling
- if ((sampleNo >= numSamples) || (sampleNo < 0 )) {
- throw DataException("Error - DataExpanded::copyDataPoint invalid sampleNo.");
- }
- if ((dataPointNo >= numDataPointsPerSample) || (dataPointNo < 0)) {
- throw DataException("Error - DataExpanded::copyDataPoint invalid dataPointNoInSample.");
- }
- ValueType::size_type offset = getPointOffset(sampleNo, dataPointNo);
- ValueType& vec=getVectorRW();
- if (dataPointRank==0) {
- vec[offset]=value;
- } else if (dataPointRank==1) {
- for (int i=0; i<dataPointShape[0]; i++) {
- vec[offset+i]=value;
+void DataExpanded::copyToDataPoint(int sampleNo, int dataPointNo,
+ const WrappedArray& value)
+{
+ CHECK_FOR_EX_WRITE;
+ // Get the number of samples and data-points per sample
+ int numSamples = getNumSamples();
+ int numDataPointsPerSample = getNumDPPSample();
+ // check rank
+ if (value.getRank() != getRank())
+ throw DataException("Rank of value does not match Data object rank");
+
+ if (numSamples*numDataPointsPerSample > 0) {
+ //TODO: global error handling
+ if (sampleNo >= numSamples || sampleNo < 0)
+ throw DataException("DataExpanded::copyDataPoint: invalid sampleNo.");
+ if (dataPointNo >= numDataPointsPerSample || dataPointNo < 0)
+ throw DataException("DataExpanded::copyDataPoint: invalid dataPointNoInSample.");
+
+ ValueType::size_type offset = getPointOffset(sampleNo, dataPointNo);
+ ValueType& vec = getVectorRW();
+ vec.copyFromArrayToOffset(value, offset, 1);
+ }
+}
+
+void DataExpanded::symmetric(DataAbstract* ev)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev = dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("DataExpanded::symmetric: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec = getVectorRO();
+ const ShapeType& shape = getShape();
+ ValueType& evVec = temp_ev->getVectorRW();
+ const ShapeType& evShape = temp_ev->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::symmetric(vec, shape,
+ getPointOffset(sampleNo,dataPointNo), evVec, evShape,
+ ev->getPointOffset(sampleNo,dataPointNo));
+ }
+ }
+}
+
+void DataExpanded::nonsymmetric(DataAbstract* ev)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("DataExpanded::nonsymmetric: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec = getVectorRO();
+ const ShapeType& shape = getShape();
+ ValueType& evVec = temp_ev->getVectorRW();
+ const ShapeType& evShape = temp_ev->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::nonsymmetric(vec, shape,
+ getPointOffset(sampleNo,dataPointNo), evVec, evShape,
+ ev->getPointOffset(sampleNo,dataPointNo));
+ }
+ }
+}
+
+void DataExpanded::trace(DataAbstract* ev, int axis_offset)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev = dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("DataExpanded::trace: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec=getVectorRO();
+ const ShapeType& shape=getShape();
+ ValueType& evVec=temp_ev->getVectorRW();
+ const ShapeType& evShape=temp_ev->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::trace(vec, shape, getPointOffset(sampleNo,dataPointNo),
+ evVec, evShape, ev->getPointOffset(sampleNo,dataPointNo),
+ axis_offset);
}
- } else if (dataPointRank==2) {
- for (int i=0; i<dataPointShape[0]; i++) {
- for (int j=0; j<dataPointShape[1]; j++) {
- vec[offset+getRelIndex(dataPointShape,i,j)]=value;
- }
+ }
+}
+
+void DataExpanded::transpose(DataAbstract* ev, int axis_offset)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("DataExpanded::transpose: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec = getVectorRO();
+ const ShapeType& shape = getShape();
+ ValueType& evVec = temp_ev->getVectorRW();
+ const ShapeType& evShape = temp_ev->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::transpose(vec, shape,
+ getPointOffset(sampleNo,dataPointNo), evVec, evShape,
+ ev->getPointOffset(sampleNo,dataPointNo), axis_offset);
}
- } else if (dataPointRank==3) {
- for (int i=0; i<dataPointShape[0]; i++) {
- for (int j=0; j<dataPointShape[1]; j++) {
- for (int k=0; k<dataPointShape[2]; k++) {
- vec[offset+getRelIndex(dataPointShape,i,j,k)]=value;
- }
- }
+ }
+}
+
+void DataExpanded::swapaxes(DataAbstract* ev, int axis0, int axis1)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("Error - DataExpanded::swapaxes: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec=getVectorRO();
+ const ShapeType& shape=getShape();
+ ValueType& evVec=temp_ev->getVectorRW();
+ const ShapeType& evShape=temp_ev->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::swapaxes(vec, shape,
+ getPointOffset(sampleNo,dataPointNo), evVec, evShape,
+ ev->getPointOffset(sampleNo,dataPointNo), axis0, axis1);
+ }
+ }
+}
+
+void DataExpanded::eigenvalues(DataAbstract* ev)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("DataExpanded::eigenvalues: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec=getVectorRO();
+ const ShapeType& shape=getShape();
+ ValueType& evVec=temp_ev->getVectorRW();
+ const ShapeType& evShape=temp_ev->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::eigenvalues(vec, shape,
+ getPointOffset(sampleNo,dataPointNo), evVec, evShape,
+ ev->getPointOffset(sampleNo,dataPointNo));
+ }
+ }
+}
+
+void DataExpanded::eigenvalues_and_eigenvectors(DataAbstract* ev,
+ DataAbstract* V, double tol)
+{
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
+ if (!temp_ev)
+ throw DataException("DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (probably a programming error).");
+
+ DataExpanded* temp_V=dynamic_cast<DataExpanded*>(V);
+ if (!temp_V)
+ throw DataException("DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (probably a programming error).");
+
+ const ValueType& vec = getVectorRO();
+ const ShapeType& shape = getShape();
+ ValueType& evVec = temp_ev->getVectorRW();
+ const ShapeType& evShape = temp_ev->getShape();
+ ValueType& VVec = temp_V->getVectorRW();
+ const ShapeType& VShape = temp_V->getShape();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ DataMaths::eigenvalues_and_eigenvectors(vec, shape,
+ getPointOffset(sampleNo,dataPointNo), evVec, evShape,
+ ev->getPointOffset(sampleNo,dataPointNo), VVec, VShape,
+ V->getPointOffset(sampleNo,dataPointNo), tol);
+ }
+ }
+}
+
+
+int DataExpanded::matrixInverse(DataAbstract* out) const
+{
+ DataExpanded* temp=dynamic_cast<DataExpanded*>(out);
+ if (!temp)
+ throw DataException("DataExpanded::matrixInverse: casting to DataExpanded failed (probably a programming error).");
+
+ if (getRank() != 2)
+ throw DataException("DataExpanded::matrixInverse: input must be rank 2.");
+
+ const int numdpps=getNumDPPSample();
+ const int numSamples = getNumSamples();
+ const ValueType& vec=m_data.getData();
+ int errcode=0;
+#pragma omp parallel
+ {
+ int errorcode=0;
+ LapackInverseHelper h(getShape()[0]);
+#pragma omp for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++)
+ {
+ // not sure I like all those virtual calls to getPointOffset
+ DataTypes::ValueType::size_type offset=getPointOffset(sampleNo,0);
+ int res=DataMaths::matrix_inverse(vec, getShape(), offset,
+ temp->getVectorRW(), temp->getShape(), offset, numdpps, h);
+ if (res > errorcode) {
+ errorcode=res;
+#pragma omp critical
+ {
+ // I'm not especially concerned which error gets reported
+ // as long as one is
+ errcode=errorcode;
+ }
+ }
}
- } else if (dataPointRank==4) {
- for (int i=0; i<dataPointShape[0]; i++) {
- for (int j=0; j<dataPointShape[1]; j++) {
- for (int k=0; k<dataPointShape[2]; k++) {
- for (int l=0; l<dataPointShape[3]; l++) {
- vec[offset+getRelIndex(dataPointShape,i,j,k,l)]=value;
- }
- }
- }
- }
- }
- }
-}
-
-void
-DataExpanded::copyToDataPoint(const int sampleNo, const int dataPointNo, const WrappedArray& value) {
- CHECK_FOR_EX_WRITE
- //
- // Get the number of samples and data-points per sample.
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- //
- // check rank:
- if (value.getRank()!=getRank())
- throw DataException("Rank of value does not match Data object rank");
- if (numSamples*numDataPointsPerSample > 0) {
- //TODO: global error handling
- if ((sampleNo >= numSamples) || (sampleNo < 0 )) {
- throw DataException("Error - DataExpanded::copyDataPoint invalid sampleNo.");
- }
- if ((dataPointNo >= numDataPointsPerSample) || (dataPointNo < 0)) {
- throw DataException("Error - DataExpanded::copyDataPoint invalid dataPointNoInSample.");
- }
- ValueType::size_type offset = getPointOffset(sampleNo, dataPointNo);
- ValueType& vec=getVectorRW();
- vec.copyFromArrayToOffset(value,offset,1);
- }
-}
-
-void
-DataExpanded::symmetric(DataAbstract* ev)
-{
- int sampleNo,dataPointNo;
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::symmetric: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::symmetric(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo));
}
- }
-}
-void
-DataExpanded::nonsymmetric(DataAbstract* ev)
-{
- int sampleNo,dataPointNo;
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::nonsymmetric: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::nonsymmetric(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo));
+ return errcode;
+}
+
+void DataExpanded::setToZero()
+{
+ // Q: Surely there is a more efficient way to do this????
+ // Why is there no memset here? Parallel issues?
+ // A: This ensures that memory is touched by the correct thread.
+ CHECK_FOR_EX_WRITE;
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ const DataTypes::ValueType::size_type n = getNoValues();
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ double* p = &m_data[getPointOffset(sampleNo,dataPointNo)];
+ for (int i=0; i<n; ++i)
+ p[i] = 0.;
+ }
}
- }
-}
-void
-DataExpanded::trace(DataAbstract* ev, int axis_offset)
-{
- int sampleNo,dataPointNo;
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::trace: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::trace(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo),axis_offset);
+}
+
+void DataExpanded::dump(const std::string fileName) const
+{
+#ifdef USE_NETCDF
+ const int ldims=2+DataTypes::maxRank;
+ const NcDim* ncdims[ldims];
+ NcVar *var, *ids;
+ int rank = getRank();
+ int type= getFunctionSpace().getTypeCode();
+ int ndims =0;
+ long dims[ldims];
+ const double* d_ptr=&(m_data[0]);
+ const DataTypes::ShapeType& shape = getShape();
+ int mpi_iam=getFunctionSpace().getDomain()->getMPIRank();
+ int mpi_num=getFunctionSpace().getDomain()->getMPISize();
+
+ // netCDF error handler
+ NcError err(NcError::verbose_nonfatal);
+ std::string newFileName(esysUtils::appendRankToFileName(fileName,
+ mpi_num, mpi_iam));
+ NcFile dataFile(newFileName.c_str(), NcFile::Replace);
+ if (!dataFile.is_valid())
+ throw DataException("DataExpanded::dump: opening of netCDF file for output failed.");
+ if (!dataFile.add_att("type_id",2))
+ throw DataException("DataExpanded::dump: appending data type to netCDF file failed.");
+ if (!dataFile.add_att("rank",rank))
+ throw DataException("DataExpanded::dump: appending rank attribute to netCDF file failed.");
+ if (!dataFile.add_att("function_space_type",type))
+ throw DataException("DataExpanded::dump: appending function space attribute to netCDF file failed.");
+ ndims=rank+2;
+ if ( rank >0 ) {
+ dims[0]=shape[0];
+ if (! (ncdims[0] = dataFile.add_dim("d0",shape[0])) )
+ throw DataException("DataExpanded::dump: appending ncdim 0 to netCDF file failed.");
}
- }
-}
-
-void
-DataExpanded::transpose(DataAbstract* ev, int axis_offset)
-{
- int sampleNo,dataPointNo;
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::transpose: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::transpose(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo),axis_offset);
+ if ( rank >1 ) {
+ dims[1]=shape[1];
+ if (! (ncdims[1] = dataFile.add_dim("d1",shape[1])) )
+ throw DataException("DataExpanded::dump: appending ncdim 1 to netCDF file failed.");
}
- }
-}
-
-void
-DataExpanded::swapaxes(DataAbstract* ev, int axis0, int axis1)
-{
- int sampleNo,dataPointNo;
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::swapaxes: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::swapaxes(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo),axis0,axis1);
+ if ( rank >2 ) {
+ dims[2]=shape[2];
+ if (! (ncdims[2] = dataFile.add_dim("d2", shape[2])) )
+ throw DataException("DataExpanded::dump: appending ncdim 2 to netCDF file failed.");
}
- }
-}
-void
-DataExpanded::eigenvalues(DataAbstract* ev)
-{
- int sampleNo,dataPointNo;
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::eigenvalues: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::eigenvalues(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo));
+ if ( rank >3 ) {
+ dims[3]=shape[3];
+ if (! (ncdims[3] = dataFile.add_dim("d3", shape[3])) )
+ throw DataException("DataExpanded::dump: appending ncdim 3 to netCDF file failed.");
}
- }
-}
-void
-DataExpanded::eigenvalues_and_eigenvectors(DataAbstract* ev,DataAbstract* V,const double tol)
-{
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- int sampleNo,dataPointNo;
- DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
- if (temp_ev==0) {
- throw DataException("Error - DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (probably a programming error).");
- }
- DataExpanded* temp_V=dynamic_cast<DataExpanded*>(V);
- if (temp_V==0) {
- throw DataException("Error - DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (probably a programming error).");
- }
- const ValueType& vec=getVectorRO();
- const ShapeType& shape=getShape();
- ValueType& evVec=temp_ev->getVectorRW();
- const ShapeType& evShape=temp_ev->getShape();
- ValueType& VVec=temp_V->getVectorRW();
- const ShapeType& VShape=temp_V->getShape();
- #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- DataMaths::eigenvalues_and_eigenvectors(vec,shape,getPointOffset(sampleNo,dataPointNo),
- evVec,evShape,ev->getPointOffset(sampleNo,dataPointNo),
- VVec, VShape,V->getPointOffset(sampleNo,dataPointNo),tol);
+ dims[rank]=getFunctionSpace().getNumDataPointsPerSample();
+ if (! (ncdims[rank] = dataFile.add_dim("num_data_points_per_sample", dims[rank])) )
+ throw DataException("DataExpanded::dump: appending num_data_points_per_sample to netCDF file failed.");
+ dims[rank+1]=getFunctionSpace().getNumSamples();
+ if (! (ncdims[rank+1] = dataFile.add_dim("num_samples", dims[rank+1])) )
+ throw DataException("DataExpanded::dump: appending num_sample to netCDF file failed.");
+
+ if (getFunctionSpace().getNumSamples() > 0) {
+ if (! ( ids = dataFile.add_var("id", ncInt, ncdims[rank+1])) )
+ throw DataException("DataExpanded::dump: appending reference id to netCDF file failed.");
+ const dim_t* ids_p=getFunctionSpace().borrowSampleReferenceIDs();
+ if (! (ids->put(ids_p,dims[rank+1])) )
+ throw DataException("DataExpanded::dump: copy reference id to netCDF buffer failed.");
+ if (! ( var = dataFile.add_var("data", ncDouble, ndims, ncdims)) )
+ throw DataException("DataExpanded::dump: appending variable to netCDF file failed.");
+ if (! (var->put(d_ptr,dims)) )
+ throw DataException("DataExpanded::dump: copy data to netCDF buffer failed.");
}
- }
-}
-
-
-int
-DataExpanded::matrixInverse(DataAbstract* out) const
-{
- DataExpanded* temp=dynamic_cast<DataExpanded*>(out);
- if (temp==0)
- {
- throw DataException("Error - DataExpanded::matrixInverse: casting to DataExpanded failed (probably a programming error).");
- }
-
- if (getRank()!=2)
- {
- throw DataException("Error - DataExpanded::matrixInverse: input must be rank 2.");
-
- }
- int sampleNo;
- const int numdpps=getNumDPPSample();
- const int numSamples = getNumSamples();
- const ValueType& vec=m_data.getData();
- int errcode=0;
- #pragma omp parallel private(sampleNo)
- {
- int errorcode=0;
- LapackInverseHelper h(getShape()[0]);
- #pragma omp for schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++)
- {
- // not sure I like all those virtual calls to getPointOffset
- DataTypes::ValueType::size_type offset=getPointOffset(sampleNo,0);
- int res=DataMaths::matrix_inverse(vec, getShape(), offset, temp->getVectorRW(), temp->getShape(), offset, numdpps, h);
- if (res>errorcode)
- {
- errorcode=res;
- #pragma omp critical
- {
- errcode=errorcode; // I'm not especially concerned which error gets reported as long as one is
+#else
+ throw DataException("DataExpanded::dump: not configured with netCDF. Please contact your installation manager.");
+#endif // USE_NETCDF
+}
+
+void DataExpanded::setTaggedValue(int tagKey,
+ const DataTypes::ShapeType& pointshape,
+ const DataTypes::ValueType& value,
+ int dataOffset)
+{
+ CHECK_FOR_EX_WRITE;
+ const int numSamples = getNumSamples();
+ const int numDataPointsPerSample = getNumDPPSample();
+ const DataTypes::ValueType::size_type n = getNoValues();
+ const double* in = &value[0+dataOffset];
+
+ if (value.size() != n)
+ throw DataException("DataExpanded::setTaggedValue: number of input values does not match number of values per data points.");
+
+#pragma omp parallel for
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ if (getFunctionSpace().getTagFromSampleNo(sampleNo) == tagKey) {
+ for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
+ double* p = &m_data[getPointOffset(sampleNo,dataPointNo)];
+ for (int i=0; i<n; ++i)
+ p[i] = in[i];
}
}
- }
- }
- return errcode;
-}
-
-void
-DataExpanded::setToZero(){
-// TODO: Surely there is a more efficient way to do this????
-// Why is there no memset here? Parallel issues?
-// A: This ensures that memory is touched by the correct thread.
- CHECK_FOR_EX_WRITE
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- DataTypes::ValueType::size_type n = getNoValues();
- double* p;
- int sampleNo,dataPointNo, i;
- #pragma omp parallel for private(sampleNo,dataPointNo,p,i) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- p=&(m_data[getPointOffset(sampleNo,dataPointNo)]);
- for (i=0; i<n ;++i) p[i]=0.;
}
- }
-}
-
-void
-DataExpanded::dump(const std::string fileName) const
-{
- #ifdef USE_NETCDF
- const int ldims=2+DataTypes::maxRank;
- const NcDim* ncdims[ldims];
- NcVar *var, *ids;
- int rank = getRank();
- int type= getFunctionSpace().getTypeCode();
- int ndims =0;
- long dims[ldims];
- const double* d_ptr=&(m_data[0]);
- const DataTypes::ShapeType& shape = getShape();
- int mpi_iam=getFunctionSpace().getDomain()->getMPIRank();
- int mpi_num=getFunctionSpace().getDomain()->getMPISize();
-#ifdef ESYS_MPI
- MPI_Status status;
-#endif
+}
-#ifdef ESYS_MPI
- /* Serialize NetCDF I/O */
- if (mpi_iam>0) MPI_Recv(&ndims, 0, MPI_INT, mpi_iam-1, 81801, MPI_COMM_WORLD, &status);
-#endif
- // netCDF error handler
- NcError err(NcError::verbose_nonfatal);
- // Create the file.
- std::string newFileName(esysUtils::appendRankToFileName(fileName,
- mpi_num, mpi_iam));
- NcFile dataFile(newFileName.c_str(), NcFile::Replace);
- // check if writing was successful
- if (!dataFile.is_valid())
- throw DataException("Error - DataExpanded:: opening of netCDF file for output failed.");
- if (!dataFile.add_att("type_id",2) )
- throw DataException("Error - DataExpanded:: appending data type to netCDF file failed.");
- if (!dataFile.add_att("rank",rank) )
- throw DataException("Error - DataExpanded:: appending rank attribute to netCDF file failed.");
- if (!dataFile.add_att("function_space_type",type))
- throw DataException("Error - DataExpanded:: appending function space attribute to netCDF file failed.");
- ndims=rank+2;
- if ( rank >0 ) {
- dims[0]=shape[0];
- if (! (ncdims[0] = dataFile.add_dim("d0",shape[0])) )
- throw DataException("Error - DataExpanded:: appending ncdimension 0 to netCDF file failed.");
- }
- if ( rank >1 ) {
- dims[1]=shape[1];
- if (! (ncdims[1] = dataFile.add_dim("d1",shape[1])) )
- throw DataException("Error - DataExpanded:: appending ncdimension 1 to netCDF file failed.");
- }
- if ( rank >2 ) {
- dims[2]=shape[2];
- if (! (ncdims[2] = dataFile.add_dim("d2", shape[2])) )
- throw DataException("Error - DataExpanded:: appending ncdimension 2 to netCDF file failed.");
- }
- if ( rank >3 ) {
- dims[3]=shape[3];
- if (! (ncdims[3] = dataFile.add_dim("d3", shape[3])) )
- throw DataException("Error - DataExpanded:: appending ncdimension 3 to netCDF file failed.");
- }
- dims[rank]=getFunctionSpace().getNumDataPointsPerSample();
- if (! (ncdims[rank] = dataFile.add_dim("num_data_points_per_sample", dims[rank])) )
- throw DataException("Error - DataExpanded:: appending num_data_points_per_sample to netCDF file failed.");
- dims[rank+1]=getFunctionSpace().getNumSamples();
- if (! (ncdims[rank+1] = dataFile.add_dim("num_samples", dims[rank+1])) )
- throw DataException("Error - DataExpanded:: appending num_sample to netCDF file failed.");
-
- if (getFunctionSpace().getNumSamples()>0)
- {
-
- if (! ( ids = dataFile.add_var("id", ncInt, ncdims[rank+1])) )
- throw DataException("Error - DataExpanded:: appending reference id to netCDF file failed.");
- const dim_t* ids_p=getFunctionSpace().borrowSampleReferenceIDs();
- if (! (ids->put(ids_p,dims[rank+1])) )
- throw DataException("Error - DataExpanded:: copy reference id to netCDF buffer failed.");
- if (! ( var = dataFile.add_var("data", ncDouble, ndims, ncdims)) )
- throw DataException("Error - DataExpanded:: appending variable to netCDF file failed.");
- if (! (var->put(d_ptr,dims)) )
- throw DataException("Error - DataExpanded:: copy data to netCDF buffer failed.");
- }
-#ifdef ESYS_MPI
- if (mpi_iam<mpi_num-1)
- MPI_Send(&ndims, 0, MPI_INT, mpi_iam+1, 81801, MPI_COMM_WORLD);
-#endif
- #else
- throw DataException("Error - DataExpanded:: dump is not configured with netCDF. Please contact your installation manager.");
- #endif
-}
-
-void
-DataExpanded::setTaggedValue(int tagKey,
- const DataTypes::ShapeType& pointshape,
- const DataTypes::ValueType& value,
- int dataOffset)
-{
- CHECK_FOR_EX_WRITE
- int numSamples = getNumSamples();
- int numDataPointsPerSample = getNumDPPSample();
- int sampleNo,dataPointNo, i;
- DataTypes::ValueType::size_type n = getNoValues();
- double* p;
- const double* in=&value[0+dataOffset];
-
- if (value.size() != n) {
- throw DataException("Error - DataExpanded::setTaggedValue: number of input values does not match number of values per data points.");
- }
-
- #pragma omp parallel for private(sampleNo,dataPointNo,p,i) schedule(static)
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- if (getFunctionSpace().getTagFromSampleNo(sampleNo) == tagKey ) {
- for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
- p=&(m_data[getPointOffset(sampleNo,dataPointNo)]);
- for (i=0; i<n ;++i) p[i]=in[i];
+void DataExpanded::reorderByReferenceIDs(dim_t *reference_ids)
+{
+ CHECK_FOR_EX_WRITE;
+ const int numSamples = getNumSamples();
+ const DataTypes::ValueType::size_type n = getNoValues() * getNumDPPSample();
+ FunctionSpace fs=getFunctionSpace();
+
+ for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
+ const index_t id_in = reference_ids[sampleNo];
+ const index_t id = fs.getReferenceIDOfSample(sampleNo);
+ if (id != id_in) {
+ bool matched=false;
+ for (int sampleNo2 = sampleNo+1; sampleNo2 < numSamples; sampleNo2++) {
+ if (id == reference_ids[sampleNo2]) {
+ double* p = &m_data[getPointOffset(sampleNo,0)];
+ double* p2 = &m_data[getPointOffset(sampleNo2,0)];
+ for (int i=0; i<n; i++) {
+ const double rtmp=p[i];
+ p[i] = p2[i];
+ p2[i] = rtmp;
+ }
+ reference_ids[sampleNo]=id;
+ reference_ids[sampleNo2]=id_in;
+ matched=true;
+ break;
+ }
+ }
+ if (!matched)
+ throw DataException("DataExpanded::reorderByReferenceIDs: unable to reorder sample data by reference ids");
}
}
- }
-}
-
-
-void
-DataExpanded::reorderByReferenceIDs(int *reference_ids)
-{
- CHECK_FOR_EX_WRITE
- int numSamples = getNumSamples();
- DataTypes::ValueType::size_type n = getNoValues() * getNumDPPSample();
- int sampleNo, sampleNo2,i;
- double* p,*p2;
- register double rtmp;
- FunctionSpace fs=getFunctionSpace();
-
- for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
- const int id_in=reference_ids[sampleNo];
- const int id=fs.getReferenceIDOfSample(sampleNo);
- if (id!=id_in) {
- bool matched=false;
- for (sampleNo2 = sampleNo+1; sampleNo2 < numSamples; sampleNo2++) {
- if (id == reference_ids[sampleNo2]) {
- p=&(m_data[getPointOffset(sampleNo,0)]);
- p2=&(m_data[getPointOffset(sampleNo2,0)]);
- for (i=0; i<n ;i++) {
- rtmp=p[i];
- p[i]=p2[i];
- p2[i]=rtmp;
- }
- reference_ids[sampleNo]=id;
- reference_ids[sampleNo2]=id_in;
- matched=true;
- break;
- }
- }
- if (! matched) {
- throw DataException("Error - DataExpanded::reorderByReferenceIDs: unable to reorder sample data by reference ids");
- }
- }
- }
-}
-
-DataTypes::ValueType&
-DataExpanded::getVectorRW()
-{
- CHECK_FOR_EX_WRITE
- return m_data.getData();
-}
-
-const DataTypes::ValueType&
-DataExpanded::getVectorRO() const
-{
- return m_data.getData();
-}
-
-// void DataExpanded::randomFill(long seed) {
-// CHECK_FOR_EX_WRITE
-//
-// DataVector& dv=getVectorRW();
-// const size_t dvsize=dv.size();
-//
-// esysUtils::randomFillArray(seed, &(dv[0]), dvsize);
-//
-// }
+}
+
+DataTypes::ValueType& DataExpanded::getVectorRW()
+{
+ CHECK_FOR_EX_WRITE;
+ return m_data.getData();
+}
+
+const DataTypes::ValueType& DataExpanded::getVectorRO() const
+{
+ return m_data.getData();
+}
+
+//void DataExpanded::randomFill(long seed)
+//{
+// CHECK_FOR_EX_WRITE;
+//
+// DataVector& dv=getVectorRW();
+// const size_t dvsize=dv.size();
+// esysUtils::randomFillArray(seed, &(dv[0]), dvsize);
+//}
} // end of namespace
+
diff --git a/escriptcore/src/DataExpanded.h b/escriptcore/src/DataExpanded.h
index ff6bf26..ef10a2f 100644
--- a/escriptcore/src/DataExpanded.h
+++ b/escriptcore/src/DataExpanded.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -388,7 +388,7 @@ TODO Note that this constructor will also copy data to all points if it only con
*/
ESCRIPT_DLL_API
virtual void
- reorderByReferenceIDs(int *reference_ids);
+ reorderByReferenceIDs(dim_t *reference_ids);
protected:
diff --git a/escriptcore/src/DataFactory.cpp b/escriptcore/src/DataFactory.cpp
index 027f8e9..bce295d 100644
--- a/escriptcore/src/DataFactory.cpp
+++ b/escriptcore/src/DataFactory.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataFactory.h b/escriptcore/src/DataFactory.h
index 7175887..dfce6df 100644
--- a/escriptcore/src/DataFactory.h
+++ b/escriptcore/src/DataFactory.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataLazy.cpp b/escriptcore/src/DataLazy.cpp
index d2bea59..794dbc7 100644
--- a/escriptcore/src/DataLazy.cpp
+++ b/escriptcore/src/DataLazy.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataLazy.h b/escriptcore/src/DataLazy.h
index e121cb9..e9270e6 100644
--- a/escriptcore/src/DataLazy.h
+++ b/escriptcore/src/DataLazy.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataMaths.cpp b/escriptcore/src/DataMaths.cpp
index b3fc07a..ea084a6 100644
--- a/escriptcore/src/DataMaths.cpp
+++ b/escriptcore/src/DataMaths.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataMaths.h b/escriptcore/src/DataMaths.h
index 8a6aeaf..e356ed8 100644
--- a/escriptcore/src/DataMaths.h
+++ b/escriptcore/src/DataMaths.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataReady.cpp b/escriptcore/src/DataReady.cpp
index 8d6e297..efbb1d8 100644
--- a/escriptcore/src/DataReady.cpp
+++ b/escriptcore/src/DataReady.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataReady.h b/escriptcore/src/DataReady.h
index 9cb81be..ca4fd3f 100644
--- a/escriptcore/src/DataReady.h
+++ b/escriptcore/src/DataReady.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataTagged.cpp b/escriptcore/src/DataTagged.cpp
index 1aff038..622510c 100644
--- a/escriptcore/src/DataTagged.cpp
+++ b/escriptcore/src/DataTagged.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataTagged.h b/escriptcore/src/DataTagged.h
index 22264c2..a0bcd72 100644
--- a/escriptcore/src/DataTagged.h
+++ b/escriptcore/src/DataTagged.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataTypes.cpp b/escriptcore/src/DataTypes.cpp
index ebc4fb9..bf525f9 100644
--- a/escriptcore/src/DataTypes.cpp
+++ b/escriptcore/src/DataTypes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataTypes.h b/escriptcore/src/DataTypes.h
index 6b5db83..8f537cd 100644
--- a/escriptcore/src/DataTypes.h
+++ b/escriptcore/src/DataTypes.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataVector.cpp b/escriptcore/src/DataVector.cpp
index 406a714..b9bbbb1 100644
--- a/escriptcore/src/DataVector.cpp
+++ b/escriptcore/src/DataVector.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DataVector.h b/escriptcore/src/DataVector.h
index e4f13d8..9488b16 100644
--- a/escriptcore/src/DataVector.h
+++ b/escriptcore/src/DataVector.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Dodgy.cpp b/escriptcore/src/Dodgy.cpp
index c77eab9..ad73f84 100644
--- a/escriptcore/src/Dodgy.cpp
+++ b/escriptcore/src/Dodgy.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2009-2015 by The University of Queensland
+* Copyright (c) 2009-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Dodgy.h b/escriptcore/src/Dodgy.h
index fcdd374..4a55d74 100644
--- a/escriptcore/src/Dodgy.h
+++ b/escriptcore/src/Dodgy.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2009-2015 by The University of Queensland
+* Copyright (c) 2009-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DomainException.cpp b/escriptcore/src/DomainException.cpp
index 633012c..8c7b659 100644
--- a/escriptcore/src/DomainException.cpp
+++ b/escriptcore/src/DomainException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/DomainException.h b/escriptcore/src/DomainException.h
index b9687e0..1a8e443 100644
--- a/escriptcore/src/DomainException.h
+++ b/escriptcore/src/DomainException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/EscriptParams.cpp b/escriptcore/src/EscriptParams.cpp
index ccd1843..398b449 100644
--- a/escriptcore/src/EscriptParams.cpp
+++ b/escriptcore/src/EscriptParams.cpp
@@ -2,12 +2,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/EscriptParams.h b/escriptcore/src/EscriptParams.h
index 6c490d5..8205af8 100644
--- a/escriptcore/src/EscriptParams.h
+++ b/escriptcore/src/EscriptParams.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/FunctionSpace.cpp b/escriptcore/src/FunctionSpace.cpp
index 48d35ce..27a2055 100644
--- a/escriptcore/src/FunctionSpace.cpp
+++ b/escriptcore/src/FunctionSpace.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/FunctionSpace.h b/escriptcore/src/FunctionSpace.h
index 1c94d63..d101d76 100644
--- a/escriptcore/src/FunctionSpace.h
+++ b/escriptcore/src/FunctionSpace.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/FunctionSpaceException.cpp b/escriptcore/src/FunctionSpaceException.cpp
index d741d59..820aba0 100644
--- a/escriptcore/src/FunctionSpaceException.cpp
+++ b/escriptcore/src/FunctionSpaceException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/FunctionSpaceException.h b/escriptcore/src/FunctionSpaceException.h
index 6ab4f20..fa94c25 100644
--- a/escriptcore/src/FunctionSpaceException.h
+++ b/escriptcore/src/FunctionSpaceException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/FunctionSpaceFactory.cpp b/escriptcore/src/FunctionSpaceFactory.cpp
index e959a81..4d25618 100644
--- a/escriptcore/src/FunctionSpaceFactory.cpp
+++ b/escriptcore/src/FunctionSpaceFactory.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/FunctionSpaceFactory.h b/escriptcore/src/FunctionSpaceFactory.h
index d6b9487..e876b21 100644
--- a/escriptcore/src/FunctionSpaceFactory.h
+++ b/escriptcore/src/FunctionSpaceFactory.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/LapackInverseHelper.cpp b/escriptcore/src/LapackInverseHelper.cpp
index 6f961c8..8915da4 100644
--- a/escriptcore/src/LapackInverseHelper.cpp
+++ b/escriptcore/src/LapackInverseHelper.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2009-2015 by The University of Queensland
+* Copyright (c) 2009-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/LapackInverseHelper.h b/escriptcore/src/LapackInverseHelper.h
index 95c4161..03cdab2 100644
--- a/escriptcore/src/LapackInverseHelper.h
+++ b/escriptcore/src/LapackInverseHelper.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2009-2015 by The University of Queensland
+* Copyright (c) 2009-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/LocalOps.h b/escriptcore/src/LocalOps.h
index 3a871cd..1d9400d 100644
--- a/escriptcore/src/LocalOps.h
+++ b/escriptcore/src/LocalOps.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/MPIDataReducer.cpp b/escriptcore/src/MPIDataReducer.cpp
index adc8d66..73f8f5b 100644
--- a/escriptcore/src/MPIDataReducer.cpp
+++ b/escriptcore/src/MPIDataReducer.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/MPIDataReducer.h b/escriptcore/src/MPIDataReducer.h
index d19dc39..5c9f72e 100644
--- a/escriptcore/src/MPIDataReducer.h
+++ b/escriptcore/src/MPIDataReducer.h
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/MPIScalarReducer.cpp b/escriptcore/src/MPIScalarReducer.cpp
index 0456dfe..40b1b9b 100644
--- a/escriptcore/src/MPIScalarReducer.cpp
+++ b/escriptcore/src/MPIScalarReducer.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/MPIScalarReducer.h b/escriptcore/src/MPIScalarReducer.h
index 3e5f315..b722306 100644
--- a/escriptcore/src/MPIScalarReducer.h
+++ b/escriptcore/src/MPIScalarReducer.h
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/NonReducedVariable.cpp b/escriptcore/src/NonReducedVariable.cpp
index b71cffe..6bf8a76 100644
--- a/escriptcore/src/NonReducedVariable.cpp
+++ b/escriptcore/src/NonReducedVariable.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2015 by The University of Queensland
+* Copyright (c) 2015-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/NonReducedVariable.h b/escriptcore/src/NonReducedVariable.h
index 6281c8f..fd793d8 100644
--- a/escriptcore/src/NonReducedVariable.h
+++ b/escriptcore/src/NonReducedVariable.h
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -24,7 +24,7 @@ namespace escript
{
// plugs into the import/export mechanism but stays on the
-// subworld it was created by (no actual reduction takes place
+// subworld it was created by (no actual reduction takes place)
class NonReducedVariable : public AbstractReducer
{
public:
diff --git a/escriptcore/src/NullDomain.cpp b/escriptcore/src/NullDomain.cpp
index 5809538..2b45ae6 100644
--- a/escriptcore/src/NullDomain.cpp
+++ b/escriptcore/src/NullDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/NullDomain.h b/escriptcore/src/NullDomain.h
index f7e9b9c..c231efa 100644
--- a/escriptcore/src/NullDomain.h
+++ b/escriptcore/src/NullDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Pointers.h b/escriptcore/src/Pointers.h
index 3060506..85ed308 100644
--- a/escriptcore/src/Pointers.h
+++ b/escriptcore/src/Pointers.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SConscript b/escriptcore/src/SConscript
index 6e1faca..61f4c4b 100644
--- a/escriptcore/src/SConscript
+++ b/escriptcore/src/SConscript
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SolverOptions.cpp b/escriptcore/src/SolverOptions.cpp
index 87a9848..dd1dd3b 100644
--- a/escriptcore/src/SolverOptions.cpp
+++ b/escriptcore/src/SolverOptions.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SolverOptions.h b/escriptcore/src/SolverOptions.h
index c8975c5..46e049e 100644
--- a/escriptcore/src/SolverOptions.h
+++ b/escriptcore/src/SolverOptions.h
@@ -1,12 +1,12 @@
/******************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SolverOptionsException.cpp b/escriptcore/src/SolverOptionsException.cpp
index 9928eb1..ca54343 100644
--- a/escriptcore/src/SolverOptionsException.cpp
+++ b/escriptcore/src/SolverOptionsException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SolverOptionsException.h b/escriptcore/src/SolverOptionsException.h
index cdb28a5..291d09b 100644
--- a/escriptcore/src/SolverOptionsException.h
+++ b/escriptcore/src/SolverOptionsException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SplitWorld.cpp b/escriptcore/src/SplitWorld.cpp
index 26a59d0..c54b8e9 100644
--- a/escriptcore/src/SplitWorld.cpp
+++ b/escriptcore/src/SplitWorld.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -38,6 +38,14 @@ double SplitWorld::getScalarVariable(const std::string& name)
return localworld->getScalarVariable(name);
}
+boost::python::object SplitWorld::getLocalObjectVariable(const std::string& name)
+{
+ // do we have a variable of that name?
+ return localworld->getLocalObjectVariable(name);
+}
+
+
+
SplitWorld::SplitWorld(unsigned int numgroups, MPI_Comm global)
:localworld((SubWorld*)0), swcount(numgroups>0?numgroups:1), jobcounter(1), manualimport(false)
{
@@ -325,6 +333,23 @@ boost::python::object SplitWorld::getVarPyList()
return l;
}
+// We make no committments that the format of the output will remain the same
+boost::python::object SplitWorld::getVarPyInfo()
+{
+ std::list<std::pair<std::string, std::string> > r=localworld->getVarInfo();
+ boost::python::list l;
+ for (std::list<std::pair<std::string, std::string> >::iterator it=r.begin();it!=r.end();++it)
+ {
+ boost::python::list t;
+ t.append(it->first);
+ t.append(it->second);
+ l.append(t);
+ }
+ return l;
+}
+
+
+
void SplitWorld::clearAllJobs()
{
clearPendingJobs();
diff --git a/escriptcore/src/SplitWorld.h b/escriptcore/src/SplitWorld.h
index c0317e3..59b1792 100644
--- a/escriptcore/src/SplitWorld.h
+++ b/escriptcore/src/SplitWorld.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -50,10 +50,12 @@ public:
void clearVariable(std::string name);
std::list<std::pair<std::string, bool> > getVarList();
boost::python::object getVarPyList();
+ boost::python::object getVarPyInfo();
void clearAllJobs();
double getScalarVariable(const std::string& name);
+ boost::python::object getLocalObjectVariable(const std::string& name);
int getSubWorldCount();
int getSubWorldID();
diff --git a/escriptcore/src/SplitWorldException.cpp b/escriptcore/src/SplitWorldException.cpp
index c38fefc..0986f1b 100644
--- a/escriptcore/src/SplitWorldException.cpp
+++ b/escriptcore/src/SplitWorldException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SplitWorldException.h b/escriptcore/src/SplitWorldException.h
index 17785e5..7708f60 100644
--- a/escriptcore/src/SplitWorldException.h
+++ b/escriptcore/src/SplitWorldException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SubWorld.cpp b/escriptcore/src/SubWorld.cpp
index b6b138f..4af3c03 100644
--- a/escriptcore/src/SubWorld.cpp
+++ b/escriptcore/src/SubWorld.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -382,6 +382,47 @@ double SubWorld::getScalarVariable(const std::string& name)
throw SplitWorldException("Variable is not scalar.");
}
+
+// not to be called while running jobs
+// The tricky bit, is that this could be be called between job runs
+// this means that the values of variables may not have been synched yet
+boost::python::object SubWorld::getLocalObjectVariable(const std::string& name)
+{
+ str2reduce::iterator it=reducemap.find(name);
+ if (it==reducemap.end())
+ {
+ throw SplitWorldException("No variable of that name.");
+ }
+ // need to indicate we are interested in the variable
+ if (varstate[name]==rs::NONE)
+ {
+ setMyVarState(name, rs::INTERESTED);
+ }
+ else if (varstate[name]==rs::OLD)
+ {
+ setMyVarState(name, rs::OLDINTERESTED);
+ }
+ // anything else, indicates interest anyway
+#ifdef ESYS_MPI
+ std::string errmsg;
+ if (!synchVariableInfo(errmsg))
+ {
+ throw SplitWorldException(std::string("(Getting local object --- Variable information) ")+errmsg);
+ }
+ if (!synchVariableValues(errmsg))
+ {
+ throw SplitWorldException(std::string("(Getting local object --- Variable value) ")+errmsg);
+ }
+#endif
+ if (dynamic_cast<NonReducedVariable*>(it->second.get()))
+ {
+ return dynamic_cast<NonReducedVariable*>(it->second.get())->getPyObj();
+ }
+ throw SplitWorldException("Variable is not a local object.");
+}
+
+
+
bool SubWorld::checkRemoteCompatibility(std::string& errmsg)
{
for (str2reduce::iterator it=reducemap.begin();it!=reducemap.end();++it)
@@ -1040,6 +1081,22 @@ std::list<std::pair<std::string, bool> > SubWorld::getVarList()
return res;
}
+std::list<std::pair<std::string, std::string> > SubWorld::getVarInfo()
+{
+ std::list<std::pair<std::string,std::string> > res;
+ for (std::map<std::string, Reducer_ptr>::iterator it=reducemap.begin();it!=reducemap.end();++it)
+ {
+ std::string desc=it->second->description();
+ if (!it->second->hasValue())
+ {
+ desc+=" (No value)";
+ }
+ res.push_back(std::pair<std::string, std::string>(it->first, desc));
+ }
+ return res;
+}
+
+
void SubWorld::copyVariable(const std::string& src, const std::string& dest)
{
if (reducemap.find(src)==reducemap.end())
diff --git a/escriptcore/src/SubWorld.h b/escriptcore/src/SubWorld.h
index 5ce86c4..231a516 100644
--- a/escriptcore/src/SubWorld.h
+++ b/escriptcore/src/SubWorld.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -61,6 +61,7 @@ public:
void removeVariable(std::string& name);
void clearVariable(std::string& name);
std::list<std::pair<std::string, bool> > getVarList();
+ std::list<std::pair<std::string, std::string> > getVarInfo();
size_t getNumVars();
bool localTransport(std::string& errmsg); // gather exported values from jobs
@@ -71,6 +72,7 @@ public:
bool amLeader(); // true if this proc is the leader for its world
double getScalarVariable(const std::string& name);
+ boost::python::object getLocalObjectVariable(const std::string& name);
void debug(); // print out current state information
diff --git a/escriptcore/src/SystemMatrixException.cpp b/escriptcore/src/SystemMatrixException.cpp
index dfd3d06..1ed2c51 100644
--- a/escriptcore/src/SystemMatrixException.cpp
+++ b/escriptcore/src/SystemMatrixException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/SystemMatrixException.h b/escriptcore/src/SystemMatrixException.h
index ae1339c..6050864 100644
--- a/escriptcore/src/SystemMatrixException.h
+++ b/escriptcore/src/SystemMatrixException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Taipan.cpp b/escriptcore/src/Taipan.cpp
index 4b43dce..52d1b29 100644
--- a/escriptcore/src/Taipan.cpp
+++ b/escriptcore/src/Taipan.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Taipan.h b/escriptcore/src/Taipan.h
index 55f38e5..fca9b8a 100644
--- a/escriptcore/src/Taipan.h
+++ b/escriptcore/src/Taipan.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/TestDomain.cpp b/escriptcore/src/TestDomain.cpp
index 1f43a57..c3cc4cb 100644
--- a/escriptcore/src/TestDomain.cpp
+++ b/escriptcore/src/TestDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/TestDomain.h b/escriptcore/src/TestDomain.h
index 8f3472b..80cbdd3 100644
--- a/escriptcore/src/TestDomain.h
+++ b/escriptcore/src/TestDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/TransportProblemException.cpp b/escriptcore/src/TransportProblemException.cpp
index 60b5b58..3911cd1 100644
--- a/escriptcore/src/TransportProblemException.cpp
+++ b/escriptcore/src/TransportProblemException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/TransportProblemException.h b/escriptcore/src/TransportProblemException.h
index 1cdd077..4123860 100644
--- a/escriptcore/src/TransportProblemException.h
+++ b/escriptcore/src/TransportProblemException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/UnaryFuncs.h b/escriptcore/src/UnaryFuncs.h
index 1e2505f..002b824 100644
--- a/escriptcore/src/UnaryFuncs.h
+++ b/escriptcore/src/UnaryFuncs.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/UnaryOp.h b/escriptcore/src/UnaryOp.h
index 78de32b..825f2bf 100644
--- a/escriptcore/src/UnaryOp.h
+++ b/escriptcore/src/UnaryOp.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/UtilC.h b/escriptcore/src/UtilC.h
index c19d388..5e1b707 100644
--- a/escriptcore/src/UtilC.h
+++ b/escriptcore/src/UtilC.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/Utils.cpp b/escriptcore/src/Utils.cpp
index 0f59cc9..58e0f40 100644
--- a/escriptcore/src/Utils.cpp
+++ b/escriptcore/src/Utils.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -18,155 +18,151 @@
#include "esysUtils/first.h"
#ifndef OVERLORDPATH
- #define OVERLORDPATH ""
+#define OVERLORDPATH ""
#endif
-#include <fstream>
-#include <string.h>
-
-// added for saveCSV
-#include <boost/python.hpp>
-#include <boost/scoped_array.hpp>
#include "Data.h"
-
-#include "Utils.h"
#include "DataVector.h"
+#include "Utils.h"
+
+#include <esysUtils/Esys_MPI.h>
+#include <esysUtils/esysFileWriter.h>
#ifdef _OPENMP
#include <omp.h>
#endif
-#ifdef ESYS_MPI
-#include <mpi.h>
-#endif
-
-#ifdef _WIN32
-#include <WinSock2.h>
-#else
+#include <cstring>
+#include <fstream>
#include <unistd.h>
-#endif
+
+#include <boost/python.hpp>
+#include <boost/scoped_array.hpp>
+
+namespace bp = boost::python;
+using esysUtils::FileWriter;
namespace escript {
-int getSvnVersion()
+int getSvnVersion()
{
#ifdef SVN_VERSION
- return SVN_VERSION;
+ return SVN_VERSION;
#else
- return 0;
+ return 0;
#endif
}
-/* This is probably not very robust, but it works on Savanna today and is useful for performance analysis */
-int get_core_id() {
- int processor_num=-1;
+// This is probably not very robust, but it works on Savanna today and is
+// useful for performance analysis
+int get_core_id()
+{
+ int processor_num=-1;
#ifdef CORE_ID1
- FILE *fp;
- int i, count_spaces=0;
- char fname[100];
- char buf[1000];
-
- sprintf(fname, "/proc/%d/stat", getpid());
- fp = fopen(fname, "r");
- if (fp == NULL) return(-1);
- fgets(buf, 1000, fp);
- fclose(fp);
-
- for (i=strlen(buf)-1; i>=0; i--) {
- if (buf[i] == ' ') count_spaces++;
- if (count_spaces == 4) break;
- }
- processor_num = atoi(&buf[i+1]);
+ FILE *fp;
+ int i, count_spaces=0;
+ char fname[100];
+ char buf[1000];
+
+ sprintf(fname, "/proc/%d/stat", getpid());
+ fp = fopen(fname, "r");
+ if (fp == NULL) return(-1);
+ fgets(buf, 1000, fp);
+ fclose(fp);
+
+ for (i=strlen(buf)-1; i>=0; i--) {
+ if (buf[i] == ' ') count_spaces++;
+ if (count_spaces == 4) break;
+ }
+ processor_num = atoi(&buf[i+1]);
#endif
- return(processor_num);
+ return processor_num;
}
-
-void printParallelThreadCnt()
+void setNumberOfThreads(int num_threads)
{
- int mpi_iam=0, mpi_num=1;
- char hname[64];
+#ifdef _OPENMP
+ omp_set_num_threads(num_threads);
+#endif
+}
-#ifdef HAVE_GETHOSTNAME
- gethostname(hname, 64);
- hname[63] = '\0';
+int getNumberOfThreads()
+{
+#ifdef _OPENMP
+ return omp_get_max_threads();
#else
- strcpy(hname, "unknown host");
+ return 1;
#endif
-
- #ifdef ESYS_MPI
- MPI_Comm_rank(MPI_COMM_WORLD, &mpi_iam);
- MPI_Comm_size(MPI_COMM_WORLD, &mpi_num);
- #endif
-
- #pragma omp parallel
- {
- int omp_iam=0, omp_num=1;
- #ifdef _OPENMP
- omp_iam = omp_get_thread_num(); /* Call in a parallel region */
- omp_num = omp_get_num_threads();
- #endif
- #pragma omp critical (printthrdcount)
- printf("printParallelThreadCounts: MPI=%03d/%03d OpenMP=%03d/%03d running on %s core %d\n",
- mpi_iam, mpi_num, omp_iam, omp_num, hname, get_core_id());
- }
}
-void setNumberOfThreads(const int num_threads)
+int getMPISizeWorld()
{
-
- #ifdef _OPENMP
- omp_set_num_threads(num_threads);
- #endif
-
+ int mpi_num = 1;
+#ifdef ESYS_MPI
+ MPI_Comm_size(MPI_COMM_WORLD, &mpi_num);
+#endif
+ return mpi_num;
}
-int getNumberOfThreads()
+int getMPIRankWorld()
{
- #ifdef _OPENMP
- return omp_get_max_threads();
- #else
- return 1;
- #endif
-
+ int mpi_iam = 0;
+#ifdef ESYS_MPI
+ MPI_Comm_rank(MPI_COMM_WORLD, &mpi_iam);
+#endif
+ return mpi_iam;
}
-ESCRIPT_DLL_API int getMPISizeWorld() {
- int mpi_num = 1;
- #ifdef ESYS_MPI
- MPI_Comm_size(MPI_COMM_WORLD, &mpi_num);
- #endif
- return mpi_num;
+int getMPIWorldMax(int val)
+{
+#ifdef ESYS_MPI
+ int val2 = val;
+ int out = val;
+ MPI_Allreduce(&val2, &out, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);
+#else
+ int out = val;
+#endif
+ return out;
}
-ESCRIPT_DLL_API int getMPIRankWorld() {
- int mpi_iam = 0;
- #ifdef ESYS_MPI
- MPI_Comm_rank(MPI_COMM_WORLD, &mpi_iam);
- #endif
- return mpi_iam;
+int getMPIWorldSum(int val)
+{
+#ifdef ESYS_MPI
+ int val2 = val;
+ int out = 0;
+ MPI_Allreduce(&val2, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
+#else
+ int out = val;
+#endif
+ return out;
}
-ESCRIPT_DLL_API int getMPIWorldMax(const int val) {
- #ifdef ESYS_MPI
- int val2 = val;
- int out = val;
- MPI_Allreduce( &val2, &out, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD );
- #else
- int out = val;
- #endif
- return out;
-}
+void printParallelThreadCnt()
+{
+ char hname[64];
+
+#ifdef HAVE_GETHOSTNAME
+ gethostname(hname, 64);
+ hname[63] = '\0';
+#else
+ strcpy(hname, "unknown host");
+#endif
-ESCRIPT_DLL_API int getMPIWorldSum(const int val) {
- #ifdef ESYS_MPI
- int val2 = val;
- int out = 0;
- MPI_Allreduce( &val2, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD );
- #else
- int out = val;
- #endif
- return out;
+ const int mpi_num = getMPISizeWorld();
+ const int mpi_iam = getMPIRankWorld();
+
+#pragma omp parallel
+ {
+ int omp_iam=0, omp_num=1;
+#ifdef _OPENMP
+ omp_iam = omp_get_thread_num();
+ omp_num = omp_get_num_threads();
+#endif
+#pragma omp critical (printthrdcount)
+ printf("printParallelThreadCounts: MPI=%03d/%03d OpenMP=%03d/%03d "
+ "running on %s core %d\n", mpi_iam, mpi_num, omp_iam, omp_num,
+ hname, get_core_id());
+ }
}
#define CHILD_FAIL 2
@@ -178,7 +174,8 @@ ESCRIPT_DLL_API int getMPIWorldSum(const int val) {
#include <sys/select.h>
#include <errno.h>
#include <arpa/inet.h>
-int prepareSocket(unsigned short *port, int *key) {
+int prepareSocket(unsigned short *port, int *key)
+{
if (getMPIRankWorld() != 0)
return 0;
int sfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -209,7 +206,7 @@ int prepareSocket(unsigned short *port, int *key) {
close(sfd);
return -1;
}
-
+
struct sockaddr actual;
unsigned int size = sizeof(actual);
if (getsockname(sfd, &actual, &size) < 0) {
@@ -217,9 +214,9 @@ int prepareSocket(unsigned short *port, int *key) {
close(sfd);
return -1;
}
-
+
//if size > sizeof(actual), some info was truncated, but certainly not port
-
+
*port = ntohs(((struct sockaddr_in *) &actual)->sin_port);
unsigned int seed = time(NULL) % UINT_MAX;
@@ -227,7 +224,8 @@ int prepareSocket(unsigned short *port, int *key) {
return sfd;
}
-int check_data(unsigned int max, fd_set *all, fd_set *valid, int key, int sfd) {
+int check_data(unsigned int max, fd_set *all, fd_set *valid, int key, int sfd)
+{
int ret = 0;
for (int i = 0; i <= max; i++) {
if (i == sfd)
@@ -257,18 +255,21 @@ int check_data(unsigned int max, fd_set *all, fd_set *valid, int key, int sfd) {
return ret;
}
-void close_all(unsigned int maxfd, fd_set *all) {
+void close_all(unsigned int maxfd, fd_set *all)
+{
for (int i = 0; i <= maxfd; i++) {
if (FD_ISSET(i, all))
close(i);
}
}
-int waitForCompletion(int sfd, int key) {
+
+int waitForCompletion(int sfd, int key)
+{
if (getMPIRankWorld() != 0)
return 0;
int timeout = 10; //max of 10 seconds with no communication
-
- fd_set all, valid;
+
+ fd_set all, valid;
FD_ZERO(&all);
FD_SET(sfd, &all);
time_t last_good_time = time(NULL);
@@ -310,19 +311,20 @@ int waitForCompletion(int sfd, int key) {
#endif //ESYS_MPI
#endif //not _WIN32
-ESCRIPT_DLL_API int runMPIProgram(boost::python::list args) {
+int runMPIProgram(bp::list args)
+{
#ifdef ESYS_MPI
MPI_Comm intercomm;
MPI_Info info;
int errors;
- int nargs = boost::python::extract<int>(args.attr("__len__")());
- std::string cmd = boost::python::extract<std::string>(args[0]);
+ int nargs = bp::extract<int>(args.attr("__len__")());
+ std::string cmd = bp::extract<std::string>(args[0]);
#ifdef _WIN32
char** c_args = new char*[nargs];
char* c_cmd = const_cast<char*>(cmd.c_str());;
// skip command name in argument list
for (int i=1; i<nargs; i++) {
- cpp_args[i-1]=boost::python::extract<std::string>(args[i]);
+ cpp_args[i-1]=bp::extract<std::string>(args[i]);
c_args[i-1]=const_cast<char*>(cpp_args[i-1].c_str());
}
MPI_Info_create(&info);
@@ -331,30 +333,30 @@ ESCRIPT_DLL_API int runMPIProgram(boost::python::list args) {
delete[] c_args;
return errors;
-#else //#ifdef _WIN32
+#else // not _WIN32
char** c_args = new char*[2+nargs];
std::vector<std::string> cpp_args(2+nargs);//allow for wrapper, port, and key
char c_cmd[] = OVERLORDPATH"escript-overlord";
// skip command name in argument list
for (int i=1; i<nargs; i++) {
- cpp_args[i+1]=boost::python::extract<std::string>(args[i]);
- c_args[i+1]=const_cast<char*>(cpp_args[i+1].c_str());
+ cpp_args[i+1] = bp::extract<std::string>(args[i]);
+ c_args[i+1] = const_cast<char*>(cpp_args[i+1].c_str());
}
unsigned short port = 0;
int key = 0;
int sock = prepareSocket(&port, &key);
if (getMPIWorldSum(sock) < 0)
return -1;
- c_args[nargs+1]=NULL;
+ c_args[nargs+1] = NULL;
char portstr[20] = {'\0'}, keystr[20] = {'\0'};
sprintf(portstr, "%d", port);
sprintf(keystr, "%d", key);
c_args[0] = portstr;
c_args[1] = keystr;
c_args[2] = const_cast<char*>(cmd.c_str());
-
+
MPI_Info_create(&info);
- //force the gmsh process to run on this host as well for network comm
+ // force the gmsh process to run on this host as well for network comm
char hostname[MPI_MAX_PROCESSOR_NAME];
int temp = MPI_MAX_PROCESSOR_NAME;
MPI_Get_processor_name(hostname, &temp);
@@ -369,9 +371,9 @@ ESCRIPT_DLL_API int runMPIProgram(boost::python::list args) {
#endif //#ifdef _WIN32/else
#else //#ifdef ESYS_MPI
std::string cmd;
- int nargs = boost::python::extract<int>(args.attr("__len__")());
+ int nargs = bp::extract<int>(args.attr("__len__")());
for (int i=0; i<nargs; i++) {
- cmd+=boost::python::extract<std::string>(args[i]);
+ cmd+=bp::extract<std::string>(args[i]);
cmd+=" ";
}
return system(cmd.c_str());
@@ -380,411 +382,296 @@ ESCRIPT_DLL_API int runMPIProgram(boost::python::list args) {
#undef CHILD_COMPLETE
#undef CHILD_FAIL
-ESCRIPT_DLL_API double getMachinePrecision() {
- return DBL_EPSILON;
-}
-ESCRIPT_DLL_API double getMaxFloat() {
- return DBL_MAX;
+double getMachinePrecision()
+{
+ return DBL_EPSILON;
}
-ESCRIPT_DLL_API void MPIBarrierWorld() {
- #ifdef ESYS_MPI
- if (!esysUtils::NoCOMM_WORLD::active())
- {
- MPI_Barrier(MPI_COMM_WORLD );
- }
- else
- {
- throw esysUtils::EsysException("Attempt to use MPI_COMM_WORLD while it is blocked.");
- }
- #endif
+
+double getMaxFloat()
+{
+ return DBL_MAX;
}
+void MPIBarrierWorld()
+{
+#ifdef ESYS_MPI
+ if (!esysUtils::NoCOMM_WORLD::active()) {
+ MPI_Barrier(MPI_COMM_WORLD );
+ } else {
+ throw esysUtils::EsysException("Attempt to use MPI_COMM_WORLD while it is blocked.");
+ }
+#endif
+}
-ESCRIPT_DLL_API
-void
-saveDataCSV(const std::string& filename, boost::python::dict arg, const std::string& sep, const std::string& csep,
-bool append)
+void saveDataCSV(const std::string& filename, bp::dict arg,
+ const std::string& sep, const std::string& csep, bool append)
{
- using std::cout;
- using std::endl;
- boost::python::list keys=arg.keys();
- int numdata = boost::python::extract<int>(arg.attr("__len__")());
- bool hasmask=arg.has_key("mask");
+ bp::list keys = arg.keys();
+ int numdata = bp::extract<int>(arg.attr("__len__")());
+ bool hasmask = arg.has_key("mask");
Data mask;
- if (hasmask)
- {
- mask=boost::python::extract<escript::Data>(arg["mask"]);
- keys.remove("mask");
- numdata--;
- if (mask.getDataPointRank()!=0)
- {
- throw DataException("saveDataCSVcpp: masks must be scalar.");
- }
+ if (hasmask) {
+ mask = bp::extract<escript::Data>(arg["mask"]);
+ if (mask.getDataPointRank() != 0) {
+ throw DataException("saveDataCSV: mask must be scalar.");
+ }
+ keys.remove("mask");
+ numdata--;
}
- if (numdata<1)
- {
- throw DataException("saveDataCSVcpp: no data to save specified.");
+ if (numdata < 1) {
+ throw DataException("saveDataCSV: no data to save specified.");
}
std::vector<int> step(numdata);
std::vector<std::string> names(numdata);
std::vector<Data> data(numdata);
- std::vector<const DataAbstract::ValueType::value_type*> samples(numdata);
- std::vector<int> offset(numdata);
- std::vector<int> fstypes(numdata); // FunctionSpace types for each data
-
- keys.sort(); // to get some predictable order to things
-
- // We need to interpret the samples correctly even if they are different types
- // for this reason, we should iterate over samples
- for (int i=0;i<numdata;++i)
- {
- names[i]=boost::python::extract<std::string>(keys[i]);
- data[i]=boost::python::extract<escript::Data>(arg[keys[i]]);
- step[i]=(data[i].actsExpanded()?DataTypes::noValues(data[i].getDataPointShape()):0);
- fstypes[i]=data[i].getFunctionSpace().getTypeCode();
- if (i>0)
- {
- if (data[i].getDomain()!=data[i-1].getDomain())
- {
- throw DataException("saveDataCSVcpp: all data must be on the same domain.");
- }
- }
+ // FunctionSpace types for each data for interpolation
+ std::vector<int> fstypes(numdata+int(hasmask));
+
+ keys.sort(); // to get some predictable order to things
+
+ // We need to interpret the samples correctly even if they are different
+ // types. For this reason, we should iterate over samples...
+ for (int i=0; i<numdata; ++i) {
+ names[i] = bp::extract<std::string>(keys[i]);
+ data[i] = bp::extract<escript::Data>(arg[keys[i]]);
+ step[i] = (data[i].actsExpanded() ? DataTypes::noValues(data[i].getDataPointShape()) : 0);
+ fstypes[i] = data[i].getFunctionSpace().getTypeCode();
+ if (i > 0) {
+ if (data[i].getDomain()!=data[i-1].getDomain()) {
+ throw DataException("saveDataCSV: all data must be on the same domain.");
+ }
+ }
}
- int bestfnspace=0;
- if (!data[0].getDomain()->commonFunctionSpace(fstypes, bestfnspace))
- {
- throw DataException("saveDataCSVcpp: FunctionSpaces of data are incompatible");
+ if (hasmask) {
+ if (mask.getDomain() != data[0].getDomain())
+ throw DataException("saveDataCSV: mask domain must be the same as the data domain.");
+ fstypes[numdata] = mask.getFunctionSpace().getTypeCode();
+ }
+
+ int bestfnspace = 0;
+ if (!data[0].getDomain()->commonFunctionSpace(fstypes, bestfnspace)) {
+ throw DataException("saveDataCSV: FunctionSpaces of data are incompatible");
}
// now we interpolate all data to the same type
- FunctionSpace best(data[0].getDomain(),bestfnspace);
- for (int i=0;i<numdata;++i)
- {
- data[i]=data[i].interpolate(best);
+ FunctionSpace best(data[0].getDomain(), bestfnspace);
+ for (int i=0; i<numdata; ++i) {
+ data[i] = data[i].interpolate(best);
}
- int numsamples=data[0].getNumSamples(); // these must be the same for all data
- int dpps=data[0].getNumDataPointsPerSample();
+ if (hasmask)
+ mask = mask.interpolate(best);
-
+ // these must be the same for all data
+ int numsamples = data[0].getNumSamples();
+ int dpps=data[0].getNumDataPointsPerSample();
std::ostringstream os;
+ bool first=true;
+ if (data[0].getDomain()->getMPIRank() == 0) {
+ for (int i=0; i<numdata; ++i) {
+ const DataTypes::ShapeType& s=data[i].getDataPointShape();
+ switch (data[i].getDataPointRank()) {
+ case 0:
+ if (!first) {
+ os << sep;
+ } else {
+ first=false;
+ }
+ os << names[i];
+ break;
- bool first=true;
-
- if (data[0].getDomain()->getMPIRank()==0)
- {
- for (int i=0;i<numdata;++i)
- {
- const DataTypes::ShapeType& s=data[i].getDataPointShape();
- switch (data[i].getDataPointRank())
- {
- case 0: if (!first)
- {
- os << sep;
- }
- else
- {
- first=false;
- }
- os << names[i]; break;
- case 1: for (int j=0;j<s[0];++j)
- {
- if (!first)
- {
- os << sep;
- }
- else
- {
- first=false;
- }
- os << names[i] << csep << j;
- }
- break;
- case 2: for (int j=0;j<s[0];++j)
- {
- for (int k=0;k<s[1];++k)
- {
- if (!first)
- {
- os << sep;
- }
- else
- {
- first=false;
- }
- os << names[i] << csep << k << csep << j;
- }
- }
- break;
- case 3: for (int j=0;j<s[0];++j)
- {
- for (int k=0;k<s[1];++k)
- {
- for (int l=0;l<s[2];++l)
- {
- if (!first)
- {
- os << sep;
- }
- else
- {
- first=false;
- }
- os << names[i] << csep << k << csep << j << csep << l;
- }
- }
- }
- break;
- case 4: for (int j=0;j<s[0];++j)
- {
- for (int k=0;k<s[1];++k)
- {
- for (int l=0;l<s[2];++l)
- {
- for (int m=0;m<s[3];++m)
- {
- if (!first)
- {
- os << sep;
- }
- else
- {
- first=false;
- }
- os << names[i] << csep << k << csep << j << csep << l << csep << m;
- }
- }
- }
- }
- break;
- default:
- throw DataException("saveDataCSV: Illegal rank");
- }
- }
- os << endl;
+ case 1:
+ for (int j=0; j<s[0]; ++j) {
+ if (!first) {
+ os << sep;
+ } else {
+ first=false;
+ }
+ os << names[i] << csep << j;
+ }
+ break;
+
+ case 2:
+ for (int j=0; j<s[0]; ++j) {
+ for (int k=0; k<s[1]; ++k) {
+ if (!first) {
+ os << sep;
+ } else {
+ first=false;
+ }
+ os << names[i] << csep << k << csep << j;
+ }
+ }
+ break;
+
+ case 3:
+ for (int j=0; j<s[0]; ++j) {
+ for (int k=0; k<s[1]; ++k) {
+ for (int l=0; l<s[2]; ++l) {
+ if (!first) {
+ os << sep;
+ } else {
+ first=false;
+ }
+ os << names[i] << csep << k << csep << j
+ << csep << l;
+ }
+ }
+ }
+ break;
+
+ case 4:
+ for (int j=0; j<s[0]; ++j) {
+ for (int k=0; k<s[1]; ++k) {
+ for (int l=0; l<s[2]; ++l) {
+ for (int m=0; m<s[3]; ++m) {
+ if (!first) {
+ os << sep;
+ } else {
+ first=false;
+ }
+ os << names[i] << csep << k << csep << j
+ << csep << l << csep << m;
+ }
+ }
+ }
+ }
+ break;
+
+ default:
+ throw DataException("saveDataCSV: Illegal rank");
+ }
+ }
+ os << std::endl;
}
- const double* masksample=0;
+ const double* masksample = NULL;
- bool expandedmask=false; // does the mask act expanded. Are there mask value for each point in the sample
- bool wantrow=true; // do we output this row?
- if (hasmask)
- {
- if (mask.actsExpanded())
- {
- expandedmask=true;
- }
+ // does the mask act expanded?
+ // Are there mask value for each point in the sample?
+ bool expandedmask = false;
+ // do we output this row?
+ bool wantrow = true;
+ if (hasmask && mask.actsExpanded()) {
+ expandedmask=true;
}
os.setf(std::ios_base::scientific, std::ios_base::floatfield);
os.precision(15);
// errors prior to this point will occur on all processes anyway
// so there is no need to explicitly notify other ranks
- int error=0;
- try{
- for (int i=0;i<numsamples;++i)
- {
- if (!best.ownSample(i))
- {
- continue;
- }
- wantrow=true;
- for (int d=0;d<numdata;++d)
- {
- samples[d]=data[d].getSampleDataRO(i);
- }
- if (hasmask)
- {
- masksample=mask.getSampleDataRO(i);
- if (!expandedmask) // mask controls whole sample
- {
- if (masksample[0]<=0) // masks are scalar
- {
- wantrow=false;
- }
- }
- }
- for (int j=0;j<dpps;++j)
- {
- // now we need to check if this point is masked off
- if (expandedmask)
- {
- wantrow=(masksample[j]>0); // masks are scalar to the relevant value is at [j]
- }
- if (wantrow)
- {
- bool needsep=false;
- for (int d=0;d<numdata;++d)
- {
- DataTypes::pointToStream(os, samples[d], data[d].getDataPointShape(), offset[d], needsep, sep);
- needsep=true;
- offset[d]+=step[d];
- }
- os << endl;
- }
- }
- for (int d=0;d<numdata;++d)
- {
- offset[d]=0;
- }
- }
- } catch (...)
- {
- error=1;
- if (data[0].getDomain()->getMPISize()==1) {
+ int error = 0;
+ try {
+ std::vector<int> offset(numdata);
+ std::vector<const DataAbstract::ValueType::value_type*> samples(numdata);
+
+ for (int i=0; i<numsamples; ++i) {
+ if (!best.ownSample(i)) {
+ continue;
+ }
+ wantrow = true;
+ for (int d=0; d<numdata; ++d) {
+ samples[d] = data[d].getSampleDataRO(i);
+ }
+ if (hasmask) {
+ masksample = mask.getSampleDataRO(i);
+ if (!expandedmask) {
+ // mask controls whole sample
+ if (masksample[0] <= 0) {
+ wantrow = false;
+ }
+ }
+ }
+ for (int j=0; j<dpps; ++j) {
+ // now we need to check if this point is masked off
+ if (expandedmask) {
+ // masks are scalar so the relevant value is at [j]
+ wantrow = (masksample[j]>0);
+ }
+ if (wantrow) {
+ bool needsep = false;
+ for (int d=0; d<numdata; ++d) {
+ DataTypes::pointToStream(os, samples[d],
+ data[d].getDataPointShape(), offset[d],
+ needsep, sep);
+ needsep = true;
+ offset[d] += step[d];
+ }
+ os << std::endl;
+ }
+ }
+ for (int d=0; d<numdata; ++d) {
+ offset[d]=0;
+ }
+ }
+ } catch (...) {
+ error=1;
+ if (data[0].getDomain()->getMPISize()==1) {
throw;
}
}
#ifdef ESYS_MPI
- MPI_Comm com=data[0].getDomain()->getMPIComm();
- int rerror=0;
- MPI_Allreduce( &error, &rerror, 1, MPI_INT, MPI_MAX, com );
- error=rerror;
- if (error)
- {
- throw DataException("saveDataCSVcpp: error building output");
- }
+ MPI_Comm com = data[0].getDomain()->getMPIComm();
+ int rerror = 0;
+ MPI_Allreduce(&error, &rerror, 1, MPI_INT, MPI_MAX, com);
+ error = rerror;
+#else
+ MPI_Comm com = MPI_COMM_NULL;
#endif
- // at this point os will contain the text to be written
-#ifndef ESYS_MPI
- (void) error;
+ if (error)
+ throw DataException("saveDataCSV: error building output");
- std::ofstream ofs;
- if (append)
- {
- ofs.open(filename.c_str(), std::ios_base::app);
- }
- else
- {
- ofs.open(filename.c_str());
- }
- if (!ofs.is_open())
- {
- throw DataException("saveDataCSVcpp: unable to open file for writing");
+ // at this point os will contain the text to be written
+ FileWriter fw(com);
+ if (!fw.openFile(filename, 0, false, append)) {
+ throw DataException("saveDataCSV: unable to open file for writing");
}
- ofs << os.str();
- ofs.close();
+ error = !fw.writeOrdered(os);
+ fw.close();
-#else
-// here we have MPI
- MPI_File mpi_fileHandle_p;
- MPI_Status mpi_status;
- MPI_Info mpi_info = MPI_INFO_NULL;
- boost::scoped_array<char> fname_p(new char[filename.size()+1]);
- strcpy(fname_p.get(), filename.c_str());
-
- int amode = MPI_MODE_CREATE|MPI_MODE_WRONLY|MPI_MODE_UNIQUE_OPEN;
- if (append)
- {
- amode |= MPI_MODE_APPEND;
- }
- else
- {
- if (data[0].getDomain()->getMPIRank()==0)
- {
- std::ifstream ifs(fname_p.get()); // if file exists, remove it
- if (ifs.is_open())
- {
- ifs.close();
- if (remove(fname_p.get()))
- {
- error=1;
- }
- }
- }
- data[0].getDomain()->MPIBarrier();
- int rerror=0;
- MPI_Allreduce( &error, &rerror, 1, MPI_INT, MPI_MAX, com );
- if (rerror!=0)
- {
- std::ostringstream oss;
- oss << "saveDataCSVcpp: File " << filename << " already exists and could not be removed in preparation for new output.";
- throw DataException(oss.str());
- }
+ data[0].getDomain()->MPIBarrier();
+
+ if (error)
+ throw DataException("saveDataCSV: Error writing to file");
+}
+
+void resolveGroup(bp::object obj)
+{
+ int len=0;
+ try {
+ len=bp::extract<int>(obj.attr("__len__")());
}
- int ierr;
- ierr = MPI_File_open(com, fname_p.get(), amode, mpi_info, &mpi_fileHandle_p);
- if (ierr != MPI_SUCCESS)
+ catch(...)
{
- std::ostringstream oss;
- oss << "saveDataCSVcpp: File " << filename << " could not be opened for writing in parallel";
- // file is not open so we can throw
- throw DataException(oss.str());
+ // tell python the error isn't there anymore
+ PyErr_Clear();
+ throw DataException("resolveGroup: sequence object expected.");
}
- else
- {
- ierr=MPI_File_set_view(mpi_fileHandle_p,MPI_DISPLACEMENT_CURRENT,
- MPI_CHAR, MPI_CHAR, const_cast<char*>("native"), mpi_info);
-// here we are assuming that std::string holds the same type of char as MPI_CHAR
+ std::vector<DataLazy*> dats;
+ std::vector<Data*> dp;
+ for (int i=0; i<len; ++i) {
+ Data* p=0;
+ try {
+ p = bp::extract<Data*>(obj[i]);
+ } catch(...) {
+ PyErr_Clear();
+ throw DataException("resolveGroup: only accepts Data objects.");
+ }
+ if (p->isLazy()) {
+ dats.push_back(dynamic_cast<DataLazy*>(p->borrowData()));
+ dp.push_back(p);
+ }
}
-
- std::string contents=os.str();
- boost::scoped_array<char> buff(new char[contents.size()+1]);
- strcpy(buff.get(), contents.c_str());
- ierr=MPI_File_write_ordered(mpi_fileHandle_p, buff.get(), contents.size(), MPI_CHAR, &mpi_status);
- if (ierr != MPI_SUCCESS)
- {
- error=1;
+ if (!dats.empty()) {
+ dats[0]->resolveGroupWorker(dats);
}
- if (MPI_File_close(&mpi_fileHandle_p)!= MPI_SUCCESS)
- {
- error=1;
- }
- data[0].getDomain()->MPIBarrier();
- if (error) // any errors at this stage are from collective routines
- { // so there is no need to reduce_all
- throw DataException("saveDataCSVcpp: Error writing and closing file");
- }
-
-#endif
+ // all the data will be identities now but still lazy
+ // convert it to ready
+ for (int i=dp.size()-1; i>=0; --i)
+ dp[i]->resolve();
}
-void
-resolveGroup(boost::python::object obj)
-{
- int len=0;
- try
- {
- len=boost::python::extract<int>(obj.attr("__len__")());
- }
- catch(...)
- {
- PyErr_Clear(); // tell python the error isn't there anymore
- throw DataException("Error - resolveGroup expects a sequence object.");
- }
- std::vector<DataLazy*> dats;
- std::vector<Data*> dp;
- for (int i=0;i<len;++i)
- {
- Data* p=0;
- try
- {
- p=boost::python::extract<Data*>(obj[i]);
- }
- catch(...)
- {
- PyErr_Clear();
- throw DataException("Error - resolveGroup only accepts Data objects.");
- }
- if (p->isLazy())
- {
- dats.push_back(dynamic_cast<DataLazy*>(p->borrowData()));
- dp.push_back(p);
- }
- }
- if (!dats.empty())
- {
- dats[0]->resolveGroupWorker(dats);
- }
- // all the data will be identities now but its still lazy
- // convert it to ready
- for (int i=dp.size()-1;i>=0;--i)
- {
- dp[i]->resolve();
- }
-}
-
+} // end of namespace
-} // end of namespace
diff --git a/escriptcore/src/Utils.h b/escriptcore/src/Utils.h
index c525fdb..29d22a8 100644
--- a/escriptcore/src/Utils.h
+++ b/escriptcore/src/Utils.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -14,104 +14,106 @@
*
*****************************************************************************/
-#if !defined escript_Utils_H
-#define escript_Utils_H
+#ifndef __ESCRIPT_UTILS_H__
+#define __ESCRIPT_UTILS_H__
#include "system_dep.h"
#include <boost/python/dict.hpp>
namespace escript {
- /**
- \brief
- some functions
-
- */
-
- /**
- \brief
- return the SVN version number used to build this version.
- \warning Only gives accurate answers for clean checkouts
- */
- ESCRIPT_DLL_API int getSvnVersion();
-
- /**
- \brief
- print a message about how many MPI CPUs and OpenMP threads we're using
- */
- ESCRIPT_DLL_API void printParallelThreadCnt();
-
- /**
- \brief
- set the number of threads
- \warning Use of this method is strongly discouraged. It may be deprecated in future.
- */
- ESCRIPT_DLL_API void setNumberOfThreads(const int num_threads);
-
- /**
- \brief
- returns the number of threads
- */
- ESCRIPT_DLL_API int getNumberOfThreads();
-
- /**
- \brief
- returns the total number of available MPI processes for MPI_COMM_WORLD
- */
- ESCRIPT_DLL_API int getMPISizeWorld();
-
- /**
- \brief
- returns the MPI processor number within MPI_COMM_WORLD
- */
- ESCRIPT_DLL_API int getMPIRankWorld();
- /**
- \brief
- returns the maximum value of an integer over all processors within MPI_COMM_WORLD
- */
- ESCRIPT_DLL_API int getMPIWorldMax(const int val);
-
- /**
- \brief returns sum of an integer over all processors with MPI_COMM_WORLD
- */
- ESCRIPT_DLL_API int getMPIWorldSum(const int val);
-
- /**
- \brief performs a barrier synchronization across all processors.
- */
- ESCRIPT_DLL_API void MPIBarrierWorld();
-
- /**
- \brief uses MPI_Comm_spawn to run an external MPI program safely.
- */
- ESCRIPT_DLL_API int runMPIProgram(const boost::python::list args);
-
- /**
+/**
+ \brief
+ some functions
+*/
+
+/**
+ \brief
+ return the SVN version number used to build this version.
+ \warning Only gives accurate answers for clean checkouts
+*/
+ESCRIPT_DLL_API int getSvnVersion();
+
+/**
+ \brief
+ print a message about how many MPI CPUs and OpenMP threads we're using
+*/
+ESCRIPT_DLL_API void printParallelThreadCnt();
+
+/**
+ \brief
+ set the number of threads
+ \warning Use of this method is strongly discouraged. It may be deprecated in future.
+*/
+ESCRIPT_DLL_API void setNumberOfThreads(const int num_threads);
+
+/**
+ \brief
+ returns the number of threads
+*/
+ESCRIPT_DLL_API int getNumberOfThreads();
+
+/**
+ \brief
+ returns the total number of available MPI processes for MPI_COMM_WORLD
+*/
+ESCRIPT_DLL_API int getMPISizeWorld();
+
+/**
+ \brief
+ returns the MPI processor number within MPI_COMM_WORLD
+*/
+ESCRIPT_DLL_API int getMPIRankWorld();
+
+/**
+ \brief
+ returns the maximum value of an integer over all processors within MPI_COMM_WORLD
+*/
+ESCRIPT_DLL_API int getMPIWorldMax(const int val);
+
+/**
+ \brief returns sum of an integer over all processors with MPI_COMM_WORLD
+*/
+ESCRIPT_DLL_API int getMPIWorldSum(const int val);
+
+/**
+ \brief performs a barrier synchronization across all processors.
+*/
+ESCRIPT_DLL_API void MPIBarrierWorld();
+
+/**
+ \brief uses MPI_Comm_spawn to run an external MPI program safely.
+*/
+ESCRIPT_DLL_API int runMPIProgram(const boost::python::list args);
+
+/**
\brief
- returns machine precision
- */
- ESCRIPT_DLL_API double getMachinePrecision();
- /*
- \brief
- return largest positive float
- */
- ESCRIPT_DLL_API double getMaxFloat();
-
- ESCRIPT_DLL_API
- void
- saveDataCSV(const std::string& filename, boost::python::dict arg, const std::string& sep, const std::string& csep,
-bool append=false);
-
-
- /**
- Resolve a collection of Data objects together now.
- To get performance improvements, the objects will need to have the same function space and share Dag components.
- \param obj A python list or tuple of Data objects to be resolved together.
-
- */
- ESCRIPT_DLL_API
- void
- resolveGroup(boost::python::object obj);
+ returns the machine precision
+*/
+ESCRIPT_DLL_API double getMachinePrecision();
+
+/*
+ \brief
+ return largest positive float
+*/
+ESCRIPT_DLL_API double getMaxFloat();
+
+ESCRIPT_DLL_API void saveDataCSV(const std::string& filename,
+ boost::python::dict arg,
+ const std::string& sep,
+ const std::string& csep, bool append=false);
+
+
+/**
+ \brief
+ Resolve a collection of Data objects together now.
+ To get performance improvements, the objects will need to have the same
+ function space and share Dag components.
+ \param obj A python list or tuple of Data objects to be resolved together.
+*/
+ESCRIPT_DLL_API void resolveGroup(boost::python::object obj);
} // end of namespace
-#endif
+
+#endif // __ESCRIPT_UTILS_H__
+
diff --git a/escriptcore/src/WrappedArray.cpp b/escriptcore/src/WrappedArray.cpp
index 38f939d..7acb8ce 100644
--- a/escriptcore/src/WrappedArray.cpp
+++ b/escriptcore/src/WrappedArray.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/WrappedArray.h b/escriptcore/src/WrappedArray.h
index baafa90..3ddd591 100644
--- a/escriptcore/src/WrappedArray.h
+++ b/escriptcore/src/WrappedArray.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/src/escriptcpp.cpp b/escriptcore/src/escriptcpp.cpp
index ec42868..d29561c 100644
--- a/escriptcore/src/escriptcpp.cpp
+++ b/escriptcore/src/escriptcpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -58,7 +58,7 @@ using namespace boost::python;
/*! \mainpage Esys Documentation
*
- * \version 4.1
+ * \version 4.2
*
* Main modules/namespaces:
*
@@ -151,7 +151,9 @@ BOOST_PYTHON_MODULE(escriptcpp)
.def("removeVariable", &escript::SplitWorld::removeVariable, arg("name"), "Remove the named variable from the SplitWorld")
.def("clearVariable", &escript::SplitWorld::clearVariable, arg("name"), "Remove the value from the named variable")
.def("getVarList", &escript::SplitWorld::getVarPyList, "Lists variables known to the system")
- .def("getDoubleVariable", &escript::SplitWorld::getScalarVariable)
+ .def("getVarInfo", &escript::SplitWorld::getVarPyInfo, "Lists variable descriptions known to the system")
+ .def("getDoubleVariable", &escript::SplitWorld::getScalarVariable, "Return the value of floating point variable")
+ .def("getLocalObjectVariable", &escript::SplitWorld::getLocalObjectVariable, "Returns python object for a variable which is not shared between worlds")
.def("getSubWorldCount",&escript::SplitWorld::getSubWorldCount)
.def("getSubWorldID", &escript::SplitWorld::getSubWorldID)
.def("copyVariable", &escript::SplitWorld::copyVariable, args("source","destination"), "Copy the contents of one variable to another");
@@ -631,6 +633,8 @@ args("arg"), "assigns new location to the domain\n\n"
.def("_whereZero",&escript::Data::whereZero,(arg("tol")=0.0))
.def("_whereNonZero",&escript::Data::whereNonZero,(arg("tol")=0.0))
.def("_erf",&escript::Data::erf)
+ .def("_besselFirstKind",&escript::Data::besselFirstKind,arg("order"))
+ .def("_besselSecondKind",&escript::Data::besselSecondKind,arg("order"))
.def("_sin",&escript::Data::sin)
.def("_cos",&escript::Data::cos)
.def("_tan",&escript::Data::tan)
@@ -1017,7 +1021,7 @@ args("source", "q", "r","factor"),
"'residual_norm', 'converged'.\n"
":param value: new value of the diagnostic information\n"
":note: this function is used by a solver to report diagnostics\n"
- "informations.")
+ "information.")
.def("getDiagnostics", &escript::SolverBuddy::getDiagnostics, args("name"),"Returns the diagnostic information ``name``. Possible values are:\n\n"
"- 'num_iter': the number of iteration steps\n"
"- 'cum_num_iter': the cumulative number of iteration steps\n"
diff --git a/escriptcore/src/system_dep.h b/escriptcore/src/system_dep.h
index f2d0f86..463d2b6 100644
--- a/escriptcore/src/system_dep.h
+++ b/escriptcore/src/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataAlgorithmAdapterTestCase.cpp b/escriptcore/test/DataAlgorithmAdapterTestCase.cpp
index be6f23a..2341144 100644
--- a/escriptcore/test/DataAlgorithmAdapterTestCase.cpp
+++ b/escriptcore/test/DataAlgorithmAdapterTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataAlgorithmAdapterTestCase.h b/escriptcore/test/DataAlgorithmAdapterTestCase.h
index 013209b..400d723 100644
--- a/escriptcore/test/DataAlgorithmAdapterTestCase.h
+++ b/escriptcore/test/DataAlgorithmAdapterTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataBlocks2DTestCase.cpp b/escriptcore/test/DataBlocks2DTestCase.cpp
index 6e78149..e966232 100644
--- a/escriptcore/test/DataBlocks2DTestCase.cpp
+++ b/escriptcore/test/DataBlocks2DTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataBlocks2DTestCase.h b/escriptcore/test/DataBlocks2DTestCase.h
index 3d859a9..9d278a5 100644
--- a/escriptcore/test/DataBlocks2DTestCase.h
+++ b/escriptcore/test/DataBlocks2DTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataConstantTestCase.cpp b/escriptcore/test/DataConstantTestCase.cpp
index 9af5e66..65bab47 100644
--- a/escriptcore/test/DataConstantTestCase.cpp
+++ b/escriptcore/test/DataConstantTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataConstantTestCase.h b/escriptcore/test/DataConstantTestCase.h
index e67730c..80ba9ca 100644
--- a/escriptcore/test/DataConstantTestCase.h
+++ b/escriptcore/test/DataConstantTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataEmptyTestCase.cpp b/escriptcore/test/DataEmptyTestCase.cpp
index fd83748..a9fe460 100644
--- a/escriptcore/test/DataEmptyTestCase.cpp
+++ b/escriptcore/test/DataEmptyTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataEmptyTestCase.h b/escriptcore/test/DataEmptyTestCase.h
index 1bfedfb..31629ca 100644
--- a/escriptcore/test/DataEmptyTestCase.h
+++ b/escriptcore/test/DataEmptyTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataExpandedTestCase.cpp b/escriptcore/test/DataExpandedTestCase.cpp
index d20a075..f267b1f 100644
--- a/escriptcore/test/DataExpandedTestCase.cpp
+++ b/escriptcore/test/DataExpandedTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataExpandedTestCase.h b/escriptcore/test/DataExpandedTestCase.h
index 4a7827a..19a2f94 100644
--- a/escriptcore/test/DataExpandedTestCase.h
+++ b/escriptcore/test/DataExpandedTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataFactoryTestCase.cpp b/escriptcore/test/DataFactoryTestCase.cpp
index 62b0e47..b7be535 100644
--- a/escriptcore/test/DataFactoryTestCase.cpp
+++ b/escriptcore/test/DataFactoryTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataFactoryTestCase.h b/escriptcore/test/DataFactoryTestCase.h
index 3a00d09..50312e9 100644
--- a/escriptcore/test/DataFactoryTestCase.h
+++ b/escriptcore/test/DataFactoryTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataLazyTestCase.cpp b/escriptcore/test/DataLazyTestCase.cpp
index 65792ac..a7a18da 100644
--- a/escriptcore/test/DataLazyTestCase.cpp
+++ b/escriptcore/test/DataLazyTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataLazyTestCase.h b/escriptcore/test/DataLazyTestCase.h
index a072473..758fdff 100644
--- a/escriptcore/test/DataLazyTestCase.h
+++ b/escriptcore/test/DataLazyTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataMathsTestCase.cpp b/escriptcore/test/DataMathsTestCase.cpp
index 0ac42e9..5a308b2 100644
--- a/escriptcore/test/DataMathsTestCase.cpp
+++ b/escriptcore/test/DataMathsTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataMathsTestCase.h b/escriptcore/test/DataMathsTestCase.h
index 1b48f65..c8737de 100644
--- a/escriptcore/test/DataMathsTestCase.h
+++ b/escriptcore/test/DataMathsTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataTaggedTestCase.cpp b/escriptcore/test/DataTaggedTestCase.cpp
index 81a0001..f297e9c 100644
--- a/escriptcore/test/DataTaggedTestCase.cpp
+++ b/escriptcore/test/DataTaggedTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataTaggedTestCase.h b/escriptcore/test/DataTaggedTestCase.h
index 662e073..2a768cf 100644
--- a/escriptcore/test/DataTaggedTestCase.h
+++ b/escriptcore/test/DataTaggedTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataTestCase.cpp b/escriptcore/test/DataTestCase.cpp
index a20bf87..b2031dd 100644
--- a/escriptcore/test/DataTestCase.cpp
+++ b/escriptcore/test/DataTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataTestCase.h b/escriptcore/test/DataTestCase.h
index 7ab697e..1af8026 100644
--- a/escriptcore/test/DataTestCase.h
+++ b/escriptcore/test/DataTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataTypesTestCase.cpp b/escriptcore/test/DataTypesTestCase.cpp
index e49eebe..6e40014 100644
--- a/escriptcore/test/DataTypesTestCase.cpp
+++ b/escriptcore/test/DataTypesTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataTypesTestCase.h b/escriptcore/test/DataTypesTestCase.h
index 415362c..0019238 100644
--- a/escriptcore/test/DataTypesTestCase.h
+++ b/escriptcore/test/DataTypesTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataVectorTestCase.cpp b/escriptcore/test/DataVectorTestCase.cpp
index 45ecf47..976b034 100644
--- a/escriptcore/test/DataVectorTestCase.cpp
+++ b/escriptcore/test/DataVectorTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/DataVectorTestCase.h b/escriptcore/test/DataVectorTestCase.h
index 60fb823..91041ac 100644
--- a/escriptcore/test/DataVectorTestCase.h
+++ b/escriptcore/test/DataVectorTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/FunctionSpaceTestCase.cpp b/escriptcore/test/FunctionSpaceTestCase.cpp
index c33860a..dd787e9 100644
--- a/escriptcore/test/FunctionSpaceTestCase.cpp
+++ b/escriptcore/test/FunctionSpaceTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/FunctionSpaceTestCase.h b/escriptcore/test/FunctionSpaceTestCase.h
index 6dd1a14..c51cd0d 100644
--- a/escriptcore/test/FunctionSpaceTestCase.h
+++ b/escriptcore/test/FunctionSpaceTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/SConscript b/escriptcore/test/SConscript
index 6ec1c39..c093b14 100644
--- a/escriptcore/test/SConscript
+++ b/escriptcore/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/SharedDataTestCase.cpp b/escriptcore/test/SharedDataTestCase.cpp
index 0f9af92..a701602 100644
--- a/escriptcore/test/SharedDataTestCase.cpp
+++ b/escriptcore/test/SharedDataTestCase.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/SharedDataTestCase.h b/escriptcore/test/SharedDataTestCase.h
index 2eb6cf5..9f635b9 100644
--- a/escriptcore/test/SharedDataTestCase.h
+++ b/escriptcore/test/SharedDataTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/TaipanTestCase.cpp b/escriptcore/test/TaipanTestCase.cpp
index 4d94a32..7395ab1 100644
--- a/escriptcore/test/TaipanTestCase.cpp
+++ b/escriptcore/test/TaipanTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/TaipanTestCase.h b/escriptcore/test/TaipanTestCase.h
index 42abe5b..c9035a7 100644
--- a/escriptcore/test/TaipanTestCase.h
+++ b/escriptcore/test/TaipanTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/escript_UnitTest.cpp b/escriptcore/test/escript_UnitTest.cpp
index af5e774..d6163bb 100644
--- a/escriptcore/test/escript_UnitTest.cpp
+++ b/escriptcore/test/escript_UnitTest.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/multi_arrayTestCase.cpp b/escriptcore/test/multi_arrayTestCase.cpp
index 45c9b80..c728ce6 100644
--- a/escriptcore/test/multi_arrayTestCase.cpp
+++ b/escriptcore/test/multi_arrayTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/multi_arrayTestCase.h b/escriptcore/test/multi_arrayTestCase.h
index 7b7635a..51f0c51 100644
--- a/escriptcore/test/multi_arrayTestCase.h
+++ b/escriptcore/test/multi_arrayTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/python/SConscript b/escriptcore/test/python/SConscript
index ccea1f9..288186f 100644
--- a/escriptcore/test/python/SConscript
+++ b/escriptcore/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/python/TimingTests.py.old b/escriptcore/test/python/TimingTests.py.old
index 6285eab..9d900a1 100644
--- a/escriptcore/test/python/TimingTests.py.old
+++ b/escriptcore/test/python/TimingTests.py.old
@@ -6,8 +6,8 @@
# http://www.uq.edu.au/esscc
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
@@ -15,8 +15,8 @@ __copyright__="""Copyright (c) 2003-2010 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au/esscc
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/run_data_access.py b/escriptcore/test/python/run_data_access.py
index 062801c..bb1509f 100644
--- a/escriptcore/test/python/run_data_access.py
+++ b/escriptcore/test/python/run_data_access.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/escriptcore/test/python/run_symbolic.py b/escriptcore/test/python/run_symbolic.py
index 72f9182..97ad705 100644
--- a/escriptcore/test/python/run_symbolic.py
+++ b/escriptcore/test/python/run_symbolic.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/run_testdomain.py b/escriptcore/test/python/run_testdomain.py
index 76f388b..c5d9f9a 100644
--- a/escriptcore/test/python/run_testdomain.py
+++ b/escriptcore/test/python/run_testdomain.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2012-2015 by The University of Queensland
+# Copyright (c) 2012-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2012-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2012-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/escriptcore/test/python/run_units.py b/escriptcore/test/python/run_units.py
index 576387d..51cf90a 100644
--- a/escriptcore/test/python/run_units.py
+++ b/escriptcore/test/python/run_units.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/escriptcore/test/python/run_xml.py b/escriptcore/test/python/run_xml.py
index ef9452a..ef434b8 100644
--- a/escriptcore/test/python/run_xml.py
+++ b/escriptcore/test/python/run_xml.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/escriptcore/test/python/test_assemblage.py b/escriptcore/test/python/test_assemblage.py
index 9ee0b84..2992e31 100644
--- a/escriptcore/test/python/test_assemblage.py
+++ b/escriptcore/test/python/test_assemblage.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/test/python/test_assemblage_2Do1.py b/escriptcore/test/python/test_assemblage_2Do1.py
index e11eb9a..551b090 100644
--- a/escriptcore/test/python/test_assemblage_2Do1.py
+++ b/escriptcore/test/python/test_assemblage_2Do1.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/test/python/test_assemblage_2Do2.py b/escriptcore/test/python/test_assemblage_2Do2.py
index be7a8ae..b361ff5 100644
--- a/escriptcore/test/python/test_assemblage_2Do2.py
+++ b/escriptcore/test/python/test_assemblage_2Do2.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/test/python/test_assemblage_3Do1.py b/escriptcore/test/python/test_assemblage_3Do1.py
index 07aa41e..cf262cf 100644
--- a/escriptcore/test/python/test_assemblage_3Do1.py
+++ b/escriptcore/test/python/test_assemblage_3Do1.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/test/python/test_assemblage_3Do2.py b/escriptcore/test/python/test_assemblage_3Do2.py
index 5b66ea9..b640e18 100644
--- a/escriptcore/test/python/test_assemblage_3Do2.py
+++ b/escriptcore/test/python/test_assemblage_3Do2.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/escriptcore/test/python/test_condEval.py b/escriptcore/test/python/test_condEval.py
index 94fd2e7..352ef34 100644
--- a/escriptcore/test/python/test_condEval.py
+++ b/escriptcore/test/python/test_condEval.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2010-2015 by The University of Queensland
+# Copyright (c) 2010-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2010-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2010-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Joel Fenwick, joelfenwick at uq.edu.au"
diff --git a/escriptcore/test/python/test_linearPDEs.py b/escriptcore/test/python/test_linearPDEs.py
index 90efbde..f0f4e35 100644
--- a/escriptcore/test/python/test_linearPDEs.py
+++ b/escriptcore/test/python/test_linearPDEs.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_modulefns.py b/escriptcore/test/python/test_modulefns.py
index 57543ac..eb686a5 100644
--- a/escriptcore/test/python/test_modulefns.py
+++ b/escriptcore/test/python/test_modulefns.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2009-2015 by The University of Queensland
+# Copyright (c) 2009-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2009-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2009-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/escriptcore/test/python/test_nonLinearPDE.py b/escriptcore/test/python/test_nonLinearPDE.py
index 001605f..391e562 100644
--- a/escriptcore/test/python/test_nonLinearPDE.py
+++ b/escriptcore/test/python/test_nonLinearPDE.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_objects.py b/escriptcore/test/python/test_objects.py
index 712bc0a..58a30d1 100644
--- a/escriptcore/test/python/test_objects.py
+++ b/escriptcore/test/python/test_objects.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_pdetools.py b/escriptcore/test/python/test_pdetools.py
index 63e6975..796993f 100644
--- a/escriptcore/test/python/test_pdetools.py
+++ b/escriptcore/test/python/test_pdetools.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_shared.py b/escriptcore/test/python/test_shared.py
index 337dced..9ecb312 100644
--- a/escriptcore/test/python/test_shared.py
+++ b/escriptcore/test/python/test_shared.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_splitworld.py b/escriptcore/test/python/test_splitworld.py
index 0ed1f50..cc2a3ac 100644
--- a/escriptcore/test/python/test_splitworld.py
+++ b/escriptcore/test/python/test_splitworld.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2015 by The University of Queensland
+__copyright__="""Copyright (c) 2015-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
@@ -29,7 +29,7 @@ Tests to ensure that splitworld features operate correctly
import esys.escriptcore.utestselect as unittest
from esys.escript import *
-from esys.escriptcore.splitworld import *
+from esys.escript.splitworld import *
from esys.escript.linearPDEs import Poisson, Helmholtz
from esys.escriptcore.testing import *
import sys
diff --git a/escriptcore/test/python/test_symfuncs.py b/escriptcore/test/python/test_symfuncs.py
index 81520fb..015bca6 100644
--- a/escriptcore/test/python/test_symfuncs.py
+++ b/escriptcore/test/python/test_symfuncs.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
__author__="Cihan Altinay"
diff --git a/escriptcore/test/python/test_util.py b/escriptcore/test/python/test_util.py
index 034361e..b058894 100644
--- a/escriptcore/test/python/test_util.py
+++ b/escriptcore/test/python/test_util.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_NaN_funcs.py b/escriptcore/test/python/test_util_NaN_funcs.py
index 9e89701..017a65b 100644
--- a/escriptcore/test/python/test_util_NaN_funcs.py
+++ b/escriptcore/test/python/test_util_NaN_funcs.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/escriptcore/test/python/test_util_base.py b/escriptcore/test/python/test_util_base.py
index 186e12f..b6c231d 100644
--- a/escriptcore/test/python/test_util_base.py
+++ b/escriptcore/test/python/test_util_base.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_binary_no_tagged_data.py b/escriptcore/test/python/test_util_binary_no_tagged_data.py
index 842bf04..f4881f4 100644
--- a/escriptcore/test/python/test_util_binary_no_tagged_data.py
+++ b/escriptcore/test/python/test_util_binary_no_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_binary_with_tagged_data.py b/escriptcore/test/python/test_util_binary_with_tagged_data.py
index 9c93244..995c389 100644
--- a/escriptcore/test/python/test_util_binary_with_tagged_data.py
+++ b/escriptcore/test/python/test_util_binary_with_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_overloaded_binary_no_tagged_data.py b/escriptcore/test/python/test_util_overloaded_binary_no_tagged_data.py
index 7b903ee..0a76a25 100644
--- a/escriptcore/test/python/test_util_overloaded_binary_no_tagged_data.py
+++ b/escriptcore/test/python/test_util_overloaded_binary_no_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_overloaded_binary_with_tagged_data.py b/escriptcore/test/python/test_util_overloaded_binary_with_tagged_data.py
index 309e959..a7fb194 100644
--- a/escriptcore/test/python/test_util_overloaded_binary_with_tagged_data.py
+++ b/escriptcore/test/python/test_util_overloaded_binary_with_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_reduction_no_tagged_data.py b/escriptcore/test/python/test_util_reduction_no_tagged_data.py
index cbb47fd..3076921 100644
--- a/escriptcore/test/python/test_util_reduction_no_tagged_data.py
+++ b/escriptcore/test/python/test_util_reduction_no_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_reduction_with_tagged_data.py b/escriptcore/test/python/test_util_reduction_with_tagged_data.py
index 34741d4..9d7dac3 100644
--- a/escriptcore/test/python/test_util_reduction_with_tagged_data.py
+++ b/escriptcore/test/python/test_util_reduction_with_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_slicing_no_tagged_data.py b/escriptcore/test/python/test_util_slicing_no_tagged_data.py
index d9ceff1..4d976f3 100644
--- a/escriptcore/test/python/test_util_slicing_no_tagged_data.py
+++ b/escriptcore/test/python/test_util_slicing_no_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_slicing_with_tagged_data.py b/escriptcore/test/python/test_util_slicing_with_tagged_data.py
index c294b41..890a130 100644
--- a/escriptcore/test/python/test_util_slicing_with_tagged_data.py
+++ b/escriptcore/test/python/test_util_slicing_with_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_spatial_functions1.py b/escriptcore/test/python/test_util_spatial_functions1.py
index b1e472c..5943037 100644
--- a/escriptcore/test/python/test_util_spatial_functions1.py
+++ b/escriptcore/test/python/test_util_spatial_functions1.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_spatial_functions2.py b/escriptcore/test/python/test_util_spatial_functions2.py
index 209995e..5eea53c 100644
--- a/escriptcore/test/python/test_util_spatial_functions2.py
+++ b/escriptcore/test/python/test_util_spatial_functions2.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_spatial_functions3.py b/escriptcore/test/python/test_util_spatial_functions3.py
index 9de3c9e..a9b24e6 100644
--- a/escriptcore/test/python/test_util_spatial_functions3.py
+++ b/escriptcore/test/python/test_util_spatial_functions3.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_unary_no_tagged_data.py b/escriptcore/test/python/test_util_unary_no_tagged_data.py
index 040020a..f3d4b0b 100644
--- a/escriptcore/test/python/test_util_unary_no_tagged_data.py
+++ b/escriptcore/test/python/test_util_unary_no_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/escriptcore/test/python/test_util_unary_with_tagged_data.py b/escriptcore/test/python/test_util_unary_with_tagged_data.py
index 4a0eefe..a6db0f7 100644
--- a/escriptcore/test/python/test_util_unary_with_tagged_data.py
+++ b/escriptcore/test/python/test_util_unary_with_tagged_data.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/esysUtils/src/EsysAssert.h b/esysUtils/src/EsysAssert.h
index 5d27766..877bd40 100644
--- a/esysUtils/src/EsysAssert.h
+++ b/esysUtils/src/EsysAssert.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/EsysAssertException.cpp b/esysUtils/src/EsysAssertException.cpp
index 6df2f9c..578a65d 100644
--- a/esysUtils/src/EsysAssertException.cpp
+++ b/esysUtils/src/EsysAssertException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/EsysAssertException.h b/esysUtils/src/EsysAssertException.h
index 4d3aff0..dbe7dbe 100644
--- a/esysUtils/src/EsysAssertException.h
+++ b/esysUtils/src/EsysAssertException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/EsysException.cpp b/esysUtils/src/EsysException.cpp
index c871287..c9f44fe 100644
--- a/esysUtils/src/EsysException.cpp
+++ b/esysUtils/src/EsysException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/EsysException.h b/esysUtils/src/EsysException.h
index f65f675..e6821f2 100644
--- a/esysUtils/src/EsysException.h
+++ b/esysUtils/src/EsysException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/EsysRandom.cpp b/esysUtils/src/EsysRandom.cpp
index 37b0c5e..c3d798a 100644
--- a/esysUtils/src/EsysRandom.cpp
+++ b/esysUtils/src/EsysRandom.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2013-2015 by The University of Queensland
+* Copyright (c) 2013-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/EsysRandom.h b/esysUtils/src/EsysRandom.h
index 977b5e0..025f7e3 100644
--- a/esysUtils/src/EsysRandom.h
+++ b/esysUtils/src/EsysRandom.h
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2013-2015 by The University of Queensland
+* Copyright (c) 2013-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/Esys_MPI.cpp b/esysUtils/src/Esys_MPI.cpp
index d5b662d..6220790 100644
--- a/esysUtils/src/Esys_MPI.cpp
+++ b/esysUtils/src/Esys_MPI.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/Esys_MPI.h b/esysUtils/src/Esys_MPI.h
index 58ed11e..fb5b0f1 100644
--- a/esysUtils/src/Esys_MPI.h
+++ b/esysUtils/src/Esys_MPI.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/IndexList.h b/esysUtils/src/IndexList.h
index 07904a0..449bffb 100644
--- a/esysUtils/src/IndexList.h
+++ b/esysUtils/src/IndexList.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/SConscript b/esysUtils/src/SConscript
index b6190da..8119797 100644
--- a/esysUtils/src/SConscript
+++ b/esysUtils/src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/blocktimer.cpp b/esysUtils/src/blocktimer.cpp
index c41d11f..16c6bdb 100644
--- a/esysUtils/src/blocktimer.cpp
+++ b/esysUtils/src/blocktimer.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/blocktimer.h b/esysUtils/src/blocktimer.h
index 4fb1dda..7609057 100644
--- a/esysUtils/src/blocktimer.h
+++ b/esysUtils/src/blocktimer.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/error.cpp b/esysUtils/src/error.cpp
index 041d998..cefaa46 100644
--- a/esysUtils/src/error.cpp
+++ b/esysUtils/src/error.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2010-2015 by The University of Queensland
+* Copyright (c) 2010-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/error.h b/esysUtils/src/error.h
index 39f0259..70582c8 100644
--- a/esysUtils/src/error.h
+++ b/esysUtils/src/error.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2010-2015 by The University of Queensland
+* Copyright (c) 2010-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/esysExceptionTranslator.cpp b/esysUtils/src/esysExceptionTranslator.cpp
index dd24bd3..31a9a1f 100644
--- a/esysUtils/src/esysExceptionTranslator.cpp
+++ b/esysUtils/src/esysExceptionTranslator.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/esysExceptionTranslator.h b/esysUtils/src/esysExceptionTranslator.h
index 40d0437..88a662c 100644
--- a/esysUtils/src/esysExceptionTranslator.h
+++ b/esysUtils/src/esysExceptionTranslator.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/esysFileWriter.h b/esysUtils/src/esysFileWriter.h
index d7219ed..24dea56 100644
--- a/esysUtils/src/esysFileWriter.h
+++ b/esysUtils/src/esysFileWriter.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -21,51 +21,71 @@
#include <iostream>
#include <sstream>
-#ifdef ESYS_MPI
-#include <mpi.h>
-#endif
+#include <esysUtils/Esys_MPI.h>
namespace esysUtils {
class FileWriter
{
public:
- FileWriter() : mpiSize(1) {}
-
+ FileWriter(MPI_Comm comm = MPI_COMM_NULL) :
+ mpiComm(comm), mpiRank(0), mpiSize(1), m_open(false)
+ {
#ifdef ESYS_MPI
- FileWriter(MPI_Comm comm) : mpiComm(comm)
+ if (comm != MPI_COMM_NULL) {
+ MPI_Comm_rank(mpiComm, &mpiRank);
+ MPI_Comm_size(mpiComm, &mpiSize);
+ }
+#else
+ (void)mpiRank; // to prevent the compiler from complaining
+ (void)mpiSize; // that these are unused
+ (void)mpiComm;
+#endif
+ }
+
+ ~FileWriter()
{
- MPI_Comm_rank(mpiComm, &mpiRank);
- MPI_Comm_size(mpiComm, &mpiSize);
+ if (m_open)
+ close();
}
-#endif
- bool openFile(std::string filename, size_t initialSize=0)
+ bool openFile(std::string filename, size_t initialSize=0,
+ bool binary=false, bool append=false)
{
+ // close any open file first
+ if (m_open)
+ close();
+
bool success=false;
- if (mpiSize>1) {
+ if (mpiSize > 1) {
#ifdef ESYS_MPI
- // remove file first if it exists
- int error = 0;
int mpiErr;
- if (mpiRank == 0) {
- std::ifstream f(filename.c_str());
- if (f.is_open()) {
- f.close();
- if (std::remove(filename.c_str())) {
- error=1;
+ if (!append) {
+ // remove file first if it exists
+ int error = 0;
+ if (mpiRank == 0) {
+ std::ifstream f(filename.c_str());
+ if (f.is_open()) {
+ f.close();
+ if (std::remove(filename.c_str())) {
+ error=1;
+ }
}
}
- }
- MPI_Allreduce(&error, &mpiErr, 1, MPI_INT, MPI_MAX, mpiComm);
- if (mpiErr != 0) {
- std::cerr << "Error removing " << filename << "!" << std::endl;
- return false;
+ MPI_Allreduce(&error, &mpiErr, 1, MPI_INT, MPI_MAX, mpiComm);
+ if (mpiErr != 0) {
+ std::cerr << "Error removing " << filename << "!"
+ << std::endl;
+ return false;
+ }
}
MPI_Info mpiInfo = MPI_INFO_NULL;
int amode = MPI_MODE_CREATE|MPI_MODE_WRONLY|MPI_MODE_UNIQUE_OPEN;
+ if (append)
+ amode |= MPI_MODE_APPEND;
+
mpiErr = MPI_File_open(mpiComm, const_cast<char*>(filename.c_str()),
amode, mpiInfo, &fileHandle);
if (mpiErr == MPI_SUCCESS) {
@@ -73,28 +93,44 @@ public:
const_cast<char*>("native"), mpiInfo);
}
if (mpiErr == MPI_SUCCESS) {
- mpiErr = MPI_File_set_size(fileHandle, initialSize);
+ if (append) {
+ mpiErr = MPI_File_seek_shared(fileHandle, 0, MPI_SEEK_END);
+ } else {
+ mpiErr = MPI_File_set_size(fileHandle, initialSize);
+ }
}
if (mpiErr != MPI_SUCCESS) {
- std::cerr << "Error opening " << filename << " for parallel writing!" << std::endl;
+ char errorstr[MPI_MAX_ERROR_STRING];
+ int len;
+ MPI_Error_string(mpiErr, errorstr, &len);
+ std::cerr << "Error " << " opening " << filename
+ << " for parallel writing: " << errorstr << std::endl;
} else {
success=true;
}
#endif
} else {
- std::ios_base::openmode mode = std::ios_base::binary;
+ std::ios_base::openmode mode =
+ (binary ? std::ios_base::binary : std::ios_base::out);
+ if (append)
+ mode |= std::ios_base::app;
+
ofs.open(filename.c_str(), mode);
success = !ofs.fail();
- if (success && initialSize>0) {
+ if (success && initialSize>0 && !append) {
ofs.seekp(initialSize-1, ofs.beg).put(0).seekp(0, ofs.beg);
success = !ofs.fail();
}
}
+ m_open = success;
return success;
}
bool writeOrdered(std::ostringstream& oss)
{
+ if (!m_open)
+ return false;
+
bool success=false;
if (mpiSize>1) {
#ifdef ESYS_MPI
@@ -116,6 +152,9 @@ public:
bool writeShared(std::ostringstream& oss)
{
+ if (!m_open)
+ return false;
+
bool success=false;
if (mpiSize>1) {
#ifdef ESYS_MPI
@@ -137,6 +176,9 @@ public:
bool writeAt(std::ostringstream& oss, long offset)
{
+ if (!m_open)
+ return false;
+
bool success=false;
if (mpiSize>1) {
#ifdef ESYS_MPI
@@ -159,6 +201,9 @@ public:
void close()
{
+ if (!m_open)
+ return;
+
if (mpiSize>1) {
#ifdef ESYS_MPI
MPI_File_close(&fileHandle);
@@ -166,13 +211,15 @@ public:
} else {
ofs.close();
}
+ m_open = false;
}
private:
+ MPI_Comm mpiComm;
+ int mpiRank;
int mpiSize;
+ bool m_open;
#ifdef ESYS_MPI
- int mpiRank;
- MPI_Comm mpiComm;
MPI_File fileHandle;
#endif
std::ofstream ofs;
diff --git a/esysUtils/src/first.h b/esysUtils/src/first.h
index d1eb9c8..da9ce27 100644
--- a/esysUtils/src/first.h
+++ b/esysUtils/src/first.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2015 by The University of Queensland
+* Copyright (c) 2015-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/index.h b/esysUtils/src/index.h
index fe2edd0..c610f6e 100644
--- a/esysUtils/src/index.h
+++ b/esysUtils/src/index.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/maths.h b/esysUtils/src/maths.h
index 9b72304..20e19db 100644
--- a/esysUtils/src/maths.h
+++ b/esysUtils/src/maths.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/mem.h b/esysUtils/src/mem.h
index 74eb702..0caf626 100644
--- a/esysUtils/src/mem.h
+++ b/esysUtils/src/mem.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/pyerr.cpp b/esysUtils/src/pyerr.cpp
index ae66066..7e3121c 100644
--- a/esysUtils/src/pyerr.cpp
+++ b/esysUtils/src/pyerr.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2015 by The University of Queensland
+* Copyright (c) 2015-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/pyerr.h b/esysUtils/src/pyerr.h
index ab9c1c2..d159ac1 100644
--- a/esysUtils/src/pyerr.h
+++ b/esysUtils/src/pyerr.h
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2015 by The University of Queensland
+* Copyright (c) 2015-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/system_dep.h b/esysUtils/src/system_dep.h
index cf3acf7..3248558 100644
--- a/esysUtils/src/system_dep.h
+++ b/esysUtils/src/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/src/types.h b/esysUtils/src/types.h
index f6179be..a7a2abf 100644
--- a/esysUtils/src/types.h
+++ b/esysUtils/src/types.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2010-2015 by The University of Queensland
+* Copyright (c) 2010-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/test/EsysExceptionTestCase.cpp b/esysUtils/test/EsysExceptionTestCase.cpp
index 3eec5fa..db2ecdb 100644
--- a/esysUtils/test/EsysExceptionTestCase.cpp
+++ b/esysUtils/test/EsysExceptionTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/test/EsysExceptionTestCase.h b/esysUtils/test/EsysExceptionTestCase.h
index 98b0065..0507d1a 100644
--- a/esysUtils/test/EsysExceptionTestCase.h
+++ b/esysUtils/test/EsysExceptionTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/test/EsysFileWriterTestCase.cpp b/esysUtils/test/EsysFileWriterTestCase.cpp
index 8082482..199745d 100644
--- a/esysUtils/test/EsysFileWriterTestCase.cpp
+++ b/esysUtils/test/EsysFileWriterTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/test/EsysFileWriterTestCase.h b/esysUtils/test/EsysFileWriterTestCase.h
index 46925c4..425dfb8 100644
--- a/esysUtils/test/EsysFileWriterTestCase.h
+++ b/esysUtils/test/EsysFileWriterTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/test/SConscript b/esysUtils/test/SConscript
index 44b1cab..643db75 100644
--- a/esysUtils/test/SConscript
+++ b/esysUtils/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/esysUtils/test/esysUtils_UnitTest.cpp b/esysUtils/test/esysUtils_UnitTest.cpp
index a5033d9..2b04233 100644
--- a/esysUtils/test/esysUtils_UnitTest.cpp
+++ b/esysUtils/test/esysUtils_UnitTest.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/benchmarks/finleybench.py b/finley/benchmarks/finleybench.py
index f3f84d0..88ea826 100644
--- a/finley/benchmarks/finleybench.py
+++ b/finley/benchmarks/finleybench.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/benchmarks/runbenchmark.py b/finley/benchmarks/runbenchmark.py
index 8489d8c..6eefd77 100755
--- a/finley/benchmarks/runbenchmark.py
+++ b/finley/benchmarks/runbenchmark.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/py_src/SConscript b/finley/py_src/SConscript
index 0d6fa16..911cd1a 100644
--- a/finley/py_src/SConscript
+++ b/finley/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/finley/py_src/__init__.py b/finley/py_src/__init__.py
index be066a0..4f9f653 100644
--- a/finley/py_src/__init__.py
+++ b/finley/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,11 +19,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/finley/py_src/factorywrappers.py b/finley/py_src/factorywrappers.py
index d0da25a..4de0dd9 100644
--- a/finley/py_src/factorywrappers.py
+++ b/finley/py_src/factorywrappers.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2011-2015 by The University of Queensland
+# Copyright (c) 2011-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2011-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2011-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/finley/py_src/readers.py b/finley/py_src/readers.py
index 9579902..91b8610 100644
--- a/finley/py_src/readers.py
+++ b/finley/py_src/readers.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/src/Assemble.h b/finley/src/Assemble.h
index 1ed93c8..098c257 100644
--- a/finley/src/Assemble.h
+++ b/finley/src/Assemble.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_AverageElementData.cpp b/finley/src/Assemble_AverageElementData.cpp
index 0e84930..fd23f58 100644
--- a/finley/src/Assemble_AverageElementData.cpp
+++ b/finley/src/Assemble_AverageElementData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -53,7 +53,7 @@ void Assemble_AverageElementData(const ElementFile* elements,
}
// check out and in
- const int numElements=elements->numElements;
+ const dim_t numElements=elements->numElements;
const int numComps=out.getDataPointSize();
if (numComps != in.getDataPointSize()) {
@@ -71,7 +71,7 @@ void Assemble_AverageElementData(const ElementFile* elements,
const double volinv=1./vol;
out.requireWrite();
#pragma omp parallel for
- for (int n=0; n<numElements; n++) {
+ for (index_t n=0; n<numElements; n++) {
const double *in_array = in.getSampleDataRO(n);
double *out_array = out.getSampleDataRW(n);
for (int i=0; i<numComps; ++i) {
@@ -87,7 +87,7 @@ void Assemble_AverageElementData(const ElementFile* elements,
const size_t numComps_size=numComps*sizeof(double);
out.requireWrite();
#pragma omp parallel for
- for (int n=0; n<numElements; n++) {
+ for (index_t n=0; n<numElements; n++) {
const double *in_array = in.getSampleDataRO(n);
double *out_array = out.getSampleDataRW(n);
for (int q=0; q<numQuad_out; q++)
diff --git a/finley/src/Assemble_CopyElementData.cpp b/finley/src/Assemble_CopyElementData.cpp
index 2f319ec..68254db 100644
--- a/finley/src/Assemble_CopyElementData.cpp
+++ b/finley/src/Assemble_CopyElementData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -44,7 +44,7 @@ void Assemble_CopyElementData(const ElementFile* elements, escript::Data& out,
numQuad=elements->referenceElementSet->referenceElement->Parametrization->numQuadNodes;
}
- const int numElements=elements->numElements;
+ const dim_t numElements=elements->numElements;
const int numComps=out.getDataPointSize();
if (numComps != in.getDataPointSize()) {
@@ -60,13 +60,13 @@ void Assemble_CopyElementData(const ElementFile* elements, escript::Data& out,
const size_t len_size=numComps*numQuad*sizeof(double);
out.requireWrite();
#pragma omp parallel for
- for (int n=0; n<numElements; n++)
+ for (index_t n=0; n<numElements; n++)
memcpy(out.getSampleDataRW(n), in.getSampleDataRO(n), len_size);
} else {
const size_t len_size=numComps*sizeof(double);
out.requireWrite();
#pragma omp parallel for
- for (int n=0; n<numElements; n++) {
+ for (index_t n=0; n<numElements; n++) {
const double *in_array = in.getSampleDataRO(n);
double *out_array = out.getSampleDataRW(n);
for (int q=0; q<numQuad; q++)
diff --git a/finley/src/Assemble_CopyNodalData.cpp b/finley/src/Assemble_CopyNodalData.cpp
index 895f149..0821391 100644
--- a/finley/src/Assemble_CopyNodalData.cpp
+++ b/finley/src/Assemble_CopyNodalData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_LumpedSystem.cpp b/finley/src/Assemble_LumpedSystem.cpp
index 6fe7ccc..361ef34 100644
--- a/finley/src/Assemble_LumpedSystem.cpp
+++ b/finley/src/Assemble_LumpedSystem.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_NodeCoordinates.cpp b/finley/src/Assemble_NodeCoordinates.cpp
index 115a260..21cfe5a 100644
--- a/finley/src/Assemble_NodeCoordinates.cpp
+++ b/finley/src/Assemble_NodeCoordinates.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE.cpp b/finley/src/Assemble_PDE.cpp
index af9fb8d..2768c01 100644
--- a/finley/src/Assemble_PDE.cpp
+++ b/finley/src/Assemble_PDE.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_Points.cpp b/finley/src/Assemble_PDE_Points.cpp
index 23f7291..830951a 100644
--- a/finley/src/Assemble_PDE_Points.cpp
+++ b/finley/src/Assemble_PDE_Points.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_Single_1D.cpp b/finley/src/Assemble_PDE_Single_1D.cpp
index 30f3485..7438e63 100644
--- a/finley/src/Assemble_PDE_Single_1D.cpp
+++ b/finley/src/Assemble_PDE_Single_1D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_Single_2D.cpp b/finley/src/Assemble_PDE_Single_2D.cpp
index 51edfb9..5c4b535 100644
--- a/finley/src/Assemble_PDE_Single_2D.cpp
+++ b/finley/src/Assemble_PDE_Single_2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_Single_3D.cpp b/finley/src/Assemble_PDE_Single_3D.cpp
index d253384..dd7d250 100644
--- a/finley/src/Assemble_PDE_Single_3D.cpp
+++ b/finley/src/Assemble_PDE_Single_3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_Single_C.cpp b/finley/src/Assemble_PDE_Single_C.cpp
index a24598f..fe27d79 100644
--- a/finley/src/Assemble_PDE_Single_C.cpp
+++ b/finley/src/Assemble_PDE_Single_C.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_System_1D.cpp b/finley/src/Assemble_PDE_System_1D.cpp
index 1b42afa..978a181 100644
--- a/finley/src/Assemble_PDE_System_1D.cpp
+++ b/finley/src/Assemble_PDE_System_1D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_System_2D.cpp b/finley/src/Assemble_PDE_System_2D.cpp
index 4949cd7..ffcda51 100644
--- a/finley/src/Assemble_PDE_System_2D.cpp
+++ b/finley/src/Assemble_PDE_System_2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_System_3D.cpp b/finley/src/Assemble_PDE_System_3D.cpp
index 422b3bd..b7d8681 100644
--- a/finley/src/Assemble_PDE_System_3D.cpp
+++ b/finley/src/Assemble_PDE_System_3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_PDE_System_C.cpp b/finley/src/Assemble_PDE_System_C.cpp
index faa22ba..dd7f63e 100644
--- a/finley/src/Assemble_PDE_System_C.cpp
+++ b/finley/src/Assemble_PDE_System_C.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_addToSystemMatrix.cpp b/finley/src/Assemble_addToSystemMatrix.cpp
index 75217c6..7b20009 100644
--- a/finley/src/Assemble_addToSystemMatrix.cpp
+++ b/finley/src/Assemble_addToSystemMatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_getAssembleParameters.cpp b/finley/src/Assemble_getAssembleParameters.cpp
index ef420b4..a035979 100644
--- a/finley/src/Assemble_getAssembleParameters.cpp
+++ b/finley/src/Assemble_getAssembleParameters.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_getNormal.cpp b/finley/src/Assemble_getNormal.cpp
index a1d913c..3284ab9 100644
--- a/finley/src/Assemble_getNormal.cpp
+++ b/finley/src/Assemble_getNormal.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_getSize.cpp b/finley/src/Assemble_getSize.cpp
index b4264df..db45720 100644
--- a/finley/src/Assemble_getSize.cpp
+++ b/finley/src/Assemble_getSize.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -74,7 +74,7 @@ void Assemble_getSize(const NodeFile* nodes, const ElementFile* elements,
{
std::vector<double> local_X(NN*numDim);
#pragma omp parallel for
- for (int e=0; e<elements->numElements; e++) {
+ for (index_t e=0; e<elements->numElements; e++) {
// gather local coordinates of nodes into
// local_X(numDim,NN):
util::gather(NS, &(elements->Nodes[INDEX2(node_offset,e,NN)]),
diff --git a/finley/src/Assemble_gradient.cpp b/finley/src/Assemble_gradient.cpp
index 916943c..4a506ec 100644
--- a/finley/src/Assemble_gradient.cpp
+++ b/finley/src/Assemble_gradient.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_integrate.cpp b/finley/src/Assemble_integrate.cpp
index 6950c4d..9207bb3 100644
--- a/finley/src/Assemble_integrate.cpp
+++ b/finley/src/Assemble_integrate.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_interpolate.cpp b/finley/src/Assemble_interpolate.cpp
index efdd378..b6a53e0 100644
--- a/finley/src/Assemble_interpolate.cpp
+++ b/finley/src/Assemble_interpolate.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Assemble_jacobians.cpp b/finley/src/Assemble_jacobians.cpp
index 369e0af..a8be9b0 100644
--- a/finley/src/Assemble_jacobians.cpp
+++ b/finley/src/Assemble_jacobians.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/FinleyAdapterException.cpp b/finley/src/CPPAdapter/FinleyAdapterException.cpp
index f6f6a30..6cd6851 100644
--- a/finley/src/CPPAdapter/FinleyAdapterException.cpp
+++ b/finley/src/CPPAdapter/FinleyAdapterException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/FinleyAdapterException.h b/finley/src/CPPAdapter/FinleyAdapterException.h
index c2d75ce..0890205 100644
--- a/finley/src/CPPAdapter/FinleyAdapterException.h
+++ b/finley/src/CPPAdapter/FinleyAdapterException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/MeshAdapter.cpp b/finley/src/CPPAdapter/MeshAdapter.cpp
index 3e03052..4043b00 100644
--- a/finley/src/CPPAdapter/MeshAdapter.cpp
+++ b/finley/src/CPPAdapter/MeshAdapter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -1374,7 +1374,8 @@ void MeshAdapter::setNewX(const escript::Data& new_x)
bool MeshAdapter::ownSample(int fs_code, index_t id) const
{
- if (getMPISize() > 1) {
+ if (getMPISize() > 1 && fs_code != FINLEY_DEGREES_OF_FREEDOM &&
+ fs_code != FINLEY_REDUCED_DEGREES_OF_FREEDOM) {
#ifdef ESYS_MPI
index_t myFirstNode=0, myLastNode=0;
index_t* globalNodeIndex = NULL;
diff --git a/finley/src/CPPAdapter/MeshAdapter.h b/finley/src/CPPAdapter/MeshAdapter.h
index 2664651..0120b02 100644
--- a/finley/src/CPPAdapter/MeshAdapter.h
+++ b/finley/src/CPPAdapter/MeshAdapter.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/MeshAdapterFactory.cpp b/finley/src/CPPAdapter/MeshAdapterFactory.cpp
index 0baeb42..d01769d 100644
--- a/finley/src/CPPAdapter/MeshAdapterFactory.cpp
+++ b/finley/src/CPPAdapter/MeshAdapterFactory.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/MeshAdapterFactory.h b/finley/src/CPPAdapter/MeshAdapterFactory.h
index 31be8bb..f82e0ee 100644
--- a/finley/src/CPPAdapter/MeshAdapterFactory.h
+++ b/finley/src/CPPAdapter/MeshAdapterFactory.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/finleycpp.cpp b/finley/src/CPPAdapter/finleycpp.cpp
index 6de0316..7ee1207 100644
--- a/finley/src/CPPAdapter/finleycpp.cpp
+++ b/finley/src/CPPAdapter/finleycpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/CPPAdapter/system_dep.h b/finley/src/CPPAdapter/system_dep.h
index 36798eb..1373684 100644
--- a/finley/src/CPPAdapter/system_dep.h
+++ b/finley/src/CPPAdapter/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/ElementFile.cpp b/finley/src/ElementFile.cpp
index ec6baea..7897673 100644
--- a/finley/src/ElementFile.cpp
+++ b/finley/src/ElementFile.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -111,8 +111,8 @@ void ElementFile::freeTable()
/// copies element file 'in' into this element file starting from 'offset'.
/// The elements offset to in->numElements+offset-1 will be overwritten
-void ElementFile::copyTable(int offset, int nodeOffset, int idOffset,
- const ElementFile* in)
+void ElementFile::copyTable(index_t offset, index_t nodeOffset,
+ index_t idOffset, const ElementFile* in)
{
const int NN_in=in->numNodes;
if (NN_in > numNodes) {
@@ -131,12 +131,12 @@ void ElementFile::copyTable(int offset, int nodeOffset, int idOffset,
}
}
-void ElementFile::gather(int* index, const ElementFile* in)
+void ElementFile::gather(index_t* index, const ElementFile* in)
{
const int NN_in=in->numNodes;
#pragma omp parallel for
for (index_t e=0; e<numElements; e++) {
- const int k=index[e];
+ const index_t k=index[e];
Id[e]=in->Id[k];
Tag[e]=in->Tag[k];
Owner[e]=in->Owner[k];
@@ -150,12 +150,12 @@ void ElementFile::gather(int* index, const ElementFile* in)
/// scatters the ElementFile in into this ElementFile.
/// A conservative assumption on the coloring is made.
-void ElementFile::scatter(int* index, const ElementFile* in)
+void ElementFile::scatter(index_t* index, const ElementFile* in)
{
const int NN_in=in->numNodes;
#pragma omp parallel for
for (index_t e=0; e<in->numElements; e++) {
- const int k=index[e];
+ const index_t k=index[e];
Owner[k]=in->Owner[e];
Id[k]=in->Id[e];
Tag[k]=in->Tag[e];
@@ -187,7 +187,7 @@ void ElementFile::optimizeOrdering()
const int NN=referenceElementSet->getNumNodes();
util::ValueAndIndexList item_list(numElements);
- int *index=new int[numElements];
+ index_t *index=new index_t[numElements];
ElementFile* out=new ElementFile(referenceElementSet, MPIInfo);
out->allocTable(numElements);
if (noError()) {
@@ -222,7 +222,7 @@ void ElementFile::relabelNodes(const std::vector<index_t>& newNode, index_t offs
}
}
-void ElementFile::setTags(const int newTag, const escript::Data& mask)
+void ElementFile::setTags(int newTag, const escript::Data& mask)
{
resetError();
@@ -404,22 +404,22 @@ void ElementFile::distributeByRankOfDOF(const std::vector<int>& mpiRankOfDOF, in
// count the number of elements that have to be sent to each processor
// (send_count) and define a new element owner as the processor with
// the largest number of DOFs and the smallest id
- std::vector<int> send_count(size);
- std::vector<int> recv_count(size);
+ std::vector<dim_t> send_count(size);
+ std::vector<dim_t> recv_count(size);
std::vector<int> newOwner(numElements);
#pragma omp parallel
{
- std::vector<int> loc_send_count(size);
+ std::vector<dim_t> loc_send_count(size);
#pragma omp for
for (index_t e=0; e<numElements; e++) {
if (Owner[e] == myRank) {
newOwner[e]=myRank;
- std::vector<int> loc_proc_mask(size);
+ std::vector<dim_t> loc_proc_mask(size);
for (int j=0; j<numNodes; j++) {
const int p=mpiRankOfDOF[Nodes[INDEX2(j,e,numNodes)]];
loc_proc_mask[p]++;
}
- int loc_proc_mask_max=0;
+ dim_t loc_proc_mask_max=0;
for (int p=0; p<size; ++p) {
if (loc_proc_mask[p] > 0)
loc_send_count[p]++;
@@ -438,11 +438,11 @@ void ElementFile::distributeByRankOfDOF(const std::vector<int>& mpiRankOfDOF, in
send_count[p]+=loc_send_count[p];
}
}
- MPI_Alltoall(&send_count[0], 1, MPI_INT, &recv_count[0], 1, MPI_INT,
+ MPI_Alltoall(&send_count[0], 1, MPI_DIM_T, &recv_count[0], 1, MPI_DIM_T,
MPIInfo->comm);
// get the new number of elements for this processor
- index_t newNumElements=0;
- int numElementsInBuffer=0;
+ dim_t newNumElements=0;
+ dim_t numElementsInBuffer=0;
for (int p=0; p<size; ++p) {
newNumElements+=recv_count[p];
numElementsInBuffer+=send_count[p];
@@ -452,8 +452,8 @@ void ElementFile::distributeByRankOfDOF(const std::vector<int>& mpiRankOfDOF, in
std::vector<int> Tag_buffer(numElementsInBuffer);
std::vector<int> Owner_buffer(numElementsInBuffer);
std::vector<index_t> Nodes_buffer(numElementsInBuffer*numNodes);
- std::vector<int> send_offset(size);
- std::vector<int> recv_offset(size);
+ std::vector<index_t> send_offset(size);
+ std::vector<index_t> recv_offset(size);
std::vector<unsigned char> proc_mask(size);
// calculate the offsets for the processor buffers
@@ -471,7 +471,7 @@ void ElementFile::distributeByRankOfDOF(const std::vector<int>& mpiRankOfDOF, in
for (int j=0; j<numNodes; j++) {
const int p=mpiRankOfDOF[Nodes[INDEX2(j,e,numNodes)]];
if (proc_mask[p]) {
- int k=send_offset[p]+send_count[p];
+ index_t k=send_offset[p]+send_count[p];
Id_buffer[k]=Id[e];
Tag_buffer[k]=Tag[e];
Owner_buffer[k]=newOwner[e];
diff --git a/finley/src/ElementFile.h b/finley/src/ElementFile.h
index d1928e0..f0db791 100644
--- a/finley/src/ElementFile.h
+++ b/finley/src/ElementFile.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -74,9 +74,9 @@ public:
/// assigns new node reference numbers to the elements
void relabelNodes(const std::vector<index_t>& newNode, index_t offset);
void markNodes(std::vector<short>& mask, int offset, bool useLinear);
- void scatter(int* index, const ElementFile* in);
- void gather(int* index, const ElementFile* in);
- void copyTable(int offset, int nodeOffset, int idOffset,
+ void scatter(index_t* index, const ElementFile* in);
+ void gather(index_t* index, const ElementFile* in);
+ void copyTable(index_t offset, index_t nodeOffset, index_t idOffset,
const ElementFile* in);
void markDOFsConnectedToRange(int* mask, int offset, int marker,
diff --git a/finley/src/ElementFile_jacobians.cpp b/finley/src/ElementFile_jacobians.cpp
index bde92a7..8d66942 100644
--- a/finley/src/ElementFile_jacobians.cpp
+++ b/finley/src/ElementFile_jacobians.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Finley.cpp b/finley/src/Finley.cpp
index f729bae..910a957 100644
--- a/finley/src/Finley.cpp
+++ b/finley/src/Finley.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Finley.h b/finley/src/Finley.h
index d5029bc..5464e82 100644
--- a/finley/src/Finley.h
+++ b/finley/src/Finley.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/FinleyVersion.h b/finley/src/FinleyVersion.h
index 5250095..98c4f4c 100644
--- a/finley/src/FinleyVersion.h
+++ b/finley/src/FinleyVersion.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -18,6 +18,6 @@
#ifndef INC_FINLEYVERSION
#define INC_FINLEYVERSION
-char Finley_Version[]="$Revision: 5593 $";
+char Finley_Version[]="$Revision: 6109 $";
#endif
diff --git a/finley/src/IndexList.cpp b/finley/src/IndexList.cpp
index 7801a22..dceede4 100644
--- a/finley/src/IndexList.cpp
+++ b/finley/src/IndexList.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/IndexList.h b/finley/src/IndexList.h
index ad6e9fb..b858261 100644
--- a/finley/src/IndexList.h
+++ b/finley/src/IndexList.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh.cpp b/finley/src/Mesh.cpp
index a26df2a..da1dd6e 100644
--- a/finley/src/Mesh.cpp
+++ b/finley/src/Mesh.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh.h b/finley/src/Mesh.h
index eaaa367..8eb788e 100644
--- a/finley/src/Mesh.h
+++ b/finley/src/Mesh.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -131,6 +131,12 @@ private:
void optimizeElementOrdering();
void setOrders();
void updateTagList();
+ void printElementInfo(const ElementFile* e, const std::string title,
+ const std::string defaultType, bool full) const;
+
+ void writeElementInfo(std::ostream& stream, const ElementFile* e,
+ const std::string defaultType) const;
+
static Mesh* readGmshSlave(esysUtils::JMPI& mpi_info, const std::string fname,
int numDim, int order, int reducedOrder,
bool optimize, bool useMacroElements);
diff --git a/finley/src/Mesh_addPoints.cpp b/finley/src/Mesh_addPoints.cpp
index 04a3a0b..adb6817 100644
--- a/finley/src/Mesh_addPoints.cpp
+++ b/finley/src/Mesh_addPoints.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_findMatchingFaces.cpp b/finley/src/Mesh_findMatchingFaces.cpp
index 670724c..a1ae16e 100644
--- a/finley/src/Mesh_findMatchingFaces.cpp
+++ b/finley/src/Mesh_findMatchingFaces.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_getPattern.cpp b/finley/src/Mesh_getPattern.cpp
index f7d721f..74e0e07 100644
--- a/finley/src/Mesh_getPattern.cpp
+++ b/finley/src/Mesh_getPattern.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_glueFaces.cpp b/finley/src/Mesh_glueFaces.cpp
index aeba92b..5a24c61 100644
--- a/finley/src/Mesh_glueFaces.cpp
+++ b/finley/src/Mesh_glueFaces.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -56,7 +56,7 @@ void Mesh::glueFaces(double safety_factor, double tolerance, bool optimize)
// allocate work arrays
int* elem1=new int[FaceElements->numElements];
int* elem0=new int[FaceElements->numElements];
- std::vector<int> elem_mask(FaceElements->numElements, 0);
+ std::vector<index_t> elem_mask(FaceElements->numElements, 0);
int* matching_nodes_in_elem1=new int[FaceElements->numElements*NN];
std::vector<index_t> new_node_label(Nodes->numNodes);
// find the matching face elements
diff --git a/finley/src/Mesh_hex20.cpp b/finley/src/Mesh_hex20.cpp
index 35c0762..61fa39b 100644
--- a/finley/src/Mesh_hex20.cpp
+++ b/finley/src/Mesh_hex20.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_hex8.cpp b/finley/src/Mesh_hex8.cpp
index 2967b7f..a5cbc9c 100644
--- a/finley/src/Mesh_hex8.cpp
+++ b/finley/src/Mesh_hex8.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_joinFaces.cpp b/finley/src/Mesh_joinFaces.cpp
index 4bbf319..3d0f53b 100644
--- a/finley/src/Mesh_joinFaces.cpp
+++ b/finley/src/Mesh_joinFaces.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -67,7 +67,7 @@ void Mesh::joinFaces(double safety_factor, double tolerance, bool optimize)
// allocate work arrays
int* elem1=new int[FaceElements->numElements];
int* elem0=new int[FaceElements->numElements];
- int* elem_mask=new int[FaceElements->numElements];
+ index_t* elem_mask=new index_t[FaceElements->numElements];
int* matching_nodes_in_elem1=new int[FaceElements->numElements*NN];
// find the matching face elements
@@ -76,15 +76,15 @@ void Mesh::joinFaces(double safety_factor, double tolerance, bool optimize)
if (noError()) {
// get a list of the face elements to be kept
#pragma omp parallel for
- for (int e=0; e<FaceElements->numElements; e++)
+ for (index_t e=0; e<FaceElements->numElements; e++)
elem_mask[e]=1;
for (int e=0; e<numPairs; e++) {
elem_mask[elem0[e]]=0;
elem_mask[elem1[e]]=0;
}
- int new_numFaceElements=0;
+ dim_t new_numFaceElements=0;
// OMP
- for (int e=0; e<FaceElements->numElements; e++) {
+ for (index_t e=0; e<FaceElements->numElements; e++) {
if (elem_mask[e]>0) {
elem_mask[new_numFaceElements]=e;
new_numFaceElements++;
@@ -101,7 +101,7 @@ void Mesh::joinFaces(double safety_factor, double tolerance, bool optimize)
newFaceElementsFile->gather(elem_mask, FaceElements);
// get the contact elements which are still in use
newContactElementsFile->copyTable(0, 0, 0, ContactElements);
- int c=ContactElements->numElements;
+ dim_t c=ContactElements->numElements;
// OMP
for (int e=0; e<numPairs; e++) {
const int e0=elem0[e];
diff --git a/finley/src/Mesh_merge.cpp b/finley/src/Mesh_merge.cpp
index 9fbcc46..51e570d 100644
--- a/finley/src/Mesh_merge.cpp
+++ b/finley/src/Mesh_merge.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_optimizeDOFDistribution.cpp b/finley/src/Mesh_optimizeDOFDistribution.cpp
index daeddbd..e109880 100644
--- a/finley/src/Mesh_optimizeDOFDistribution.cpp
+++ b/finley/src/Mesh_optimizeDOFDistribution.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -84,7 +84,7 @@ void Mesh::optimizeDOFDistribution(std::vector<index_t>& distribution)
index_t len=0;
for (int p=0; p<mpiSize; ++p)
len=std::max(len, distribution[p+1]-distribution[p]);
- std::vector<int> partition(len);
+ std::vector<index_t> partition(len);
#ifdef USE_PARMETIS
if (mpiSize>1 && allRanksHaveNodes(MPIInfo, distribution)) {
@@ -123,19 +123,21 @@ void Mesh::optimizeDOFDistribution(std::vector<index_t>& distribution)
}
}
- int wgtflag = 0;
- int numflag = 0;
- int ncon = 1;
- int edgecut;
+ index_t wgtflag = 0;
+ index_t numflag = 0;
+ index_t ncon = 1;
+ index_t edgecut;
+ index_t impiSize = mpiSize;
+ index_t idim = dim;
// options[0]=1 -> non-default values, evaluate rest of options
// options[1]=15 -> DBG_TIME | DBG_INFO | DBG_PROGRESS | DBG_REFINEINFO
// options[2] -> random seed
- int options[3] = { 1, 15, 0 };
+ index_t options[3] = { 1, 15, 0 };
std::vector<real_t> tpwgts(ncon*mpiSize, 1.f/mpiSize);
std::vector<real_t> ubvec(ncon, 1.05f);
ParMETIS_V3_PartGeomKway(&distribution[0], pattern->ptr, pattern->index,
- NULL, NULL, &wgtflag, &numflag, &dim, &xyz[0],
- &ncon, &mpiSize, &tpwgts[0], &ubvec[0], options,
+ NULL, NULL, &wgtflag, &numflag, &idim, &xyz[0],
+ &ncon, &impiSize, &tpwgts[0], &ubvec[0], options,
&edgecut, &partition[0], &MPIInfo->comm);
} else {
for (index_t i=0; i<myNumVertices; ++i)
@@ -160,7 +162,7 @@ void Mesh::optimizeDOFDistribution(std::vector<index_t>& distribution)
new_distribution[i]+=loc_partition_count[i];
}
}
- int *recvbuf=new int[mpiSize*mpiSize];
+ index_t *recvbuf=new index_t[mpiSize*mpiSize];
#ifdef ESYS_MPI
// recvbuf will be the concatenation of each CPU's contribution to
// new_distribution
@@ -173,7 +175,7 @@ void Mesh::optimizeDOFDistribution(std::vector<index_t>& distribution)
new_distribution[0]=0;
std::vector<index_t> newGlobalDOFID(len);
for (int rank=0; rank<mpiSize; rank++) {
- int c=0;
+ index_t c=0;
for (int i=0; i<myRank; ++i)
c+=recvbuf[rank+mpiSize*i];
for (index_t i=0; i<myNumVertices; ++i) {
diff --git a/finley/src/Mesh_read.cpp b/finley/src/Mesh_read.cpp
index a25b709..110f703 100644
--- a/finley/src/Mesh_read.cpp
+++ b/finley/src/Mesh_read.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_readGmsh.cpp b/finley/src/Mesh_readGmsh.cpp
index 4b8e2b7..8e49896 100644
--- a/finley/src/Mesh_readGmsh.cpp
+++ b/finley/src/Mesh_readGmsh.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_rec4.cpp b/finley/src/Mesh_rec4.cpp
index 6ec1d71..9c42f9b 100644
--- a/finley/src/Mesh_rec4.cpp
+++ b/finley/src/Mesh_rec4.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_rec8.cpp b/finley/src/Mesh_rec8.cpp
index 25fb748..4c2d6cb 100644
--- a/finley/src/Mesh_rec8.cpp
+++ b/finley/src/Mesh_rec8.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Mesh_write.cpp b/finley/src/Mesh_write.cpp
index c3bf992..169b15e 100644
--- a/finley/src/Mesh_write.cpp
+++ b/finley/src/Mesh_write.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -32,105 +32,125 @@ using std::cout;
using std::endl;
using std::ios;
using std::setw;
+using std::string;
namespace finley {
-/// writes the mesh to the external file fname using the Finley file format
-void Mesh::write(const std::string fname) const
+// private
+void Mesh::writeElementInfo(std::ostream& stream, const ElementFile* e,
+ const string defaultType) const
+{
+ if (e != NULL) {
+ stream << e->referenceElementSet->referenceElement->Type->Name
+ << " " << e->numElements << endl;
+ const int NN = e->numNodes;
+ for (index_t i=0; i < e->numElements; i++) {
+ stream << e->Id[i] << " " << e->Tag[i];
+ for (int j=0; j<NN; j++)
+ stream << " " << Nodes->Id[e->Nodes[INDEX2(j,i,NN)]];
+ stream << endl;
+ }
+ } else {
+ stream << defaultType << " 0" << endl;
+ }
+}
+
+// private
+void Mesh::printElementInfo(const ElementFile* e, const string title,
+ const string defaultType, bool full) const
+{
+ if (e != NULL) {
+ dim_t mine=0, overlap=0;
+ for (index_t i=0; i < e->numElements; i++) {
+ if (e->Owner[i] == MPIInfo->rank)
+ mine++;
+ else
+ overlap++;
+ }
+ cout << "\t" << title << ": "
+ << e->referenceElementSet->referenceElement->Type->Name
+ << " " << e->numElements << " (TypeId="
+ << e->referenceElementSet->referenceElement->Type->TypeId
+ << ") owner=" << mine << " overlap=" << overlap << endl;
+ if (full) {
+ const int NN = e->numNodes;
+ cout << "\t Id Tag Owner Color: Nodes" << endl;
+ for (index_t i=0; i < e->numElements; i++) {
+ cout << "\t" << setw(7) << e->Id[i]
+ << setw(6) << e->Tag[i]
+ << setw(6) << e->Owner[i]
+ << setw(6) << e->Color[i] << ": ";
+ for (int j=0; j<NN; j++)
+ cout << setw(6) << Nodes->Id[e->Nodes[INDEX2(j,i,NN)]];
+ cout << endl;
+ }
+ }
+ } else {
+ cout << "\t" << title << ": " << defaultType << " 0" << endl;
+ }
+}
+
+
+/// writes the mesh to an external file using the 'fly' file format
+void Mesh::write(const string filename) const
{
if (MPIInfo->size >1) {
- setError(IO_ERROR, "Mesh_write: only single processor runs are supported.");
+ setError(IO_ERROR, "Mesh::write: only single rank runs are supported.");
return;
}
- // open file
- FILE* f=fopen(fname.c_str(), "w");
- if (f==NULL) {
- char error_msg[LenErrorMsg_MAX];
- sprintf(error_msg, "Mesh_write: Opening file %s for writing failed.",fname.c_str());
- setError(IO_ERROR,error_msg);
+
+ std::ofstream f(filename.c_str());
+ if (!f.is_open()) {
+ std::stringstream ss;
+ ss << "Mesh::write: Opening file " << filename << " for writing failred.";
+ string err(ss.str());
+ setError(IO_ERROR, err.c_str());
return;
}
// write header
- fprintf(f, "%s\n", m_name.c_str());
+ f << m_name << endl;
- // write nodes:
+ // write nodes
if (Nodes != NULL) {
const int numDim = getDim();
- fprintf(f,"%1dD-Nodes %d\n", numDim, Nodes->numNodes);
+ f << numDim << "D-Nodes " << Nodes->numNodes << endl;
for (index_t i=0; i<Nodes->numNodes; i++) {
- fprintf(f,"%d %d %d",Nodes->Id[i],Nodes->globalDegreesOfFreedom[i],Nodes->Tag[i]);
+ f << Nodes->Id[i] << " " << Nodes->globalDegreesOfFreedom[i]
+ << " " << Nodes->Tag[i];
+ f.setf(ios::scientific, ios::floatfield);
+ f.precision(15);
for (int j=0; j<numDim; j++)
- fprintf(f," %20.15e",Nodes->Coordinates[INDEX2(j,i,numDim)]);
- fprintf(f,"\n");
+ f << " " << Nodes->Coordinates[INDEX2(j,i,numDim)];
+ f << endl;
}
} else {
- fprintf(f,"0D-Nodes 0\n");
+ f << "0D-Nodes 0" << endl;
}
- // write elements:
- if (Elements != NULL) {
- fprintf(f, "%s %d\n",Elements->referenceElementSet->referenceElement->Type->Name,Elements->numElements);
- const int NN=Elements->numNodes;
- for (index_t i=0; i<Elements->numElements; i++) {
- fprintf(f,"%d %d",Elements->Id[i],Elements->Tag[i]);
- for (int j=0; j<NN; j++)
- fprintf(f," %d",Nodes->Id[Elements->Nodes[INDEX2(j,i,NN)]]);
- fprintf(f,"\n");
- }
- } else {
- fprintf(f,"Tet4 0\n");
- }
+ // write elements
+ writeElementInfo(f, Elements, "Tet4");
- // write face elements:
- if (FaceElements != NULL) {
- fprintf(f, "%s %d\n", FaceElements->referenceElementSet->referenceElement->Type->Name,FaceElements->numElements);
- const int NN=FaceElements->numNodes;
- for (index_t i=0; i<FaceElements->numElements; i++) {
- fprintf(f,"%d %d",FaceElements->Id[i],FaceElements->Tag[i]);
- for (int j=0; j<NN; j++)
- fprintf(f," %d",Nodes->Id[FaceElements->Nodes[INDEX2(j,i,NN)]]);
- fprintf(f,"\n");
- }
- } else {
- fprintf(f,"Tri3 0\n");
- }
+ // write face elements
+ writeElementInfo(f, FaceElements, "Tri3");
- // write contact elements:
- if (ContactElements != NULL) {
- fprintf(f, "%s %d\n",ContactElements->referenceElementSet->referenceElement->Type->Name,ContactElements->numElements);
- const int NN=ContactElements->numNodes;
- for (index_t i=0; i<ContactElements->numElements; i++) {
- fprintf(f,"%d %d",ContactElements->Id[i],ContactElements->Tag[i]);
- for (int j=0; j<NN; j++)
- fprintf(f," %d",Nodes->Id[ContactElements->Nodes[INDEX2(j,i,NN)]]);
- fprintf(f,"\n");
- }
- } else {
- fprintf(f,"Tri3_Contact 0\n");
- }
+ // write contact elements
+ writeElementInfo(f, ContactElements, "Tri3_Contact");
- // write points:
- if (Points != NULL) {
- fprintf(f, "%s %d\n",Points->referenceElementSet->referenceElement->Type->Name,Points->numElements);
- for (index_t i=0; i<Points->numElements; i++) {
- fprintf(f,"%d %d %d\n",Points->Id[i],Points->Tag[i],Nodes->Id[Points->Nodes[INDEX2(0,i,1)]]);
- }
- } else {
- fprintf(f,"Point1 0\n");
- }
+ // write points
+ writeElementInfo(f, Points, "Point1");
- // write tags:
+ // write tags
if (tagMap.size() > 0) {
- fprintf(f, "Tags\n");
+ f << "Tags" << endl;
TagMap::const_iterator it;
for (it=tagMap.begin(); it!=tagMap.end(); it++) {
- fprintf(f, "%s %d\n", it->first.c_str(), it->second);
+ f << it->first << " " << it->second << endl;
}
}
- fclose(f);
+ f.close();
#ifdef Finley_TRACE
- cout << "mesh " << m_name << " has been written to file " << fname << endl;
+ cout << "mesh " << m_name << " has been written to file " << filename << endl;
#endif
}
@@ -144,7 +164,7 @@ void Mesh::printInfo(bool full)
cout << "\tIntegration order " << integrationOrder << endl;
cout << "\tReduced Integration order " << reducedIntegrationOrder << endl;
- // write nodes:
+ // write nodes
if (Nodes != NULL) {
const int numDim = getDim();
cout << "\tNodes: " << numDim << "D-Nodes " << Nodes->numNodes << endl;
@@ -168,127 +188,17 @@ void Mesh::printInfo(bool full)
cout << "\tNodes: 0D-Nodes 0\n";
}
- // write elements:
- if (Elements != NULL) {
- dim_t mine=0, overlap=0;
- for (index_t i=0; i<Elements->numElements; i++) {
- if (Elements->Owner[i] == MPIInfo->rank)
- mine++;
- else
- overlap++;
- }
- cout << "\tElements: "
- << Elements->referenceElementSet->referenceElement->Type->Name
- << " " << Elements->numElements << " (TypeId="
- << Elements->referenceElementSet->referenceElement->Type->TypeId
- << ") owner=" << mine << " overlap=" << overlap << endl;
- if (full) {
- const int NN=Elements->numNodes;
- cout << "\t Id Tag Owner Color: Nodes\n";
- for (index_t i=0; i<Elements->numElements; i++) {
- cout << "\t" << setw(7) << Elements->Id[i]
- << setw(6) << Elements->Tag[i]
- << setw(6) << Elements->Owner[i]
- << setw(6) << Elements->Color[i] << ": ";
- for (int j=0; j<NN; j++)
- cout << setw(6) << Nodes->Id[Elements->Nodes[INDEX2(j,i,NN)]];
- cout << endl;
- }
- }
- } else {
- cout << "\tElements: Tet4 0\n";
- }
+ // write elements
+ printElementInfo(Elements, "Elements", "Tet4", full);
- // write face elements:
- if (FaceElements != NULL) {
- dim_t mine=0, overlap=0;
- for (index_t i=0; i < FaceElements->numElements; i++) {
- if (FaceElements->Owner[i] == MPIInfo->rank)
- mine++;
- else
- overlap++;
- }
- cout << "\tFace elements: "
- << FaceElements->referenceElementSet->referenceElement->Type->Name
- << " " << FaceElements->numElements << " (TypeId="
- << FaceElements->referenceElementSet->referenceElement->Type->TypeId
- << ") owner=" << mine << " overlap=" << overlap << endl;
- if (full) {
- const int NN=FaceElements->numNodes;
- cout << "\t Id Tag Owner Color: Nodes\n";
- for (index_t i=0; i<FaceElements->numElements; i++) {
- cout << "\t" << setw(7) << FaceElements->Id[i]
- << setw(6) << FaceElements->Tag[i]
- << setw(6) << FaceElements->Owner[i]
- << setw(6) << FaceElements->Color[i] << ": ";
- for (int j=0; j<NN; j++)
- cout << setw(6) << Nodes->Id[FaceElements->Nodes[INDEX2(j,i,NN)]];
- cout << endl;
- }
- }
- } else {
- cout << "\tFace elements: Tri3 0\n";
- }
+ // write face elements
+ printElementInfo(FaceElements, "Face elements", "Tri3", full);
- // write Contact elements:
- if (ContactElements != NULL) {
- dim_t mine=0, overlap=0;
- for (index_t i=0; i<ContactElements->numElements; i++) {
- if (ContactElements->Owner[i] == MPIInfo->rank)
- mine++;
- else
- overlap++;
- }
- cout << "\tContact elements: "
- << ContactElements->referenceElementSet->referenceElement->Type->Name
- << " " << ContactElements->numElements << " (TypeId="
- << ContactElements->referenceElementSet->referenceElement->Type->TypeId
- << ") owner=" << mine << " overlap=" << overlap << endl;
- if (full) {
- const int NN=ContactElements->numNodes;
- cout << "\t Id Tag Owner Color: Nodes\n";
- for (index_t i=0; i<ContactElements->numElements; i++) {
- cout << "\t" << setw(7) << ContactElements->Id[i]
- << setw(6) << ContactElements->Tag[i]
- << setw(6) << ContactElements->Owner[i]
- << setw(6) << ContactElements->Color[i] << ": ";
- for (int j=0; j<NN; j++)
- cout << setw(6) << Nodes->Id[ContactElements->Nodes[INDEX2(j,i,NN)]];
- cout << endl;
- }
- }
- } else {
- cout << "\tContact elements: Tri3_Contact 0\n";
- }
+ // write contact elements
+ printElementInfo(ContactElements, "Contact elements", "Tri3_Contact", full);
- // write points:
- if (Points != NULL) {
- dim_t mine=0, overlap=0;
- for (index_t i=0; i<Points->numElements; i++) {
- if (Points->Owner[i] == MPIInfo->rank)
- mine++;
- else
- overlap++;
- }
- cout << "\tPoints: "
- << Points->referenceElementSet->referenceElement->Type->Name
- << " " << Points->numElements << " (TypeId="
- << Points->referenceElementSet->referenceElement->Type->TypeId
- << ") owner=" << mine << " overlap=" << overlap << endl;
- if (full) {
- cout << "\t Id Tag Owner Color: Nodes\n";
- for (index_t i=0; i<Points->numElements; i++) {
- cout << "\t" << setw(7) << Points->Id[i]
- << setw(6) << Points->Tag[i]
- << setw(6) << Points->Owner[i]
- << setw(6) << Points->Color[i]
- << setw(8) << Nodes->Id[Points->Nodes[INDEX2(0,i,1)]]
- << endl;
- }
- }
- } else {
- cout << "\tPoints: Point1 0\n";
- }
+ // write points
+ printElementInfo(Points, "Points", "Point1", full);
// write tags
if (tagMap.size() > 0) {
diff --git a/finley/src/NodeFile.cpp b/finley/src/NodeFile.cpp
index e80b435..6fb1627 100644
--- a/finley/src/NodeFile.cpp
+++ b/finley/src/NodeFile.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -179,7 +179,7 @@ void NodeFile::print() const
std::cout << "=== " << numDim << "D-Nodes:\nnumber of nodes=" << numNodes
<< std::endl;
std::cout << "Id,Tag,globalDegreesOfFreedom,degreesOfFreedom,reducedDegreesOfFeedom,node,reducedNode,Coordinates" << std::endl;
- for (int i=0; i<numNodes; i++) {
+ for (index_t i=0; i<numNodes; i++) {
std::cout << Id[i] << "," << Tag[i] << "," << globalDegreesOfFreedom[i]
<< "," << degreesOfFreedomMapping.target[i]
<< "," << reducedDegreesOfFreedomMapping.target[i]
@@ -220,7 +220,7 @@ void NodeFile::setCoordinates(const escript::Data& newX)
}
/// sets tags to newTag where mask>0
-void NodeFile::setTags(const int newTag, const escript::Data& mask)
+void NodeFile::setTags(int newTag, const escript::Data& mask)
{
resetError();
@@ -307,7 +307,7 @@ std::pair<index_t,index_t> NodeFile::getGlobalNodeIDIndexRange() const
return result;
}
-void NodeFile::copyTable(int offset, int idOffset, int dofOffset,
+void NodeFile::copyTable(index_t offset, index_t idOffset, index_t dofOffset,
const NodeFile* in)
{
// check number of dimensions and table size
@@ -480,9 +480,10 @@ void NodeFile::assignMPIRankToDOFs(std::vector<int>& mpiRankOfDOF,
}
}
-int NodeFile::prepareLabeling(const std::vector<short>& mask,
- std::vector<index_t>& buffer,
- std::vector<index_t>& distribution, bool useNodes)
+dim_t NodeFile::prepareLabeling(const std::vector<short>& mask,
+ std::vector<index_t>& buffer,
+ std::vector<index_t>& distribution,
+ bool useNodes)
{
const index_t UNSET_ID=-1,SET_ID=1;
@@ -509,7 +510,7 @@ int NodeFile::prepareLabeling(const std::vector<short>& mask,
for (int p=0; p<MPIInfo->size; ++p) {
if (p>0) { // the initial send can be skipped
#ifdef ESYS_MPI
- MPI_Sendrecv_replace(&buffer[0], buffer.size(), MPI_INT, dest,
+ MPI_Sendrecv_replace(&buffer[0], buffer.size(), MPI_DIM_T, dest,
MPIInfo->msg_tag_counter, source, MPIInfo->msg_tag_counter,
MPIInfo->comm, &status);
#endif
@@ -521,7 +522,7 @@ int NodeFile::prepareLabeling(const std::vector<short>& mask,
#pragma omp parallel for
for (index_t n=0; n<numNodes; n++) {
if (mask.size()<numNodes || mask[n]>-1) {
- const int k=indexArray[n];
+ const index_t k=indexArray[n];
if (id0<=k && k<id1) {
buffer[k-id0] = SET_ID;
}
@@ -540,7 +541,7 @@ int NodeFile::prepareLabeling(const std::vector<short>& mask,
return myNewCount;
}
-int NodeFile::createDenseDOFLabeling()
+dim_t NodeFile::createDenseDOFLabeling()
{
std::vector<index_t> DOF_buffer;
std::vector<index_t> distribution;
@@ -603,10 +604,10 @@ int NodeFile::createDenseDOFLabeling()
return new_numGlobalDOFs;
}
-int NodeFile::createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
- const std::vector<index_t>& dofDistribution)
+dim_t NodeFile::createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
+ const std::vector<index_t>& dofDistribution)
{
- const int UNSET_ID=-1, SET_ID=1;
+ const index_t UNSET_ID=-1, SET_ID=1;
const index_t myFirstDOF=dofDistribution[MPIInfo->rank];
const index_t myLastDOF=dofDistribution[MPIInfo->rank+1];
@@ -619,7 +620,7 @@ int NodeFile::createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
index_t loc_min_id=min_id;
#pragma omp for
for (index_t n=0; n<numNodes; n++) {
- const int dof=globalDegreesOfFreedom[n];
+ const dim_t dof=globalDegreesOfFreedom[n];
if (myFirstDOF<=dof && dof<myLastDOF) {
loc_max_id=std::max(loc_max_id, Id[n]);
loc_min_id=std::min(loc_min_id, Id[n]);
@@ -672,7 +673,7 @@ int NodeFile::createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
dim_t globalNumNodes=0;
for (int p=0; p<MPIInfo->size; ++p) {
- const int itmp=nodeDistribution[p];
+ const dim_t itmp=nodeDistribution[p];
nodeDistribution[p]=globalNumNodes;
globalNumNodes+=itmp;
}
@@ -717,8 +718,8 @@ int NodeFile::createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
return globalNumNodes;
}
-int NodeFile::createDenseReducedLabeling(const std::vector<short>& reducedMask,
- bool useNodes)
+dim_t NodeFile::createDenseReducedLabeling(const std::vector<short>& reducedMask,
+ bool useNodes)
{
std::vector<index_t> buffer;
std::vector<index_t> distribution;
@@ -828,7 +829,7 @@ void NodeFile::createDOFMappingAndCoupling(bool use_reduced_elements)
setError(SYSTEM_ERROR, "Local elements do not span local degrees of freedom.");
return;
}
- const int UNUSED = -1;
+ const index_t UNUSED = -1;
const index_t len_loc_dof=max_DOF-min_DOF+1;
std::vector<index_t> shared(numNodes*(p_max-p_min+1));
std::vector<index_t> offsetInShared(mpiSize+1);
@@ -862,12 +863,12 @@ void NodeFile::createDOFMappingAndCoupling(bool use_reduced_elements)
}
std::vector<index_t> wanted_DOFs(numNodes);
- std::vector<int> rcv_len(mpiSize);
- std::vector<int> snd_len(mpiSize);
- std::vector<int> neighbor(mpiSize);
+ std::vector<index_t> rcv_len(mpiSize);
+ std::vector<index_t> snd_len(mpiSize);
+ std::vector<Esys_MPI_rank> neighbor(mpiSize);
int numNeighbors=0;
- int n=0;
- int lastn=n;
+ index_t n=0;
+ index_t lastn=n;
for (int p=p_min; p<=p_max; ++p) {
if (p != myRank) {
const index_t firstDOF=std::max(min_DOF, dof_distribution->first_component[p]);
@@ -947,7 +948,7 @@ void NodeFile::createDOFMappingAndCoupling(bool use_reduced_elements)
#ifdef ESYS_MPI
std::vector<MPI_Request> mpi_requests(mpiSize*2);
std::vector<MPI_Status> mpi_stati(mpiSize*2);
- MPI_Alltoall(&rcv_len[0], 1, MPI_INT, &snd_len[0], 1, MPI_INT, MPIInfo->comm);
+ MPI_Alltoall(&rcv_len[0], 1, MPI_DIM_T, &snd_len[0], 1, MPI_DIM_T, MPIInfo->comm);
int count=0;
#else
snd_len[0]=rcv_len[0];
@@ -1049,7 +1050,7 @@ void NodeFile::createNodeMappings(const std::vector<index_t>& indexReducedNodes,
#endif
index_t globalNumReducedNodes=0;
index_t globalNumReducedDOF=0;
- for (int i=0; i<mpiSize;++i) {
+ for (int i=0; i<mpiSize; ++i) {
index_t k=rnodeDist[i];
rnodeDist[i]=globalNumReducedNodes;
globalNumReducedNodes+=k;
@@ -1074,7 +1075,7 @@ void NodeFile::createNodeMappings(const std::vector<index_t>& indexReducedNodes,
std::vector<index_t> nodeMask(numNodes);
if (noError()) {
- const int UNUSED = -1;
+ const index_t UNUSED = -1;
// ==== nodes mapping which is a dummy structure ========
#pragma omp parallel for
for (index_t i=0; i<numNodes; ++i)
diff --git a/finley/src/NodeFile.h b/finley/src/NodeFile.h
index ad1102a..9930baf 100644
--- a/finley/src/NodeFile.h
+++ b/finley/src/NodeFile.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -66,14 +66,15 @@ public:
void createNodeMappings(const std::vector<index_t>& indexReducedNodes,
const std::vector<index_t>& dofDistribution,
const std::vector<index_t>& nodeDistribution);
- int createDenseDOFLabeling();
- int createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
- const std::vector<index_t>& dofDistribution);
- int createDenseReducedLabeling(const std::vector<short>& reducedMask,
- bool useNodes);
+ dim_t createDenseDOFLabeling();
+ dim_t createDenseNodeLabeling(std::vector<index_t>& nodeDistribution,
+ const std::vector<index_t>& dofDistribution);
+ dim_t createDenseReducedLabeling(const std::vector<short>& reducedMask,
+ bool useNodes);
void assignMPIRankToDOFs(std::vector<int>& mpiRankOfDOF, const std::vector<index_t>& distribution);
- void copyTable(int offset, int idOffset, int dofOffset, const NodeFile* in);
+ void copyTable(index_t offset, index_t idOffset, index_t dofOffset,
+ const NodeFile* in);
void gather(const index_t* index, const NodeFile* in);
void gather_global(const index_t* index, const NodeFile* in);
void scatter(const index_t* index, const NodeFile* in);
@@ -88,9 +89,9 @@ private:
std::pair<index_t,index_t> getGlobalIdRange() const;
std::pair<index_t,index_t> getGlobalDOFRange() const;
std::pair<index_t,index_t> getGlobalNodeIDIndexRange() const;
- int prepareLabeling(const std::vector<short>& mask,
- std::vector<index_t>& buffer,
- std::vector<index_t>& distribution, bool useNodes);
+ dim_t prepareLabeling(const std::vector<short>& mask,
+ std::vector<index_t>& buffer,
+ std::vector<index_t>& distribution, bool useNodes);
void createDOFMappingAndCoupling(bool reduced);
NodeMapping nodesMapping;
diff --git a/finley/src/NodeMapping.h b/finley/src/NodeMapping.h
index 9d8bd37..5554203 100644
--- a/finley/src/NodeMapping.h
+++ b/finley/src/NodeMapping.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Quadrature.cpp b/finley/src/Quadrature.cpp
index c0ef50c..2e02f63 100644
--- a/finley/src/Quadrature.cpp
+++ b/finley/src/Quadrature.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Quadrature.h b/finley/src/Quadrature.h
index 80db8f9..f55de37 100644
--- a/finley/src/Quadrature.h
+++ b/finley/src/Quadrature.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/RectangularMesh.h b/finley/src/RectangularMesh.h
index c8c625f..6169767 100644
--- a/finley/src/RectangularMesh.h
+++ b/finley/src/RectangularMesh.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/ReferenceElementSets.h b/finley/src/ReferenceElementSets.h
index cd46040..7f0d9a0 100644
--- a/finley/src/ReferenceElementSets.h
+++ b/finley/src/ReferenceElementSets.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/ReferenceElements.cpp b/finley/src/ReferenceElements.cpp
index 12d831b..119ed8f 100644
--- a/finley/src/ReferenceElements.cpp
+++ b/finley/src/ReferenceElements.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/ReferenceElements.h b/finley/src/ReferenceElements.h
index a1e2461..6961f33 100644
--- a/finley/src/ReferenceElements.h
+++ b/finley/src/ReferenceElements.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/SConscript b/finley/src/SConscript
index f495720..497aa6f 100644
--- a/finley/src/SConscript
+++ b/finley/src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/ShapeFunctions.cpp b/finley/src/ShapeFunctions.cpp
index 89f9267..59c22e7 100644
--- a/finley/src/ShapeFunctions.cpp
+++ b/finley/src/ShapeFunctions.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/ShapeFunctions.h b/finley/src/ShapeFunctions.h
index 183e2c9..136c056 100644
--- a/finley/src/ShapeFunctions.h
+++ b/finley/src/ShapeFunctions.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Util.cpp b/finley/src/Util.cpp
index cd6981d..36b9a96 100644
--- a/finley/src/Util.cpp
+++ b/finley/src/Util.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/Util.h b/finley/src/Util.h
index 4657e16..b21177f 100644
--- a/finley/src/Util.h
+++ b/finley/src/Util.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/src/generateReferenceElementList.py b/finley/src/generateReferenceElementList.py
index 02592ca..bf5dc04 100644
--- a/finley/src/generateReferenceElementList.py
+++ b/finley/src/generateReferenceElementList.py
@@ -1,11 +1,11 @@
#*******************************************************
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/finley/test/MeshAdapterTestCase.cpp b/finley/test/MeshAdapterTestCase.cpp
index 215ce04..4af21a1 100644
--- a/finley/test/MeshAdapterTestCase.cpp
+++ b/finley/test/MeshAdapterTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/test/MeshAdapterTestCase.h b/finley/test/MeshAdapterTestCase.h
index e1fbed6..7f0d18f 100644
--- a/finley/test/MeshAdapterTestCase.h
+++ b/finley/test/MeshAdapterTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/test/SConscript b/finley/test/SConscript
index 178447c..fd91ade 100644
--- a/finley/test/SConscript
+++ b/finley/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -24,7 +24,7 @@ if local_env['cppunit']:
testname='finley_UnitTest'
# build the executable
- local_env.Append(LIBS=['finley', 'escript', 'paso', 'esysUtils']+env['cppunit_libs'])
+ local_env.Prepend(LIBS=['finley', 'escript', 'paso', 'esysUtils']+env['cppunit_libs'])
program = local_env.Program(testname, sources)
# run the tests - but only if test_targets are stale
diff --git a/finley/test/finley_UnitTests.cpp b/finley/test/finley_UnitTests.cpp
index 7da6582..4ea53eb 100644
--- a/finley/test/finley_UnitTests.cpp
+++ b/finley/test/finley_UnitTests.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/finley/test/python/FCT_benchmark.py b/finley/test/python/FCT_benchmark.py
index 53ba0d7..8eca624 100755
--- a/finley/test/python/FCT_benchmark.py
+++ b/finley/test/python/FCT_benchmark.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/finley/test/python/FCT_test0.py b/finley/test/python/FCT_test0.py
index 8e62b29..1dafb2d 100644
--- a/finley/test/python/FCT_test0.py
+++ b/finley/test/python/FCT_test0.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,16 +16,16 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
-from esys.escript.linearPDEs import TransportPDE
+from esys.escript.linearPDEs import TransportPDE, SolverOptions
from esys.finley import Rectangle, Brick
#from esys.ripley import Rectangle, Brick
from esys.weipa import saveVTK
@@ -36,9 +36,9 @@ dom=Rectangle(NE,1,l1=1./NE)
dom=Rectangle(NE,NE)
fc=TransportPDE(dom,numEquations=1)
fc.getSolverOptions().setVerbosityOn()
-fc.getSolverOptions().setODESolver(fc.getSolverOptions().LINEAR_CRANK_NICOLSON)
-fc.getSolverOptions().setODESolver(fc.getSolverOptions().BACKWARD_EULER)
-fc.getSolverOptions().setODESolver(fc.getSolverOptions().CRANK_NICOLSON)
+fc.getSolverOptions().setODESolver(SolverOptions.LINEAR_CRANK_NICOLSON)
+fc.getSolverOptions().setODESolver(SolverOptions.BACKWARD_EULER)
+fc.getSolverOptions().setODESolver(SolverOptions.CRANK_NICOLSON)
fc.setValue(M=1,C=[-1,0])
x=dom.getX()
u0=whereNegative(x[0]-1./NE)
diff --git a/finley/test/python/FCT_test1.py b/finley/test/python/FCT_test1.py
index 09ddb64..33f997a 100644
--- a/finley/test/python/FCT_test1.py
+++ b/finley/test/python/FCT_test1.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/finley/test/python/FCT_test2.py b/finley/test/python/FCT_test2.py
index e972458..8a9056e 100644
--- a/finley/test/python/FCT_test2.py
+++ b/finley/test/python/FCT_test2.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/finley/test/python/OutTest.py b/finley/test/python/OutTest.py
index 52d08c6..8cbb57e 100644
--- a/finley/test/python/OutTest.py
+++ b/finley/test/python/OutTest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/PoissonSolverTest.py b/finley/test/python/PoissonSolverTest.py
index bffe6d2..cef6f87 100644
--- a/finley/test/python/PoissonSolverTest.py
+++ b/finley/test/python/PoissonSolverTest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/RT2D.py b/finley/test/python/RT2D.py
index 7bfc893..e6d59a0 100644
--- a/finley/test/python/RT2D.py
+++ b/finley/test/python/RT2D.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/finley/test/python/RecTest.py b/finley/test/python/RecTest.py
index 8a68dba..f418714 100644
--- a/finley/test/python/RecTest.py
+++ b/finley/test/python/RecTest.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import sys
diff --git a/finley/test/python/SConscript b/finley/test/python/SConscript
index b0eb741..9fa84f4 100644
--- a/finley/test/python/SConscript
+++ b/finley/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/finley/test/python/axisymm-splitB.py b/finley/test/python/axisymm-splitB.py
index 68cf120..03e55c9 100755
--- a/finley/test/python/axisymm-splitB.py
+++ b/finley/test/python/axisymm-splitB.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/finley/test/python/blocktest.py b/finley/test/python/blocktest.py
index 7714328..5c0653f 100755
--- a/finley/test/python/blocktest.py
+++ b/finley/test/python/blocktest.py
@@ -12,12 +12,12 @@
#
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -27,11 +27,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/brick.py b/finley/test/python/brick.py
index 5dbb747..b5c6172 100644
--- a/finley/test/python/brick.py
+++ b/finley/test/python/brick.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/coalgas.py b/finley/test/python/coalgas.py
index 4cd4da8..d0e8b9d 100755
--- a/finley/test/python/coalgas.py
+++ b/finley/test/python/coalgas.py
@@ -1,11 +1,11 @@
######################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ Gas in Coal Seam (fully coupled version)
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript.linearPDEs import LinearPDE
diff --git a/finley/test/python/convection.py b/finley/test/python/convection.py
index 2beebd6..00b9359 100644
--- a/finley/test/python/convection.py
+++ b/finley/test/python/convection.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -21,11 +21,11 @@ It is solved in dimensionless form
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
@@ -319,16 +319,16 @@ while t<T_END:
#for d in range(DIM):
#print("range %d-velocity "%d,inf(v[d]),sup(v[d]))
#print("Courant = ",inf(dom.getSize()/(length(v)+1e-19)), inf(dom.getSize()**2))
- #print("<%s> flow solver completed."%time.asctime())
+ print("<%s> flow solver completed."%time.asctime())
n+=1
t+=dt
#print("influx= ",integrate(inner(v,dom.getNormal())), sqrt(integrate(length(v)**2,FunctionOnBoundary(dom))), integrate(1., FunctionOnBoundary(dom)))
- #print("<%s> Time step %d (t=%e) completed."%(time.asctime(),n,t))
+ print("<%s> Time step %d (t=%e) completed."%(time.asctime(),n,t))
#====================== setup temperature problem ========================
heat.setValue(v=v,Q=CHI_REF*flow.getTau()**2/flow.getCurrentEtaEff())
dt=heat.getSafeTimeStepSize()
- #print("<%s> New time step size is %e"%(time.asctime(),dt))
+ print("<%s> New time step size is %e"%(time.asctime(),dt))
#=========================== setup topography ============================
if CREATE_TOPO:
dt=min(mts.getSafeTimeStepSize()*0.5,dt)
@@ -338,8 +338,8 @@ while t<T_END:
# solve temperature:
#
T=heat.getSolution(dt)
- #print("Temperature range ",inf(T),sup(T))
- #print("<%s> temperature update completed."%time.asctime())
+ print("Temperature range ",inf(T),sup(T))
+ print("<%s> temperature update completed."%time.asctime())
#============================== analysis =================================
#
# .... Nusselt number
diff --git a/finley/test/python/damage.py b/finley/test/python/damage.py
index e92c5f6..c083a73 100644
--- a/finley/test/python/damage.py
+++ b/finley/test/python/damage.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ Damage mechanics
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/generate_dumps.py b/finley/test/python/generate_dumps.py
index fd23d48..32b4ca7 100644
--- a/finley/test/python/generate_dumps.py
+++ b/finley/test/python/generate_dumps.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
this script generates dump files of various data type (scalar, vector, tensor)
diff --git a/finley/test/python/generate_meshes.py b/finley/test/python/generate_meshes.py
index d3308cd..2f43f3d 100644
--- a/finley/test/python/generate_meshes.py
+++ b/finley/test/python/generate_meshes.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
this script generates a variety of meshes in the fly format on a unit square with a
diff --git a/finley/test/python/linearElastic.py b/finley/test/python/linearElastic.py
index 16d535f..e935bcc 100755
--- a/finley/test/python/linearElastic.py
+++ b/finley/test/python/linearElastic.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/localization.py b/finley/test/python/localization.py
index 8290113..9eb8cfc 100644
--- a/finley/test/python/localization.py
+++ b/finley/test/python/localization.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -21,11 +21,11 @@ viscous and plastic layer to trigger localization.
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/lumping_advection_test.py b/finley/test/python/lumping_advection_test.py
index a9505fe..cca5907 100755
--- a/finley/test/python/lumping_advection_test.py
+++ b/finley/test/python/lumping_advection_test.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -23,11 +23,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/lumping_wave_test.py b/finley/test/python/lumping_wave_test.py
index 4a9c0b7..f920516 100755
--- a/finley/test/python/lumping_wave_test.py
+++ b/finley/test/python/lumping_wave_test.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -20,11 +20,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/rayleigh_taylor_instabilty.py b/finley/test/python/rayleigh_taylor_instabilty.py
index c7133a6..6ac9a73 100644
--- a/finley/test/python/rayleigh_taylor_instabilty.py
+++ b/finley/test/python/rayleigh_taylor_instabilty.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/finley/test/python/rectangle.py b/finley/test/python/rectangle.py
index 681152e..44230af 100644
--- a/finley/test/python/rectangle.py
+++ b/finley/test/python/rectangle.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/run_amg.py b/finley/test/python/run_amg.py
index 6efbfae..a621c22 100644
--- a/finley/test/python/run_amg.py
+++ b/finley/test/python/run_amg.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_darcy.py b/finley/test/python/run_darcy.py
index e03814a..e250b1a 100644
--- a/finley/test/python/run_darcy.py
+++ b/finley/test/python/run_darcy.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/finley/test/python/run_escriptOnFinley.py b/finley/test/python/run_escriptOnFinley.py
index 6b7b0a6..0622b41 100644
--- a/finley/test/python/run_escriptOnFinley.py
+++ b/finley/test/python/run_escriptOnFinley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/finley/test/python/run_generators.py b/finley/test/python/run_generators.py
index 980530a..bc72684 100644
--- a/finley/test/python/run_generators.py
+++ b/finley/test/python/run_generators.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_inputOutput.py b/finley/test/python/run_inputOutput.py
index 65e5ac3..816374c 100644
--- a/finley/test/python/run_inputOutput.py
+++ b/finley/test/python/run_inputOutput.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_2D1.py b/finley/test/python/run_linearPDEsOnFinley1_2D1.py
index 1aef1ef..0edf900 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_2D1.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_2D1.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_2D2.py b/finley/test/python/run_linearPDEsOnFinley1_2D2.py
index 8113ebd..f618b1f 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_2D2.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_2D2.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D1.py b/finley/test/python/run_linearPDEsOnFinley1_3D1.py
index eb1a0f4..3f41ad3 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D1.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D1.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part1.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part1.py
index 18b92c1..13cd7fc 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part1.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part1.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part2.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part2.py
index 8a05092..0e52a0a 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part2.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part2.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-1.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-1.py
index 35900a6..13d49cb 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-1.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-1.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-2.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-2.py
index ef0ac2c..ebf2196 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-2.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-2.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-3.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-3.py
index b3fd53e..0617aec 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-3.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-3.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-4.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-4.py
index 5310c7a..9621698 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-4.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part3-4.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley1_3D2_part4.py b/finley/test/python/run_linearPDEsOnFinley1_3D2_part4.py
index 7f486c2..1f8bc87 100644
--- a/finley/test/python/run_linearPDEsOnFinley1_3D2_part4.py
+++ b/finley/test/python/run_linearPDEsOnFinley1_3D2_part4.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley2.py b/finley/test/python/run_linearPDEsOnFinley2.py
index c30d1eb..bd4a550 100644
--- a/finley/test/python/run_linearPDEsOnFinley2.py
+++ b/finley/test/python/run_linearPDEsOnFinley2.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinley3.py b/finley/test/python/run_linearPDEsOnFinley3.py
index 0bf705e..8cf26c9 100644
--- a/finley/test/python/run_linearPDEsOnFinley3.py
+++ b/finley/test/python/run_linearPDEsOnFinley3.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_linearPDEsOnFinleyMacro.py b/finley/test/python/run_linearPDEsOnFinleyMacro.py
index 8e0bb9b..ecd6b80 100644
--- a/finley/test/python/run_linearPDEsOnFinleyMacro.py
+++ b/finley/test/python/run_linearPDEsOnFinleyMacro.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_models.py b/finley/test/python/run_models.py
index afc0914..1b25456 100644
--- a/finley/test/python/run_models.py
+++ b/finley/test/python/run_models.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/finley/test/python/run_nlpde2dOnFinley.py b/finley/test/python/run_nlpde2dOnFinley.py
index 4002d21..e538aff 100644
--- a/finley/test/python/run_nlpde2dOnFinley.py
+++ b/finley/test/python/run_nlpde2dOnFinley.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_nlpde3dOnFinley.py b/finley/test/python/run_nlpde3dOnFinley.py
index 00c84b3..8cac15e 100644
--- a/finley/test/python/run_nlpde3dOnFinley.py
+++ b/finley/test/python/run_nlpde3dOnFinley.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_simplesolve.py b/finley/test/python/run_simplesolve.py
index 70975e6..4638771 100644
--- a/finley/test/python/run_simplesolve.py
+++ b/finley/test/python/run_simplesolve.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/run_splitworldOnFinley.py b/finley/test/python/run_splitworldOnFinley.py
index 1c14474..17851ff 100644
--- a/finley/test/python/run_splitworldOnFinley.py
+++ b/finley/test/python/run_splitworldOnFinley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2015 by The University of Queensland
+__copyright__="""Copyright (c) 2015-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/finley/test/python/run_utilOnFinley.py b/finley/test/python/run_utilOnFinley.py
index 3acc164..eabaa64 100644
--- a/finley/test/python/run_utilOnFinley.py
+++ b/finley/test/python/run_utilOnFinley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/finley/test/python/run_visualization_interface.py b/finley/test/python/run_visualization_interface.py
index b2c6f59..323683e 100644
--- a/finley/test/python/run_visualization_interface.py
+++ b/finley/test/python/run_visualization_interface.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/finley/test/python/runcoalgas.py b/finley/test/python/runcoalgas.py
index 40c20ed..59142ef 100755
--- a/finley/test/python/runcoalgas.py
+++ b/finley/test/python/runcoalgas.py
@@ -1,11 +1,11 @@
#######################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -18,11 +18,11 @@ Coal Seam gasL ECLIPSE test case
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/finley/test/python/seismic_wave.py b/finley/test/python/seismic_wave.py
index 8fbd9cb..099f086 100644
--- a/finley/test/python/seismic_wave.py
+++ b/finley/test/python/seismic_wave.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/slip_stress_mesh_old.py b/finley/test/python/slip_stress_mesh_old.py
index 1ef10fe..2b7b975 100644
--- a/finley/test/python/slip_stress_mesh_old.py
+++ b/finley/test/python/slip_stress_mesh_old.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/slip_stress_old.py b/finley/test/python/slip_stress_old.py
index 3e4c829..308ab7b 100644
--- a/finley/test/python/slip_stress_old.py
+++ b/finley/test/python/slip_stress_old.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/stokes_problems.py b/finley/test/python/stokes_problems.py
index db90375..1b14a89 100644
--- a/finley/test/python/stokes_problems.py
+++ b/finley/test/python/stokes_problems.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/finley/test/python/subduction1.py b/finley/test/python/subduction1.py
index f48460c..af4c42d 100644
--- a/finley/test/python/subduction1.py
+++ b/finley/test/python/subduction1.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# $Id$
diff --git a/finley/test/python/subduction1_gen.py b/finley/test/python/subduction1_gen.py
index 1870fcf..f72cf33 100644
--- a/finley/test/python/subduction1_gen.py
+++ b/finley/test/python/subduction1_gen.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/finley/test/python/time_chunks.py b/finley/test/python/time_chunks.py
index 21b1784..50d5646 100644
--- a/finley/test/python/time_chunks.py
+++ b/finley/test/python/time_chunks.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
NUM_THREADS=8
diff --git a/finley/test/python/tp.py b/finley/test/python/tp.py
index 1ac6b10..d7bebd6 100644
--- a/finley/test/python/tp.py
+++ b/finley/test/python/tp.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import *
diff --git a/modellib/py_src/SConscript b/modellib/py_src/SConscript
index 7da5cf2..f4530bc 100644
--- a/modellib/py_src/SConscript
+++ b/modellib/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/modellib/py_src/__init__.py b/modellib/py_src/__init__.py
index f4da971..562c9d5 100644
--- a/modellib/py_src/__init__.py
+++ b/modellib/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/modellib/py_src/flow.py b/modellib/py_src/flow.py
index a641041..453bbe9 100644
--- a/modellib/py_src/flow.py
+++ b/modellib/py_src/flow.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import Data, kronecker, Lsup, div, inf, sup
diff --git a/modellib/py_src/geometry.py b/modellib/py_src/geometry.py
index 77cc2a0..62e1752 100644
--- a/modellib/py_src/geometry.py
+++ b/modellib/py_src/geometry.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import Vector, sup, inf, whereZero, length, Scalar, Vector
diff --git a/modellib/py_src/input.py b/modellib/py_src/input.py
index 397107f..4183a74 100644
--- a/modellib/py_src/input.py
+++ b/modellib/py_src/input.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import length, wherePositive, whereNegative, exp, inf, sup
diff --git a/modellib/py_src/materials.py b/modellib/py_src/materials.py
index be1571d..684e2f4 100644
--- a/modellib/py_src/materials.py
+++ b/modellib/py_src/materials.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript.modelframe import Model,ParameterSet
diff --git a/modellib/py_src/mechanics.py b/modellib/py_src/mechanics.py
index c077413..f006a85 100644
--- a/modellib/py_src/mechanics.py
+++ b/modellib/py_src/mechanics.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#from esys.escript import *
diff --git a/modellib/py_src/probe.py b/modellib/py_src/probe.py
index 5a97c06..489e809 100644
--- a/modellib/py_src/probe.py
+++ b/modellib/py_src/probe.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript.modelframe import Model,ParameterSet
diff --git a/modellib/py_src/temperature.py b/modellib/py_src/temperature.py
index da5efea..1b47f95 100644
--- a/modellib/py_src/temperature.py
+++ b/modellib/py_src/temperature.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript import Data, inf, sup, length, grad, inner
diff --git a/modellib/py_src/tsunami.py.old b/modellib/py_src/tsunami.py.old
index 5082662..713464b 100644
--- a/modellib/py_src/tsunami.py.old
+++ b/modellib/py_src/tsunami.py.old
@@ -5,8 +5,8 @@
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development since 2012 by School of Earth Sciences
@@ -16,8 +16,8 @@
__copyright__="""Copyright (c) 2003-2012 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, sys
diff --git a/modellib/py_src/visualization.py b/modellib/py_src/visualization.py
index ecb4618..f54f29e 100644
--- a/modellib/py_src/visualization.py
+++ b/modellib/py_src/visualization.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from esys.escript.modelframe import Model, Link
diff --git a/modellib/test/python/SConscript b/modellib/test/python/SConscript
index 1644e7d..4b98df4 100644
--- a/modellib/test/python/SConscript
+++ b/modellib/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/modellib/test/python/drucker_prager.py b/modellib/test/python/drucker_prager.py
index 69c49a7..2713fb7 100644
--- a/modellib/test/python/drucker_prager.py
+++ b/modellib/test/python/drucker_prager.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
# run by scons build/posix/modellib/test/python/drucker_prager.passed from check out cd.
diff --git a/modellib/test/python/run_convection.py b/modellib/test/python/run_convection.py
index 160494a..b86603c 100644
--- a/modellib/test/python/run_convection.py
+++ b/modellib/test/python/run_convection.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/modellib/test/python/run_domainreaders.py b/modellib/test/python/run_domainreaders.py
index 00c57f2..2b8d8cb 100644
--- a/modellib/test/python/run_domainreaders.py
+++ b/modellib/test/python/run_domainreaders.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/modellib/test/python/run_flow.py b/modellib/test/python/run_flow.py
index 3bed69a..69c1a7d 100644
--- a/modellib/test/python/run_flow.py
+++ b/modellib/test/python/run_flow.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/modellib/test/python/run_temp.py b/modellib/test/python/run_temp.py
index 35b8df4..7b2242c 100644
--- a/modellib/test/python/run_temp.py
+++ b/modellib/test/python/run_temp.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
#
diff --git a/paso/profiling/Paso_tests.cpp b/paso/profiling/Paso_tests.cpp
index 045d99c..0354c51 100644
--- a/paso/profiling/Paso_tests.cpp
+++ b/paso/profiling/Paso_tests.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/profiling/Paso_tests.h b/paso/profiling/Paso_tests.h
index 1977dfc..c7bc8de 100644
--- a/paso/profiling/Paso_tests.h
+++ b/paso/profiling/Paso_tests.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/profiling/SConscript b/paso/profiling/SConscript
index 3115700..32ac432 100644
--- a/paso/profiling/SConscript
+++ b/paso/profiling/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/AMG.cpp b/paso/src/AMG.cpp
index 8af0048..5a9e1f3 100644
--- a/paso/src/AMG.cpp
+++ b/paso/src/AMG.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/AMG_Interpolation.cpp b/paso/src/AMG_Interpolation.cpp
index cd696cc..24ab019 100644
--- a/paso/src/AMG_Interpolation.cpp
+++ b/paso/src/AMG_Interpolation.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/AMG_Prolongation.cpp b/paso/src/AMG_Prolongation.cpp
index 6ec2a9b..c9530f9 100644
--- a/paso/src/AMG_Prolongation.cpp
+++ b/paso/src/AMG_Prolongation.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/AMG_Restriction.cpp b/paso/src/AMG_Restriction.cpp
index 7e3456e..843de2a 100644
--- a/paso/src/AMG_Restriction.cpp
+++ b/paso/src/AMG_Restriction.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/AMG_Root.cpp b/paso/src/AMG_Root.cpp
index 7690666..773efe3 100644
--- a/paso/src/AMG_Root.cpp
+++ b/paso/src/AMG_Root.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/AML.cpp.old b/paso/src/AML.cpp.old
index 73a993f..48a7770 100644
--- a/paso/src/AML.cpp.old
+++ b/paso/src/AML.cpp.old
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -558,12 +558,12 @@ void Solver_solveAMLI(Solver_AMLI * amli, double * x, double * b) {
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/BOOMERAMG.cpp b/paso/src/BOOMERAMG.cpp
index a56a3af..afb1545 100644
--- a/paso/src/BOOMERAMG.cpp
+++ b/paso/src/BOOMERAMG.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/BOOMERAMG.h b/paso/src/BOOMERAMG.h
index 896efc7..634e684 100644
--- a/paso/src/BOOMERAMG.h
+++ b/paso/src/BOOMERAMG.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/BiCGStab.cpp b/paso/src/BiCGStab.cpp
index 839b4d6..a008eca 100644
--- a/paso/src/BiCGStab.cpp
+++ b/paso/src/BiCGStab.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/BlockOps.h b/paso/src/BlockOps.h
index 12bacd3..73c4f14 100644
--- a/paso/src/BlockOps.h
+++ b/paso/src/BlockOps.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Coupler.cpp b/paso/src/Coupler.cpp
index de47fd1..950192e 100644
--- a/paso/src/Coupler.cpp
+++ b/paso/src/Coupler.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Coupler.h b/paso/src/Coupler.h
index 500c9a9..48579df 100644
--- a/paso/src/Coupler.h
+++ b/paso/src/Coupler.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Distribution.cpp b/paso/src/Distribution.cpp
index 2ac2975..42126bb 100644
--- a/paso/src/Distribution.cpp
+++ b/paso/src/Distribution.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Distribution.h b/paso/src/Distribution.h
index 5e6e2b3..3b93f53 100644
--- a/paso/src/Distribution.h
+++ b/paso/src/Distribution.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/FCT_Solver.cpp b/paso/src/FCT_Solver.cpp
index 6e278d2..584245b 100644
--- a/paso/src/FCT_Solver.cpp
+++ b/paso/src/FCT_Solver.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/FCT_Solver.h b/paso/src/FCT_Solver.h
index 17f7c91..db8ffd8 100644
--- a/paso/src/FCT_Solver.h
+++ b/paso/src/FCT_Solver.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/FluxLimiter.cpp b/paso/src/FluxLimiter.cpp
index 5e5e112..d60919f 100644
--- a/paso/src/FluxLimiter.cpp
+++ b/paso/src/FluxLimiter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/FluxLimiter.h b/paso/src/FluxLimiter.h
index cdb7322..06501d3 100644
--- a/paso/src/FluxLimiter.h
+++ b/paso/src/FluxLimiter.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Functions.cpp b/paso/src/Functions.cpp
index 5e0e275..3462f90 100644
--- a/paso/src/Functions.cpp
+++ b/paso/src/Functions.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Functions.h b/paso/src/Functions.h
index 519b2bc..e17877f 100644
--- a/paso/src/Functions.h
+++ b/paso/src/Functions.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/GMRES.cpp b/paso/src/GMRES.cpp
index da3aac6..8754419 100644
--- a/paso/src/GMRES.cpp
+++ b/paso/src/GMRES.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/GMRES2.cpp b/paso/src/GMRES2.cpp
index d9b5dbe..73b2193 100644
--- a/paso/src/GMRES2.cpp
+++ b/paso/src/GMRES2.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/GSMPI.cpp.old b/paso/src/GSMPI.cpp.old
index cb4ab1d..ce09aea 100644
--- a/paso/src/GSMPI.cpp.old
+++ b/paso/src/GSMPI.cpp.old
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/ILU.cpp b/paso/src/ILU.cpp
index c7637af..0079313 100644
--- a/paso/src/ILU.cpp
+++ b/paso/src/ILU.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/LocalAMG.cpp b/paso/src/LocalAMG.cpp
index 78b104b..17c1989 100644
--- a/paso/src/LocalAMG.cpp
+++ b/paso/src/LocalAMG.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/LocalAMG_Prolongation.cpp b/paso/src/LocalAMG_Prolongation.cpp
index 8a1392a..18be821 100644
--- a/paso/src/LocalAMG_Prolongation.cpp
+++ b/paso/src/LocalAMG_Prolongation.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/MINRES.cpp b/paso/src/MINRES.cpp
index 1aa749d..23e36a3 100644
--- a/paso/src/MINRES.cpp
+++ b/paso/src/MINRES.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/MKL.cpp b/paso/src/MKL.cpp
index 174dc7e..b7dfa23 100644
--- a/paso/src/MKL.cpp
+++ b/paso/src/MKL.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -35,24 +35,25 @@ void MKL_free(SparseMatrix* A)
{
#ifdef MKL
if (A && A->solver_p && A->solver_package==PASO_MKL) {
- _INTEGER_t mtype = MKL_MTYPE_UNSYM;
- _INTEGER_t n = A->numRows;
- _INTEGER_t maxfct=1; // number of factorizations on the same pattern
- _INTEGER_t mnum =1; // factorization to be handled in this call
- _INTEGER_t msglvl=0; // message level
- _INTEGER_t nrhs=1; // number of right hand sides
- _INTEGER_t idum; // dummy integer
+ ES_MKL_INT mtype = MKL_MTYPE_REAL_UNSYM;
+ ES_MKL_INT n = A->numRows;
+ ES_MKL_INT maxfct=1; // number of factorizations on the same pattern
+ ES_MKL_INT mnum =1; // factorization to be handled in this call
+ ES_MKL_INT msglvl=0; // message level
+ ES_MKL_INT nrhs=1; // number of right hand sides
+ ES_MKL_INT idum; // dummy integer
_DOUBLE_PRECISION_t ddum; // dummy float
- _INTEGER_t error=MKL_ERROR_NO; // error code
- _INTEGER_t iparm[64]; // parameters
+ ES_MKL_INT error=MKL_ERROR_NO; // error code
+ ES_MKL_INT iparm[64]; // parameters
_MKL_DSS_HANDLE_t* pt = (_MKL_DSS_HANDLE_t*)A->solver_p;
- _INTEGER_t phase = MKL_PHASE_RELEASE_MEMORY;
+ ES_MKL_INT phase = MKL_PHASE_RELEASE_MEMORY;
+ ES_MKL_INT* ptr = reinterpret_cast<ES_MKL_INT*>(A->pattern->ptr);
+ ES_MKL_INT* index = reinterpret_cast<ES_MKL_INT*>(A->pattern->index);
for (index_t i=0; i<64; ++i)
iparm[i]=0;
- PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val,
- A->pattern->ptr, A->pattern->index, &idum, &nrhs,
- iparm, &msglvl,&ddum, &ddum, &error);
+ ES_PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val, ptr,
+ index, &idum, &nrhs, iparm, &msglvl,&ddum, &ddum, &error);
delete[] A->solver_p;
A->solver_p=NULL;
if (error != MKL_ERROR_NO)
@@ -71,17 +72,27 @@ void MKL_solve(SparseMatrix_ptr A, double* out, double* in, index_t reordering,
return;
}
- _INTEGER_t mtype = MKL_MTYPE_UNSYM;
- _INTEGER_t n = A->numRows;
- _INTEGER_t maxfct=1; /* number of factorizations on the same pattern */
- _INTEGER_t mnum =1; /* factorization to be handled in this call */
- _INTEGER_t msglvl=0; /* message level */
- _INTEGER_t nrhs=1; /* number of right hand sides */
- _INTEGER_t idum; /* dummy integer */
+ // MKL uses 'long long int' in 64-bit version, escript 'long'. Make sure
+ // they are compatible
+ if (sizeof(ES_MKL_INT) != sizeof(index_t)) {
+ Esys_setError(TYPE_ERROR, "Paso: MKL index type is not compatible with this escript build. Check compile options.");
+ return;
+ }
+
+ ES_MKL_INT* ptr = reinterpret_cast<ES_MKL_INT*>(A->pattern->ptr);
+ ES_MKL_INT* index = reinterpret_cast<ES_MKL_INT*>(A->pattern->index);
+
+ ES_MKL_INT mtype = MKL_MTYPE_REAL_UNSYM;
+ ES_MKL_INT n = A->numRows;
+ ES_MKL_INT maxfct = 1; /* number of factorizations on the same pattern */
+ ES_MKL_INT mnum = 1; /* factorization to be handled in this call */
+ ES_MKL_INT msglvl = (verbose? 1 : 0); /* message level */
+ ES_MKL_INT nrhs = 1; /* number of right hand sides */
+ ES_MKL_INT idum; /* dummy integer */
_DOUBLE_PRECISION_t ddum; /* dummy float */
- _INTEGER_t phase = MKL_PHASE_SYMBOLIC_FACTORIZATION;
- _INTEGER_t error=MKL_ERROR_NO; /* error code */
- _INTEGER_t iparm[64]; /* parameters */
+ ES_MKL_INT phase = MKL_PHASE_SYMBOLIC_FACTORIZATION;
+ ES_MKL_INT error=MKL_ERROR_NO; /* error code */
+ ES_MKL_INT iparm[64]; /* parameters */
_MKL_DSS_HANDLE_t* pt = (_MKL_DSS_HANDLE_t *)(A->solver_p);
for (index_t i=0; i<64; ++i)
@@ -92,20 +103,23 @@ void MKL_solve(SparseMatrix_ptr A, double* out, double* in, index_t reordering,
iparm[1] = MKL_REORDERING_MINIMUM_DEGREE;
break;
default:
- iparm[1] = MKL_REORDERING_NESTED_DISSECTION;
- break;
- }
#ifdef _OPENMP
- iparm[2] = omp_get_max_threads();
+ iparm[1] = MKL_REORDERING_NESTED_DISSECTION_OMP;
#else
- iparm[2] = 1;
+ iparm[1] = MKL_REORDERING_NESTED_DISSECTION;
#endif
+ break;
+ }
iparm[5] = 0; // store solution into output array
iparm[7] = numRefinements; // maximum number of refinements
iparm[9] = 13; // 10**(-iparm[9]) perturbation of pivot elements
iparm[10] = 1; // rescaling the matrix before factorization started
iparm[17] = 0; // =-1 report number of non-zeroes
iparm[18] = 0; // =-1 report flops
+#ifdef _OPENMP
+ if (omp_get_max_threads() > 8)
+ iparm[23] = 1;
+#endif
double time0;
@@ -119,9 +133,8 @@ void MKL_solve(SparseMatrix_ptr A, double* out, double* in, index_t reordering,
// symbolic factorization
phase = MKL_PHASE_SYMBOLIC_FACTORIZATION;
time0 = Esys_timer();
- PARDISO(pt, &maxfct, &mnum, &mtype, &phase,
- &n, A->val, A->pattern->ptr, A->pattern->index, &idum, &nrhs,
- iparm, &msglvl, in, out, &error);
+ ES_PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val,
+ ptr, index, &idum, &nrhs, iparm, &msglvl, in, out, &error);
if (error != MKL_ERROR_NO) {
if (verbose)
printf("MKL: symbolic factorization failed.\n");
@@ -130,9 +143,8 @@ void MKL_solve(SparseMatrix_ptr A, double* out, double* in, index_t reordering,
} else {
// LDU factorization
phase = MKL_PHASE_FACTORIZATION;
- PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val,
- A->pattern->ptr, A->pattern->index, &idum, &nrhs,
- iparm, &msglvl, in, out, &error);
+ ES_PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val, ptr,
+ index, &idum, &nrhs, iparm, &msglvl, in, out, &error);
if (error != MKL_ERROR_NO) {
if (verbose)
printf("MKL: LDU factorization failed.\n");
@@ -147,9 +159,8 @@ void MKL_solve(SparseMatrix_ptr A, double* out, double* in, index_t reordering,
if (Esys_noError()) {
time0 = Esys_timer();
phase = MKL_PHASE_SOLVE;
- PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val,
- A->pattern->ptr, A->pattern->index, &idum, &nrhs, iparm,
- &msglvl, in, out, &error);
+ ES_PARDISO(pt, &maxfct, &mnum, &mtype, &phase, &n, A->val,
+ ptr, index, &idum, &nrhs, iparm, &msglvl, in, out, &error);
if (verbose) printf("MKL: solve completed.\n");
if (error != MKL_ERROR_NO) {
if (verbose)
diff --git a/paso/src/MKL.h b/paso/src/MKL.h
index e6622a5..1aa49c6 100644
--- a/paso/src/MKL.h
+++ b/paso/src/MKL.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -30,38 +30,34 @@
#define __PASO_MKL_H__
#include "SparseMatrix.h"
-#include "performance.h"
namespace paso {
-#if defined(_WIN32) || defined(_WIN64)
-#define PARDISO pardiso
+#ifdef ESYS_INDEXTYPE_LONG
+#define ES_PARDISO pardiso_64
+#define ES_MKL_INT MKL_INT64
#else
-#define PARDISO pardiso_
+#define ES_PARDISO pardiso
+#define ES_MKL_INT MKL_INT
#endif
#ifdef MKL
-#include "mkl_pardiso.h"
+#include <mkl_pardiso.h>
#endif
#define MKL_ERROR_NO 0
-#define MKL_MTYPE_SYM -2
-#define MKL_MTYPE_UNSYM 11
+#define MKL_MTYPE_REAL_SYM -2
+#define MKL_MTYPE_REAL_UNSYM 11
#define MKL_REORDERING_MINIMUM_DEGREE 0
#define MKL_REORDERING_NESTED_DISSECTION 2
+#define MKL_REORDERING_NESTED_DISSECTION_OMP 3
#define MKL_PHASE_SYMBOLIC_FACTORIZATION 11
#define MKL_PHASE_FACTORIZATION 22
#define MKL_PHASE_SOLVE 33
#define MKL_PHASE_RELEASE_MEMORY -1
-/* extern int PARDISO
-# (void *, int *, int *, int *, int *, int *,
-# double *, int *, int *, int *, int *, int *,
-# int *, double *, double *, int *);
-*/
-
void MKL_free(SparseMatrix* A);
void MKL_solve(SparseMatrix_ptr A, double* out, double* in, index_t reordering,
diff --git a/paso/src/MergedSolver.cpp b/paso/src/MergedSolver.cpp
index ca4e5dc..8fb69cd 100644
--- a/paso/src/MergedSolver.cpp
+++ b/paso/src/MergedSolver.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/MergedSolver.h b/paso/src/MergedSolver.h
index ce0134d..55cdc57 100644
--- a/paso/src/MergedSolver.h
+++ b/paso/src/MergedSolver.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/NewtonGMRES.cpp b/paso/src/NewtonGMRES.cpp
index 9d7ab62..c91aad0 100644
--- a/paso/src/NewtonGMRES.cpp
+++ b/paso/src/NewtonGMRES.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Options.cpp b/paso/src/Options.cpp
index 3b5a693..3cd1053 100644
--- a/paso/src/Options.cpp
+++ b/paso/src/Options.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Options.h b/paso/src/Options.h
index 2f4f17d..405f5a7 100644
--- a/paso/src/Options.h
+++ b/paso/src/Options.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/PCG.cpp b/paso/src/PCG.cpp
index 281d933..165aebe 100644
--- a/paso/src/PCG.cpp
+++ b/paso/src/PCG.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Paso.h b/paso/src/Paso.h
index 44658ff..f907d62 100644
--- a/paso/src/Paso.h
+++ b/paso/src/Paso.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/PasoUtil.cpp b/paso/src/PasoUtil.cpp
index 04e3f13..e23a30e 100644
--- a/paso/src/PasoUtil.cpp
+++ b/paso/src/PasoUtil.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/PasoUtil.h b/paso/src/PasoUtil.h
index cadef29..54d3ebf 100644
--- a/paso/src/PasoUtil.h
+++ b/paso/src/PasoUtil.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Pattern.cpp b/paso/src/Pattern.cpp
index 67bca6b..bdda7d9 100644
--- a/paso/src/Pattern.cpp
+++ b/paso/src/Pattern.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Pattern.h b/paso/src/Pattern.h
index ba52ef0..b0468ed 100644
--- a/paso/src/Pattern.h
+++ b/paso/src/Pattern.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Pattern_mis.cpp b/paso/src/Pattern_mis.cpp
index fcdc4cf..5f897f8 100644
--- a/paso/src/Pattern_mis.cpp
+++ b/paso/src/Pattern_mis.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Pattern_reduceBandwidth.cpp b/paso/src/Pattern_reduceBandwidth.cpp
index 3f1dadd..2f01674 100644
--- a/paso/src/Pattern_reduceBandwidth.cpp
+++ b/paso/src/Pattern_reduceBandwidth.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Preconditioner.cpp b/paso/src/Preconditioner.cpp
index 26944f8..e8b2506 100644
--- a/paso/src/Preconditioner.cpp
+++ b/paso/src/Preconditioner.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Preconditioner.h b/paso/src/Preconditioner.h
index a4b4c65..748ab55 100644
--- a/paso/src/Preconditioner.h
+++ b/paso/src/Preconditioner.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/RILU.cpp b/paso/src/RILU.cpp
index c4cf298..33f007e 100644
--- a/paso/src/RILU.cpp
+++ b/paso/src/RILU.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/ReactiveSolver.cpp b/paso/src/ReactiveSolver.cpp
index a26e562..db5a40f 100644
--- a/paso/src/ReactiveSolver.cpp
+++ b/paso/src/ReactiveSolver.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/ReactiveSolver.h b/paso/src/ReactiveSolver.h
index cf9bd91..6b2f446 100644
--- a/paso/src/ReactiveSolver.h
+++ b/paso/src/ReactiveSolver.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SConscript b/paso/src/SConscript
index 8300a1e..43b4efd 100644
--- a/paso/src/SConscript
+++ b/paso/src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SchurComplement.cpp b/paso/src/SchurComplement.cpp
index 97b0bed..6f8dd69 100644
--- a/paso/src/SchurComplement.cpp
+++ b/paso/src/SchurComplement.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SharedComponents.h b/paso/src/SharedComponents.h
index 559bb5e..270a1b2 100644
--- a/paso/src/SharedComponents.h
+++ b/paso/src/SharedComponents.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Smoother.cpp b/paso/src/Smoother.cpp
index 8bd5376..2153e1b 100644
--- a/paso/src/Smoother.cpp
+++ b/paso/src/Smoother.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Solver.cpp b/paso/src/Solver.cpp
index d1830c0..6a83d47 100644
--- a/paso/src/Solver.cpp
+++ b/paso/src/Solver.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Solver.h b/paso/src/Solver.h
index 4eeb6d9..858b7f1 100644
--- a/paso/src/Solver.h
+++ b/paso/src/Solver.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Solver_Function.cpp b/paso/src/Solver_Function.cpp
index da3c550..dc2a3ec 100644
--- a/paso/src/Solver_Function.cpp
+++ b/paso/src/Solver_Function.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Solver_applyBlockDiagonalMatrix.cpp.old b/paso/src/Solver_applyBlockDiagonalMatrix.cpp.old
index fc0bb3e..8f883aa 100644
--- a/paso/src/Solver_applyBlockDiagonalMatrix.cpp.old
+++ b/paso/src/Solver_applyBlockDiagonalMatrix.cpp.old
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix.cpp b/paso/src/SparseMatrix.cpp
index 87d78d3..47a36ce 100644
--- a/paso/src/SparseMatrix.cpp
+++ b/paso/src/SparseMatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix.h b/paso/src/SparseMatrix.h
index e0f8886..939920d 100644
--- a/paso/src/SparseMatrix.h
+++ b/paso/src/SparseMatrix.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix_MatrixMatrix.cpp b/paso/src/SparseMatrix_MatrixMatrix.cpp
index 0264916..5486282 100644
--- a/paso/src/SparseMatrix_MatrixMatrix.cpp
+++ b/paso/src/SparseMatrix_MatrixMatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix_MatrixMatrixTranspose.cpp b/paso/src/SparseMatrix_MatrixMatrixTranspose.cpp
index e8ee7f2..01aa1b3 100644
--- a/paso/src/SparseMatrix_MatrixMatrixTranspose.cpp
+++ b/paso/src/SparseMatrix_MatrixMatrixTranspose.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix_MatrixVector.cpp b/paso/src/SparseMatrix_MatrixVector.cpp
index e82fd12..ffd3429 100644
--- a/paso/src/SparseMatrix_MatrixVector.cpp
+++ b/paso/src/SparseMatrix_MatrixVector.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix_getSubmatrix.cpp b/paso/src/SparseMatrix_getSubmatrix.cpp
index 3bf9a74..98e71c1 100644
--- a/paso/src/SparseMatrix_getSubmatrix.cpp
+++ b/paso/src/SparseMatrix_getSubmatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix_nullifyRowsAndCols.cpp b/paso/src/SparseMatrix_nullifyRowsAndCols.cpp
index 6452a4c..b72d16c 100644
--- a/paso/src/SparseMatrix_nullifyRowsAndCols.cpp
+++ b/paso/src/SparseMatrix_nullifyRowsAndCols.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SparseMatrix_saveHB.cpp b/paso/src/SparseMatrix_saveHB.cpp
index ea3a384..74b4734 100644
--- a/paso/src/SparseMatrix_saveHB.cpp
+++ b/paso/src/SparseMatrix_saveHB.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix.cpp b/paso/src/SystemMatrix.cpp
index 7bcdeb0..13c31b2 100644
--- a/paso/src/SystemMatrix.cpp
+++ b/paso/src/SystemMatrix.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -209,10 +209,10 @@ void SystemMatrix::makeZeroRowSums(double* left_over)
for (index_t ir=0; ir<n; ir++) {
for (index_t ib=0; ib<blk; ib++) {
const index_t irow = ib+blk*ir;
- const double rtmp1 = left_over[irow];
const double rtmp2 = mainBlock->val[main_ptr[ir]*nblk+ib+blk*ib];
- mainBlock->val[main_ptr[ir]*nblk+ib+blk*ib] = -rtmp1;
- left_over[irow]=rtmp2+rtmp1;
+ const double rtmp1 = rtmp2-left_over[irow];
+ mainBlock->val[main_ptr[ir]*nblk+ib+blk*ib] = rtmp1;
+ left_over[irow]=rtmp2-rtmp1;
}
}
}
diff --git a/paso/src/SystemMatrix.h b/paso/src/SystemMatrix.h
index 31b9c98..aab263d 100644
--- a/paso/src/SystemMatrix.h
+++ b/paso/src/SystemMatrix.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrixPattern.cpp b/paso/src/SystemMatrixPattern.cpp
index 9614d17..2b9a04a 100644
--- a/paso/src/SystemMatrixPattern.cpp
+++ b/paso/src/SystemMatrixPattern.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrixPattern.h b/paso/src/SystemMatrixPattern.h
index 0901a56..ff5089b 100644
--- a/paso/src/SystemMatrixPattern.h
+++ b/paso/src/SystemMatrixPattern.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrixPattern_unrollBlocks.cpp b/paso/src/SystemMatrixPattern_unrollBlocks.cpp
index 7810558..1f9ab86 100644
--- a/paso/src/SystemMatrixPattern_unrollBlocks.cpp
+++ b/paso/src/SystemMatrixPattern_unrollBlocks.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix_MatrixVector.cpp b/paso/src/SystemMatrix_MatrixVector.cpp
index 79d272b..d1ac4c6 100644
--- a/paso/src/SystemMatrix_MatrixVector.cpp
+++ b/paso/src/SystemMatrix_MatrixVector.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix_copyRemoteCoupleBlock.cpp b/paso/src/SystemMatrix_copyRemoteCoupleBlock.cpp
index 6891f35..69efde7 100644
--- a/paso/src/SystemMatrix_copyRemoteCoupleBlock.cpp
+++ b/paso/src/SystemMatrix_copyRemoteCoupleBlock.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix_debug.cpp b/paso/src/SystemMatrix_debug.cpp
index f42a17a..b922e4f 100644
--- a/paso/src/SystemMatrix_debug.cpp
+++ b/paso/src/SystemMatrix_debug.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix_extendedRows.cpp b/paso/src/SystemMatrix_extendedRows.cpp
index 8c829e8..2d8fd6f 100644
--- a/paso/src/SystemMatrix_extendedRows.cpp
+++ b/paso/src/SystemMatrix_extendedRows.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix_loadMM.cpp b/paso/src/SystemMatrix_loadMM.cpp
index ae0b4be..c36b80f 100644
--- a/paso/src/SystemMatrix_loadMM.cpp
+++ b/paso/src/SystemMatrix_loadMM.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/SystemMatrix_mergeMainAndCouple.cpp b/paso/src/SystemMatrix_mergeMainAndCouple.cpp
index 09515d1..0cde64b 100644
--- a/paso/src/SystemMatrix_mergeMainAndCouple.cpp
+++ b/paso/src/SystemMatrix_mergeMainAndCouple.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/TFQMR.cpp b/paso/src/TFQMR.cpp
index f251998..7fec473 100644
--- a/paso/src/TFQMR.cpp
+++ b/paso/src/TFQMR.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Transport.cpp b/paso/src/Transport.cpp
index 0f4671d..3561be2 100644
--- a/paso/src/Transport.cpp
+++ b/paso/src/Transport.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Transport.h b/paso/src/Transport.h
index 7ebc469..ad6d97e 100644
--- a/paso/src/Transport.h
+++ b/paso/src/Transport.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/Transport_solve.cpp b/paso/src/Transport_solve.cpp
index 8845933..958cc86 100644
--- a/paso/src/Transport_solve.cpp
+++ b/paso/src/Transport_solve.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/UMFPACK.cpp b/paso/src/UMFPACK.cpp
index 5d3037c..b9f77f2 100644
--- a/paso/src/UMFPACK.cpp
+++ b/paso/src/UMFPACK.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -62,10 +62,16 @@ void UMFPACK_solve(SparseMatrix_ptr A, double* out, double* in,
UMFPACK_Handler* pt = reinterpret_cast<UMFPACK_Handler*>(A->solver_p);
double control[UMFPACK_CONTROL], info[UMFPACK_INFO];
+#ifdef ESYS_INDEXTYPE_LONG
+ umfpack_dl_defaults(control);
+#else
umfpack_di_defaults(control);
+#endif
+#ifdef UMFPACK_ORDERING_METIS
+ control[UMFPACK_ORDERING] = UMFPACK_ORDERING_METIS; // in versions > 5.2
+#endif
double time0;
int error;
-
if (pt == NULL) {
int n = A->numRows;
pt = new UMFPACK_Handler;
diff --git a/paso/src/UMFPACK.h b/paso/src/UMFPACK.h
index e2e5127..ce28f1f 100644
--- a/paso/src/UMFPACK.h
+++ b/paso/src/UMFPACK.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/mmio.cpp b/paso/src/mmio.cpp
index 390e8c6..e1c9f5d 100644
--- a/paso/src/mmio.cpp
+++ b/paso/src/mmio.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/mmio.h b/paso/src/mmio.h
index bef8fe8..b5e152e 100644
--- a/paso/src/mmio.h
+++ b/paso/src/mmio.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/performance.cpp b/paso/src/performance.cpp
index 3b451ef..4432362 100644
--- a/paso/src/performance.cpp
+++ b/paso/src/performance.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/performance.h b/paso/src/performance.h
index f7c420e..34c5818 100644
--- a/paso/src/performance.h
+++ b/paso/src/performance.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/paso/src/solve.cpp b/paso/src/solve.cpp
index 827a2b0..14c0e0c 100644
--- a/paso/src/solve.cpp
+++ b/paso/src/solve.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/py_src/SConscript b/pasowrap/py_src/SConscript
index 3b14d6f..05a35ee 100644
--- a/pasowrap/py_src/SConscript
+++ b/pasowrap/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/py_src/__init__.py b/pasowrap/py_src/__init__.py
index 9edb172..89dfee8 100644
--- a/pasowrap/py_src/__init__.py
+++ b/pasowrap/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from .pasowrap import *
diff --git a/pasowrap/py_src/pasowrap.py b/pasowrap/py_src/pasowrap.py
index 9b36a4a..3bd8b4a 100644
--- a/pasowrap/py_src/pasowrap.py
+++ b/pasowrap/py_src/pasowrap.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2011-2015 by The University of Queensland
+# Copyright (c) 2011-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2011-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2011-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escript # This is just to ensure required libraries are loaded
diff --git a/pasowrap/src/PasoException.cpp b/pasowrap/src/PasoException.cpp
index b472ea4..5c5a2da 100644
--- a/pasowrap/src/PasoException.cpp
+++ b/pasowrap/src/PasoException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/PasoException.h b/pasowrap/src/PasoException.h
index ca44941..af6158c 100644
--- a/pasowrap/src/PasoException.h
+++ b/pasowrap/src/PasoException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/SConscript b/pasowrap/src/SConscript
index 9561eda..eaab536 100644
--- a/pasowrap/src/SConscript
+++ b/pasowrap/src/SConscript
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/SystemMatrixAdapter.cpp b/pasowrap/src/SystemMatrixAdapter.cpp
index dfbe91e..2ba84d1 100644
--- a/pasowrap/src/SystemMatrixAdapter.cpp
+++ b/pasowrap/src/SystemMatrixAdapter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/SystemMatrixAdapter.h b/pasowrap/src/SystemMatrixAdapter.h
index d21a2f5..769ff40 100644
--- a/pasowrap/src/SystemMatrixAdapter.h
+++ b/pasowrap/src/SystemMatrixAdapter.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/TransportProblemAdapter.cpp b/pasowrap/src/TransportProblemAdapter.cpp
index e6caabf..c8ff1ad 100644
--- a/pasowrap/src/TransportProblemAdapter.cpp
+++ b/pasowrap/src/TransportProblemAdapter.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/TransportProblemAdapter.h b/pasowrap/src/TransportProblemAdapter.h
index a50aa95..9e58dc4 100644
--- a/pasowrap/src/TransportProblemAdapter.h
+++ b/pasowrap/src/TransportProblemAdapter.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/pasowrapcpp.cpp b/pasowrap/src/pasowrapcpp.cpp
index 56d954f..1e74e4a 100644
--- a/pasowrap/src/pasowrapcpp.cpp
+++ b/pasowrap/src/pasowrapcpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pasowrap/src/system_dep.h b/pasowrap/src/system_dep.h
index b538270..063613e 100644
--- a/pasowrap/src/system_dep.h
+++ b/pasowrap/src/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pycad/py_src/SConscript b/pycad/py_src/SConscript
index 08a14f4..a516889 100644
--- a/pycad/py_src/SConscript
+++ b/pycad/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/pycad/py_src/Triangle.py b/pycad/py_src/Triangle.py
index 48c41cf..bc7104e 100644
--- a/pycad/py_src/Triangle.py
+++ b/pycad/py_src/Triangle.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/__init__.py b/pycad/py_src/__init__.py
index 9cb11c8..f4a3ce5 100644
--- a/pycad/py_src/__init__.py
+++ b/pycad/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/design.py b/pycad/py_src/design.py
index c615e8d..b53a684 100644
--- a/pycad/py_src/design.py
+++ b/pycad/py_src/design.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/extras.py b/pycad/py_src/extras.py
index 1d28b52..8e034ac 100644
--- a/pycad/py_src/extras.py
+++ b/pycad/py_src/extras.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/gmsh.py b/pycad/py_src/gmsh.py
index 8bdd905..019046e 100644
--- a/pycad/py_src/gmsh.py
+++ b/pycad/py_src/gmsh.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/primitives.py b/pycad/py_src/primitives.py
index 3427464..86c2f67 100644
--- a/pycad/py_src/primitives.py
+++ b/pycad/py_src/primitives.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/shapes.py b/pycad/py_src/shapes.py
index ee20a3a..e826f14 100644
--- a/pycad/py_src/shapes.py
+++ b/pycad/py_src/shapes.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/py_src/transformations.py b/pycad/py_src/transformations.py
index cd73ac9..5928bad 100644
--- a/pycad/py_src/transformations.py
+++ b/pycad/py_src/transformations.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/pycad/test/python/SConscript b/pycad/test/python/SConscript
index 871dda0..775b93f 100644
--- a/pycad/test/python/SConscript
+++ b/pycad/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/pycad/test/python/run_pycad_test.py b/pycad/test/python/run_pycad_test.py
index 971f895..6007749 100644
--- a/pycad/test/python/run_pycad_test.py
+++ b/pycad/test/python/run_pycad_test.py
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -17,11 +17,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/pythonMPI/src/SConscript b/pythonMPI/src/SConscript
index 4d6b80b..ec9f8d5 100644
--- a/pythonMPI/src/SConscript
+++ b/pythonMPI/src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/pythonMPI/src/ScriptMPI.cpp b/pythonMPI/src/ScriptMPI.cpp
index a8e53aa..ee39f26 100644
--- a/pythonMPI/src/ScriptMPI.cpp
+++ b/pythonMPI/src/ScriptMPI.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/pythonMPI/src/ScriptMPIredirect.cpp b/pythonMPI/src/ScriptMPIredirect.cpp
index af18496..bcf03e6 100644
--- a/pythonMPI/src/ScriptMPIredirect.cpp
+++ b/pythonMPI/src/ScriptMPIredirect.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/generators/lamebuilder.py b/ripley/generators/lamebuilder.py
index 358bc1a..cab98e0 100644
--- a/ripley/generators/lamebuilder.py
+++ b/ripley/generators/lamebuilder.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/generators/lamesource.py b/ripley/generators/lamesource.py
index 72da381..d921ac0 100644
--- a/ripley/generators/lamesource.py
+++ b/ripley/generators/lamesource.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/py_src/MultiResolutionDomain.py b/ripley/py_src/MultiResolutionDomain.py
index 848cc26..fd8b664 100644
--- a/ripley/py_src/MultiResolutionDomain.py
+++ b/ripley/py_src/MultiResolutionDomain.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/py_src/SConscript b/ripley/py_src/SConscript
index 6dbd59b..a9a2ff6 100644
--- a/ripley/py_src/SConscript
+++ b/ripley/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/py_src/__init__.py b/ripley/py_src/__init__.py
index 7732deb..f3b03a9 100644
--- a/ripley/py_src/__init__.py
+++ b/ripley/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,11 +19,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escript # This is just to ensure required libraries are loaded
diff --git a/ripley/src/AbstractAssembler.h b/ripley/src/AbstractAssembler.h
index f07e8b8..bba0c67 100644
--- a/ripley/src/AbstractAssembler.h
+++ b/ripley/src/AbstractAssembler.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/Brick.cpp b/ripley/src/Brick.cpp
index 8adfa54..9bd3e6b 100644
--- a/ripley/src/Brick.cpp
+++ b/ripley/src/Brick.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -780,8 +780,8 @@ void Brick::writeBinaryGridImpl(const escript::Data& in,
throw RipleyException("writeBinaryGrid(): only scalar, single-value data supported");
// from here on we know that each sample consists of one value
- FileWriter fw;
- fw.openFile(filename, fileSize);
+ FileWriter fw(m_mpiInfo->comm);
+ fw.openFile(filename, fileSize, true);
MPIBarrier();
for (index_t z=0; z<myN2; z++) {
diff --git a/ripley/src/Brick.h b/ripley/src/Brick.h
index 1f3c236..b9b99df 100644
--- a/ripley/src/Brick.h
+++ b/ripley/src/Brick.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/DefaultAssembler2D.cpp b/ripley/src/DefaultAssembler2D.cpp
index fec0fad..d1cda6f 100644
--- a/ripley/src/DefaultAssembler2D.cpp
+++ b/ripley/src/DefaultAssembler2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/DefaultAssembler2D.h b/ripley/src/DefaultAssembler2D.h
index a28e65a..25a892f 100644
--- a/ripley/src/DefaultAssembler2D.h
+++ b/ripley/src/DefaultAssembler2D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/DefaultAssembler3D.cpp b/ripley/src/DefaultAssembler3D.cpp
index 4de5253..1345707 100644
--- a/ripley/src/DefaultAssembler3D.cpp
+++ b/ripley/src/DefaultAssembler3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/DefaultAssembler3D.h b/ripley/src/DefaultAssembler3D.h
index 7586610..a175e84 100644
--- a/ripley/src/DefaultAssembler3D.h
+++ b/ripley/src/DefaultAssembler3D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/LameAssembler2D.cpp b/ripley/src/LameAssembler2D.cpp
index 15abe99..1387450 100644
--- a/ripley/src/LameAssembler2D.cpp
+++ b/ripley/src/LameAssembler2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/LameAssembler2D.h b/ripley/src/LameAssembler2D.h
index 749cb67..a3fda4c 100644
--- a/ripley/src/LameAssembler2D.h
+++ b/ripley/src/LameAssembler2D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/LameAssembler3D.cpp b/ripley/src/LameAssembler3D.cpp
index db4eec7..8ba9891 100644
--- a/ripley/src/LameAssembler3D.cpp
+++ b/ripley/src/LameAssembler3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/LameAssembler3D.h b/ripley/src/LameAssembler3D.h
index 6bc505e..19ad41a 100644
--- a/ripley/src/LameAssembler3D.h
+++ b/ripley/src/LameAssembler3D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/MultiBrick.cpp b/ripley/src/MultiBrick.cpp
index 2fd22d5..661e1f2 100644
--- a/ripley/src/MultiBrick.cpp
+++ b/ripley/src/MultiBrick.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -15,29 +15,13 @@
*****************************************************************************/
#define ESNEEDPYTHON
-#include "esysUtils/first.h"
+#include <esysUtils/first.h>
#include <ripley/MultiBrick.h>
#include <ripley/blocktools.h>
#include <ripley/domainhelpers.h>
-#include <paso/SystemMatrix.h>
-#include <esysUtils/esysFileWriter.h>
-#include <esysUtils/EsysRandom.h>
#include <escript/DataFactory.h>
#include <escript/FunctionSpaceFactory.h>
-#include <boost/scoped_array.hpp>
-#include <boost/math/special_functions/fpclassify.hpp> // for isnan
-
-#ifdef USE_NETCDF
-#include <netcdfcpp.h>
-#endif
-
-#if USE_SILO
-#include <silo.h>
-#ifdef ESYS_MPI
-#include <pmpio.h>
-#endif
-#endif
#define FIRST_QUAD 0.21132486540518711775
#define SECOND_QUAD 0.78867513459481288225
@@ -45,17 +29,9 @@
#include <iomanip>
#include <limits>
-
-
-namespace bp = boost::python;
-using esysUtils::FileWriter;
-using escript::AbstractSystemMatrix;
-
using std::vector;
using std::string;
using std::min;
-using std::max;
-using std::copy;
using std::ios;
using std::fill;
@@ -389,9 +365,9 @@ void MultiBrick::interpolateElementsToElementsCoarser(const escript::Data& sourc
const dim_t *theirNE = other.getNumElementsPerDim();
const dim_t numComp = source.getDataPointSize();
- std::vector<double> points(scaling*2, 0);
- std::vector<double> first_lagrange(scaling*2, 1);
- std::vector<double> second_lagrange(scaling*2, 1);
+ vector<double> points(scaling*2, 0);
+ vector<double> first_lagrange(scaling*2, 1);
+ vector<double> second_lagrange(scaling*2, 1);
for (int i = 0; i < scaling*2; i+=2) {
points[i] = (i/2 + FIRST_QUAD)/scaling;
@@ -448,8 +424,8 @@ void MultiBrick::interpolateElementsToElementsFiner(const escript::Data& source,
const int scaling = other.getNumSubdivisionsPerElement()/m_subdivisions;
const dim_t numComp = source.getDataPointSize();
- std::vector<double> points(scaling*2, 0);
- std::vector<double> lagranges(scaling*4, 1);
+ vector<double> points(scaling*2, 0);
+ vector<double> lagranges(scaling*4, 1);
for (int i = 0; i < scaling*2; i+=2) {
points[i] = (i/2 + FIRST_QUAD)/scaling;
diff --git a/ripley/src/MultiBrick.h b/ripley/src/MultiBrick.h
index 314a304..d222efe 100644
--- a/ripley/src/MultiBrick.h
+++ b/ripley/src/MultiBrick.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/MultiRectangle.cpp b/ripley/src/MultiRectangle.cpp
index 1f7782c..93b2f0e 100644
--- a/ripley/src/MultiRectangle.cpp
+++ b/ripley/src/MultiRectangle.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -15,50 +15,23 @@
*****************************************************************************/
#define ESNEEDPYTHON
-#include "esysUtils/first.h"
+#include <esysUtils/first.h>
#include <ripley/MultiRectangle.h>
#include <ripley/blocktools.h>
#include <ripley/domainhelpers.h>
-#include <paso/SystemMatrix.h>
-#include <esysUtils/esysFileWriter.h>
-#include <esysUtils/EsysRandom.h>
#include <escript/DataFactory.h>
#include <escript/FunctionSpaceFactory.h>
-#include <boost/scoped_array.hpp>
-#include <boost/math/special_functions/fpclassify.hpp> // for isnan
-
-#ifdef USE_NETCDF
-#include <netcdfcpp.h>
-#endif
-
-#if USE_SILO
-#include <silo.h>
-#ifdef ESYS_MPI
-#include <pmpio.h>
-#endif
-#endif
#define FIRST_QUAD 0.21132486540518711775
#define SECOND_QUAD 0.78867513459481288225
+#include <algorithm>
#include <iomanip>
#include <limits>
-
-#include <algorithm>
-
-namespace bp = boost::python;
-using esysUtils::FileWriter;
-using escript::AbstractSystemMatrix;
-
using std::vector;
using std::string;
-using std::min;
-using std::max;
-using std::copy;
-using std::ios;
-using std::fill;
namespace ripley {
@@ -272,9 +245,9 @@ void MultiRectangle::interpolateElementsToElementsCoarser(const escript::Data& s
const dim_t *theirNE = other.getNumElementsPerDim();
const dim_t numComp = source.getDataPointSize();
- std::vector<double> points(scaling*2, 0);
- std::vector<double> first_lagrange(scaling*2, 1);
- std::vector<double> second_lagrange(scaling*2, 1);
+ vector<double> points(scaling*2, 0);
+ vector<double> first_lagrange(scaling*2, 1);
+ vector<double> second_lagrange(scaling*2, 1);
for (int i = 0; i < scaling*2; i+=2) {
points[i] = (i/2 + FIRST_QUAD)/scaling;
@@ -321,8 +294,8 @@ void MultiRectangle::interpolateElementsToElementsFiner(const escript::Data& sou
const int scaling = other.getNumSubdivisionsPerElement()/m_subdivisions;
const dim_t numComp = source.getDataPointSize();
- std::vector<double> points(scaling*2, 0);
- std::vector<double> lagranges(scaling*4, 1);
+ vector<double> points(scaling*2, 0);
+ vector<double> lagranges(scaling*4, 1);
for (int i = 0; i < scaling*2; i+=2) {
points[i] = (i/2 + FIRST_QUAD)/scaling;
diff --git a/ripley/src/MultiRectangle.h b/ripley/src/MultiRectangle.h
index f97d6e8..9a27e22 100644
--- a/ripley/src/MultiRectangle.h
+++ b/ripley/src/MultiRectangle.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/Rectangle.cpp b/ripley/src/Rectangle.cpp
index 2a973a8..c75a147 100644
--- a/ripley/src/Rectangle.cpp
+++ b/ripley/src/Rectangle.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -656,8 +656,8 @@ void Rectangle::writeBinaryGridImpl(const escript::Data& in,
const dim_t fileSize = sizeof(ValueType)*numComp*dpp*totalN0*totalN1;
// from here on we know that each sample consists of one value
- FileWriter fw;
- fw.openFile(filename, fileSize);
+ FileWriter fw(m_mpiInfo->comm);
+ fw.openFile(filename, fileSize, true);
MPIBarrier();
for (index_t y=0; y<myN1; y++) {
diff --git a/ripley/src/Rectangle.h b/ripley/src/Rectangle.h
index 6cf6377..b66cd5d 100644
--- a/ripley/src/Rectangle.h
+++ b/ripley/src/Rectangle.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/Ripley.h b/ripley/src/Ripley.h
index 4e2a313..3a82909 100644
--- a/ripley/src/Ripley.h
+++ b/ripley/src/Ripley.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/RipleyDomain.cpp b/ripley/src/RipleyDomain.cpp
index 3b0dc0d..cf1f2e4 100644
--- a/ripley/src/RipleyDomain.cpp
+++ b/ripley/src/RipleyDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/RipleyDomain.h b/ripley/src/RipleyDomain.h
index 0352ca3..775e998 100644
--- a/ripley/src/RipleyDomain.h
+++ b/ripley/src/RipleyDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/RipleyException.cpp b/ripley/src/RipleyException.cpp
index 4e18bb1..90e6dc6 100644
--- a/ripley/src/RipleyException.cpp
+++ b/ripley/src/RipleyException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/RipleyException.h b/ripley/src/RipleyException.h
index b0b5c3e..485bbfc 100644
--- a/ripley/src/RipleyException.h
+++ b/ripley/src/RipleyException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/RipleySystemMatrix.cu b/ripley/src/RipleySystemMatrix.cu
index 256fcdf..fab759d 100644
--- a/ripley/src/RipleySystemMatrix.cu
+++ b/ripley/src/RipleySystemMatrix.cu
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/RipleySystemMatrix.h b/ripley/src/RipleySystemMatrix.h
index 726f95f..d6cfe65 100644
--- a/ripley/src/RipleySystemMatrix.h
+++ b/ripley/src/RipleySystemMatrix.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/SConscript b/ripley/src/SConscript
index 2328f13..c8baa01 100644
--- a/ripley/src/SConscript
+++ b/ripley/src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/WaveAssembler2D.cpp b/ripley/src/WaveAssembler2D.cpp
index becc887..0ac45ab 100644
--- a/ripley/src/WaveAssembler2D.cpp
+++ b/ripley/src/WaveAssembler2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/WaveAssembler2D.h b/ripley/src/WaveAssembler2D.h
index 65d0531..735ddde 100644
--- a/ripley/src/WaveAssembler2D.h
+++ b/ripley/src/WaveAssembler2D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/WaveAssembler3D.cpp b/ripley/src/WaveAssembler3D.cpp
index 7825a5a..e1cc64f 100644
--- a/ripley/src/WaveAssembler3D.cpp
+++ b/ripley/src/WaveAssembler3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/WaveAssembler3D.h b/ripley/src/WaveAssembler3D.h
index 66fb50b..4bfd9c4 100644
--- a/ripley/src/WaveAssembler3D.h
+++ b/ripley/src/WaveAssembler3D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/blocktools.cpp b/ripley/src/blocktools.cpp
index 7d4c684..fea3f0d 100644
--- a/ripley/src/blocktools.cpp
+++ b/ripley/src/blocktools.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/blocktools.h b/ripley/src/blocktools.h
index 56a7b80..db7e800 100644
--- a/ripley/src/blocktools.h
+++ b/ripley/src/blocktools.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/blocktools2.cpp b/ripley/src/blocktools2.cpp
index 8cb1369..ff1115d 100644
--- a/ripley/src/blocktools2.cpp
+++ b/ripley/src/blocktools2.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/domainhelpers.cpp b/ripley/src/domainhelpers.cpp
index 7accdcd..60be56e 100644
--- a/ripley/src/domainhelpers.cpp
+++ b/ripley/src/domainhelpers.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/domainhelpers.h b/ripley/src/domainhelpers.h
index 3ebbe6e..314e737 100644
--- a/ripley/src/domainhelpers.h
+++ b/ripley/src/domainhelpers.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/generate_assamblage.py b/ripley/src/generate_assamblage.py
index cd4f67f..e230225 100644
--- a/ripley/src/generate_assamblage.py
+++ b/ripley/src/generate_assamblage.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/generate_assemblage_cpp.py b/ripley/src/generate_assemblage_cpp.py
index 7077709..225ec4b 100644
--- a/ripley/src/generate_assemblage_cpp.py
+++ b/ripley/src/generate_assemblage_cpp.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/ripleycpp.cpp b/ripley/src/ripleycpp.cpp
index f937f38..d44744c 100644
--- a/ripley/src/ripleycpp.cpp
+++ b/ripley/src/ripleycpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/src/system_dep.h b/ripley/src/system_dep.h
index 90bd80e..db010a3 100644
--- a/ripley/src/system_dep.h
+++ b/ripley/src/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/test/SConscript b/ripley/test/SConscript
index 3241ef1..e897082 100644
--- a/ripley/test/SConscript
+++ b/ripley/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/test/SystemMatrixTestCase.cpp b/ripley/test/SystemMatrixTestCase.cpp
index c86ff76..a327538 100644
--- a/ripley/test/SystemMatrixTestCase.cpp
+++ b/ripley/test/SystemMatrixTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/test/SystemMatrixTestCase.h b/ripley/test/SystemMatrixTestCase.h
index 200d4e7..ddd119b 100644
--- a/ripley/test/SystemMatrixTestCase.h
+++ b/ripley/test/SystemMatrixTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/test/python/SConscript b/ripley/test/python/SConscript
index 013fd45..796548e 100644
--- a/ripley/test/python/SConscript
+++ b/ripley/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/ripley/test/python/run_customAssemblersOnMultiRes.py b/ripley/test/python/run_customAssemblersOnMultiRes.py
index d012a62..49ca44b 100644
--- a/ripley/test/python/run_customAssemblersOnMultiRes.py
+++ b/ripley/test/python/run_customAssemblersOnMultiRes.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/ripley/test/python/run_customAssemblersOnRipley.py b/ripley/test/python/run_customAssemblersOnRipley.py
index bbd6cb5..f7635d1 100644
--- a/ripley/test/python/run_customAssemblersOnRipley.py
+++ b/ripley/test/python/run_customAssemblersOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/ripley/test/python/run_diracOnMultiRes.py b/ripley/test/python/run_diracOnMultiRes.py
index 42f6396..a9bdfba 100644
--- a/ripley/test/python/run_diracOnMultiRes.py
+++ b/ripley/test/python/run_diracOnMultiRes.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, sys
diff --git a/ripley/test/python/run_diracOnRipley.py b/ripley/test/python/run_diracOnRipley.py
index bea1af8..b08c0e4 100644
--- a/ripley/test/python/run_diracOnRipley.py
+++ b/ripley/test/python/run_diracOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, sys
diff --git a/ripley/test/python/run_escriptOnMultiResolution.py b/ripley/test/python/run_escriptOnMultiResolution.py
index 616cd47..e3b492e 100644
--- a/ripley/test/python/run_escriptOnMultiResolution.py
+++ b/ripley/test/python/run_escriptOnMultiResolution.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/ripley/test/python/run_escriptOnRipley.py b/ripley/test/python/run_escriptOnRipley.py
index 1461cf5..76d54b7 100644
--- a/ripley/test/python/run_escriptOnRipley.py
+++ b/ripley/test/python/run_escriptOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/ripley/test/python/run_linearPDEsOnMultiRes.py b/ripley/test/python/run_linearPDEsOnMultiRes.py
index f97859a..e6d1155 100644
--- a/ripley/test/python/run_linearPDEsOnMultiRes.py
+++ b/ripley/test/python/run_linearPDEsOnMultiRes.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/ripley/test/python/run_linearPDEsOnRipley.py b/ripley/test/python/run_linearPDEsOnRipley.py
index 491af6a..d2e9dd3 100644
--- a/ripley/test/python/run_linearPDEsOnRipley.py
+++ b/ripley/test/python/run_linearPDEsOnRipley.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/ripley/test/python/run_nonlinearPDEOnMultiRes.py b/ripley/test/python/run_nonlinearPDEOnMultiRes.py
index afa2fec..89d57cc 100644
--- a/ripley/test/python/run_nonlinearPDEOnMultiRes.py
+++ b/ripley/test/python/run_nonlinearPDEOnMultiRes.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/ripley/test/python/run_nonlinearPDEOnRipley.py b/ripley/test/python/run_nonlinearPDEOnRipley.py
index de2c7b1..5483115 100644
--- a/ripley/test/python/run_nonlinearPDEOnRipley.py
+++ b/ripley/test/python/run_nonlinearPDEOnRipley.py
@@ -1,24 +1,24 @@
########################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# Earth Systems Science Computational Center (ESSCC)
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
########################################################
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
Earth Systems Science Computational Center (ESSCC)
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/ripley/test/python/run_readWriteOnMultiRes.py b/ripley/test/python/run_readWriteOnMultiRes.py
index 19cbbfc..be9d3c9 100644
--- a/ripley/test/python/run_readWriteOnMultiRes.py
+++ b/ripley/test/python/run_readWriteOnMultiRes.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/ripley/test/python/run_readWriteOnRipley.py b/ripley/test/python/run_readWriteOnRipley.py
index 8cc6b78..7279f16 100644
--- a/ripley/test/python/run_readWriteOnRipley.py
+++ b/ripley/test/python/run_readWriteOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/ripley/test/python/run_simplesolveOnMultiRes.py b/ripley/test/python/run_simplesolveOnMultiRes.py
index 5153185..602af27 100644
--- a/ripley/test/python/run_simplesolveOnMultiRes.py
+++ b/ripley/test/python/run_simplesolveOnMultiRes.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/ripley/test/python/run_simplesolveOnRipley.py b/ripley/test/python/run_simplesolveOnRipley.py
index a4cba81..623f9cc 100644
--- a/ripley/test/python/run_simplesolveOnRipley.py
+++ b/ripley/test/python/run_simplesolveOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
"""
diff --git a/ripley/test/python/run_splitworldOnRipley.py b/ripley/test/python/run_splitworldOnRipley.py
index 34bdff9..07e7f8a 100644
--- a/ripley/test/python/run_splitworldOnRipley.py
+++ b/ripley/test/python/run_splitworldOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2015 by The University of Queensland
+__copyright__="""Copyright (c) 2015-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-ripley"
import esys.escriptcore.utestselect as unittest
diff --git a/ripley/test/python/run_utilOnMultiRes.py b/ripley/test/python/run_utilOnMultiRes.py
index 5ac73e7..4c5205d 100644
--- a/ripley/test/python/run_utilOnMultiRes.py
+++ b/ripley/test/python/run_utilOnMultiRes.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/ripley/test/python/run_utilOnRipley.py b/ripley/test/python/run_utilOnRipley.py
index 57175e6..7114fc6 100644
--- a/ripley/test/python/run_utilOnRipley.py
+++ b/ripley/test/python/run_utilOnRipley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/ripley/test/ripley_UnitTest.cpp b/ripley/test/ripley_UnitTest.cpp
index a13a431..16ec3f9 100644
--- a/ripley/test/ripley_UnitTest.cpp
+++ b/ripley/test/ripley_UnitTest.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2014-2015 by The University of Queensland
+* Copyright (c) 2014-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -14,17 +14,21 @@
*
*****************************************************************************/
-#include <iostream>
+#define ESNEEDPYTHON
+#include <esysUtils/first.h>
+#include <esysUtils/Esys_MPI.h>
#include "SystemMatrixTestCase.h"
+
#include <cppunit/CompilerOutputter.h>
#include <cppunit/TestResult.h>
#include <cppunit/TestResultCollector.h>
#include <cppunit/TestRunner.h>
+#include <iostream>
+
using namespace CppUnit;
-#include "esysUtils/Esys_MPI.h"
int main(int argc, char* argv[])
{
diff --git a/run-escript.in b/run-escript.in
index fd3428b..140fb6b 100644
--- a/run-escript.in
+++ b/run-escript.in
@@ -2,12 +2,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -467,6 +467,14 @@ then
EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"
fi
+if [ "$MPI_FLAVOUR" = "OPENMPI" ]
+then
+ if [ -z `which rsh``which ssh` ]
+ then
+ AGENTOVERRIDE="--gmca orte_rsh_agent /bin/false"
+ fi
+fi
+
vlog "Pre-launch command: \"@@PRELAUNCH\""
@@PRELAUNCH
vlog "Launch command: \"@@LAUNCH\""
diff --git a/scons/templates/__init__.py b/scons/templates/__init__.py
index a18a325..fd91591 100644
--- a/scons/templates/__init__.py
+++ b/scons/templates/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/centos7_0_options.py b/scons/templates/centos7_0_options.py
index 933eaf3..a7fdf34 100644
--- a/scons/templates/centos7_0_options.py
+++ b/scons/templates/centos7_0_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ netcdf = True
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/fedora21_5_options.py b/scons/templates/fedora21_5_options.py
index 3ecf23d..e5a2155 100644
--- a/scons/templates/fedora21_5_options.py
+++ b/scons/templates/fedora21_5_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ netcdf = True
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/freebsd10_0_options.py b/scons/templates/freebsd10_0_options.py
index 6951710..21190ee 100644
--- a/scons/templates/freebsd10_0_options.py
+++ b/scons/templates/freebsd10_0_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -137,13 +137,13 @@ cppunit_prefix = '/usr/local'
# Whether to use the netCDF library for dump file support and netCDF-based
# downunder data import
# DEFAULT: False
-#netcdf = True
+netcdf = True
# Prefix or paths to netCDF headers and libraries. See note above.
netcdf_prefix = '/usr/local'
# netCDF library/libraries to link against
-netcdf_libs = ['netcdf_c++4', 'netcdf']
+#netcdf_libs = ['netcdf_c++', 'netcdf']
# Whether to use the parMETIS library (only in conjunction with MPI)
# DEFAULT: False
@@ -204,7 +204,7 @@ silo = True
silo_prefix = '/usr/local'
# SILO library/libraries to link against
-silo_libs = ['siloh5']
+silo_libs = ['silo']
# Whether to use LLNL's VisIt simulation interface (only version 2 supported)
# DEFAULT: False
@@ -218,7 +218,7 @@ silo_libs = ['siloh5']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/homebrew_10.10_options.py b/scons/templates/homebrew_10.10_options.py
index cedb7e0..74e463a 100644
--- a/scons/templates/homebrew_10.10_options.py
+++ b/scons/templates/homebrew_10.10_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -229,6 +229,10 @@ netcdf_libs = ['netcdf_c++', 'netcdf']
# Sim2 library/libraries to link against
#visit_libs = ['simV2']
+# List of domain families to build [new in 202]
+# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
+#domains = 'finley,ripley'
+
# Build dynamic libraries only
#DEFAULT: False
#build_shared = True
diff --git a/scons/templates/homebrew_10.10_options.py b/scons/templates/homebrew_11_options.py
similarity index 95%
copy from scons/templates/homebrew_10.10_options.py
copy to scons/templates/homebrew_11_options.py
index cedb7e0..ecb4c36 100644
--- a/scons/templates/homebrew_10.10_options.py
+++ b/scons/templates/homebrew_11_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -34,6 +34,10 @@
# This setting is mandatory.
escript_opts_version = 202
+# Do we need to modify shared libraries to list dependencies with
+# absolute paths (For OSX.11)
+osx_dependency_fix = True
+
# Installation prefix. Files will be installed in subdirectories underneath.
# DEFAULT: '.' (current directory)
#prefix = '/usr/local'
@@ -229,6 +233,10 @@ netcdf_libs = ['netcdf_c++', 'netcdf']
# Sim2 library/libraries to link against
#visit_libs = ['simV2']
+# List of domain families to build [new in 202]
+# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
+#domains = 'finley,ripley'
+
# Build dynamic libraries only
#DEFAULT: False
#build_shared = True
diff --git a/scons/templates/homebrew_options.py b/scons/templates/homebrew_options.py
index 8a18b50..69f4dde 100644
--- a/scons/templates/homebrew_options.py
+++ b/scons/templates/homebrew_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -228,6 +228,10 @@ netcdf_libs = ['netcdf_c++', 'netcdf']
# Sim2 library/libraries to link against
#visit_libs = ['simV2']
+# List of domain families to build [new in 202]
+# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
+#domains = 'finley,ripley'
+
# Build dynamic libraries only
#DEFAULT: False
#build_shared = True
diff --git a/scons/templates/jessie_mpi_options.py b/scons/templates/jessie_mpi_options.py
index 5441430..cae5ae6 100644
--- a/scons/templates/jessie_mpi_options.py
+++ b/scons/templates/jessie_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/jessie_options.py b/scons/templates/jessie_options.py
index 4e8bc40..f9f98a0 100644
--- a/scons/templates/jessie_options.py
+++ b/scons/templates/jessie_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ silo_libs = ['siloh5']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/jessie_py3_mpi_options.py b/scons/templates/jessie_py3_mpi_options.py
index ff41de8..f47a8e2 100644
--- a/scons/templates/jessie_py3_mpi_options.py
+++ b/scons/templates/jessie_py3_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/jessie_py3_options.py b/scons/templates/jessie_py3_options.py
index 03f0b16..87e0760 100644
--- a/scons/templates/jessie_py3_options.py
+++ b/scons/templates/jessie_py3_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/macports_10.10_options.py b/scons/templates/macports_10.10_options.py
index c1d452e..35a22cc 100644
--- a/scons/templates/macports_10.10_options.py
+++ b/scons/templates/macports_10.10_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ silo_libs = ['siloh5']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/macports_options.py b/scons/templates/macports_options.py
index 6a01cd0..3fd8786 100644
--- a/scons/templates/macports_options.py
+++ b/scons/templates/macports_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ silo_libs = ['silo']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/opensuse13_2_options.py b/scons/templates/opensuse13_2_options.py
index 9b425bf..cb9fd88 100644
--- a/scons/templates/opensuse13_2_options.py
+++ b/scons/templates/opensuse13_2_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ openmp = True
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/vivid_mpi_options.py b/scons/templates/sid_mpi_options.py
similarity index 70%
copy from scons/templates/vivid_mpi_options.py
copy to scons/templates/sid_mpi_options.py
index 71cf390..f1ba262 100644
--- a/scons/templates/vivid_mpi_options.py
+++ b/scons/templates/sid_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,6 +14,6 @@
#
##############################################################################
-from .vivid_options import *
+from .sid_options import *
mpi='OPENMPI'
diff --git a/scons/templates/jessie_options.py b/scons/templates/sid_options.py
similarity index 92%
copy from scons/templates/jessie_options.py
copy to scons/templates/sid_options.py
index 4e8bc40..98c0e57 100644
--- a/scons/templates/jessie_options.py
+++ b/scons/templates/sid_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -106,7 +106,31 @@ openmp = True
#boost_prefix = '/usr/local'
# boost-python library/libraries to link against
-boost_libs = ['boost_python-py27']
+
+import subprocess
+import os
+
+p=subprocess.Popen(["ld","--verbose"], stdout=subprocess.PIPE)
+out,err=p.communicate()
+spath=[x[13:-3] for x in out.split() if 'SEARCH_DIR' in x]
+p2name=''
+p3name=''
+for name in spath:
+ try:
+ l=os.listdir(name)
+ p2res=[x for x in l if x.startswith('libboost_python-py2') and x.endswith('.so')]
+ p3res=[x for x in l if x.startswith('libboost_python-py3') and x.endswith('.so')]
+ if len(p2name)==0 and len(p2res)>0:
+ p2name=p2res[0]
+ if len(p3name)==0 and len(p3res)>0:
+ p3name=p3res[0]
+ except OSError:
+ pass
+
+# boost-python library/libraries to link against
+boost_libs = [p2name[3:-3]]
+
+
# Prefix or paths to CppUnit headers and libraries. See note above.
# Only required for C++ unit tests.
@@ -218,7 +242,7 @@ silo_libs = ['siloh5']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/sid_py3_mpi_options.py b/scons/templates/sid_py3_mpi_options.py
new file mode 100644
index 0000000..f414fd5
--- /dev/null
+++ b/scons/templates/sid_py3_mpi_options.py
@@ -0,0 +1,61 @@
+
+##############################################################################
+#
+# Copyright (c) 2003-2016 by The University of Queensland
+# http://www.uq.edu.au
+#
+# Primary Business: Queensland, Australia
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
+# Development 2012-2013 by School of Earth Sciences
+# Development from 2014 by Centre for Geoscience Computing (GeoComp)
+#
+##############################################################################
+
+from .sid_options import *
+
+mpi='OPENMPI'
+usepython3=True
+pythoncmd='python3'
+
+import subprocess
+import sysconfig
+
+#pythonlibname='python3.4m'
+#pythonlibname=sysconfig.get_config_var("LDLIBRARY")
+
+p=subprocess.Popen([pythoncmd, '-c', 'import sysconfig\nprint(sysconfig.get_config_var("LDLIBRARY"))'], stdout=subprocess.PIPE)
+pythonlibname=p.stdout.readline().encode().strip()
+p.wait()
+
+#pythonincpath='/usr/include/python3.4'
+#pythonincpath=sysconfig.get_config_var("INCLUDEPY")
+
+p=subprocess.Popen([pythoncmd, '-c', 'import sysconfig\nprint(sysconfig.get_config_var("INCLUDEPY"))'], stdout=subprocess.PIPE)
+pythonincpath=p.stdout.readline().encode().strip()
+p.wait()
+
+
+import os
+
+p=subprocess.Popen(["ld","--verbose"], stdout=subprocess.PIPE)
+out,err=p.communicate()
+spath=[x[13:-3] for x in out.split() if 'SEARCH_DIR' in x]
+p2name=''
+p3name=''
+for name in spath:
+ try:
+ l=os.listdir(name)
+ p2res=[x for x in l if x.startswith('libboost_python-py2') and x.endswith('.so')]
+ p3res=[x for x in l if x.startswith('libboost_python-py3') and x.endswith('.so')]
+ if len(p2name)==0 and len(p2res)>0:
+ p2name=p2res[0]
+ if len(p3name)==0 and len(p3res)>0:
+ p3name=p3res[0]
+ except OSError:
+ pass
+
+# boost-python library/libraries to link against
+boost_libs = [p3name[3:-3]]
diff --git a/scons/templates/sid_py3_options.py b/scons/templates/sid_py3_options.py
new file mode 100644
index 0000000..3b9f21f
--- /dev/null
+++ b/scons/templates/sid_py3_options.py
@@ -0,0 +1,60 @@
+
+##############################################################################
+#
+# Copyright (c) 2003-2016 by The University of Queensland
+# http://www.uq.edu.au
+#
+# Primary Business: Queensland, Australia
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
+# Development 2012-2013 by School of Earth Sciences
+# Development from 2014 by Centre for Geoscience Computing (GeoComp)
+#
+##############################################################################
+
+from .sid_options import *
+
+usepython3=True
+pythoncmd='python3'
+
+import subprocess
+import sysconfig
+
+#pythonlibname='python3.4m'
+#pythonlibname=sysconfig.get_config_var("LDLIBRARY")
+
+p=subprocess.Popen([pythoncmd, '-c', 'import sysconfig\nprint(sysconfig.get_config_var("LDLIBRARY"))'], stdout=subprocess.PIPE)
+pythonlibname=p.stdout.readline().encode().strip()
+p.wait()
+
+#pythonincpath='/usr/include/python3.4'
+#pythonincpath=sysconfig.get_config_var("INCLUDEPY")
+
+p=subprocess.Popen([pythoncmd, '-c', 'import sysconfig\nprint(sysconfig.get_config_var("INCLUDEPY"))'], stdout=subprocess.PIPE)
+pythonincpath=p.stdout.readline().encode().strip()
+p.wait()
+
+
+import os
+
+p=subprocess.Popen(["ld","--verbose"], stdout=subprocess.PIPE)
+out,err=p.communicate()
+spath=[x[13:-3] for x in out.split() if 'SEARCH_DIR' in x]
+p2name=''
+p3name=''
+for name in spath:
+ try:
+ l=os.listdir(name)
+ p2res=[x for x in l if x.startswith('libboost_python-py2') and x.endswith('.so')]
+ p3res=[x for x in l if x.startswith('libboost_python-py3') and x.endswith('.so')]
+ if len(p2name)==0 and len(p2res)>0:
+ p2name=p2res[0]
+ if len(p3name)==0 and len(p3res)>0:
+ p3name=p3res[0]
+ except OSError:
+ pass
+
+# boost-python library/libraries to link against
+boost_libs = [p3name[3:-3]]
diff --git a/scons/templates/trusty_options.py b/scons/templates/trusty_options.py
index 5507550..8808e84 100644
--- a/scons/templates/trusty_options.py
+++ b/scons/templates/trusty_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ lapack_libs = ['lapack_atlas']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/utopic_options.py b/scons/templates/utopic_options.py
index 5507550..8808e84 100644
--- a/scons/templates/utopic_options.py
+++ b/scons/templates/utopic_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ lapack_libs = ['lapack_atlas']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/vivid_mpi_options.py b/scons/templates/vivid_mpi_options.py
index 71cf390..779e554 100644
--- a/scons/templates/vivid_mpi_options.py
+++ b/scons/templates/vivid_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/vivid_options.py b/scons/templates/vivid_options.py
index 5c32383..24baa0d 100644
--- a/scons/templates/vivid_options.py
+++ b/scons/templates/vivid_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/vivid_py3_mpi_options.py b/scons/templates/vivid_py3_mpi_options.py
index b00d865..9d88bdd 100644
--- a/scons/templates/vivid_py3_mpi_options.py
+++ b/scons/templates/vivid_py3_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/vivid_py3_options.py b/scons/templates/vivid_py3_options.py
index 0ca1ade..a0ce67b 100644
--- a/scons/templates/vivid_py3_options.py
+++ b/scons/templates/vivid_py3_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/wheezy_mpi_options.py b/scons/templates/wheezy_mpi_options.py
index a94dfe1..b9fd6a9 100644
--- a/scons/templates/wheezy_mpi_options.py
+++ b/scons/templates/wheezy_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/wheezy_options.py b/scons/templates/wheezy_options.py
index 216dfc4..e572fdd 100644
--- a/scons/templates/wheezy_options.py
+++ b/scons/templates/wheezy_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ silo_libs = ['siloh5']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/wheezy_py3_mpi_options.py b/scons/templates/wheezy_py3_mpi_options.py
index fcc46e3..f7007e5 100644
--- a/scons/templates/wheezy_py3_mpi_options.py
+++ b/scons/templates/wheezy_py3_mpi_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/wheezy_py3_options.py b/scons/templates/wheezy_py3_options.py
index efcc715..51c7dfa 100644
--- a/scons/templates/wheezy_py3_options.py
+++ b/scons/templates/wheezy_py3_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scons/templates/windows_intelc_options.py b/scons/templates/windows_intelc_options.py
index 9215f21..53997c9 100644
--- a/scons/templates/windows_intelc_options.py
+++ b/scons/templates/windows_intelc_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -218,7 +218,7 @@ netcdf_libs = ['netcdf_cpp', 'netcdf']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
# Do not change the following options unless you know what they do
diff --git a/scons/templates/windows_msvc90_options.py b/scons/templates/windows_msvc90_options.py
index 545bf7f..697a06b 100644
--- a/scons/templates/windows_msvc90_options.py
+++ b/scons/templates/windows_msvc90_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -222,7 +222,7 @@ netcdf_libs = ['netcdf_cpp', 'netcdf']
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scons/templates/windows_options.py b/scons/templates/windows_options.py
index 892b410..f182085 100644
--- a/scons/templates/windows_options.py
+++ b/scons/templates/windows_options.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -225,7 +225,7 @@ escript_opts_version = 202
# List of domain families to build [new in 202]
# DEFAULT: 'all' (i.e. dudley, finley, ripley, speckley)
-#domains = ['finley', 'ripley']
+#domains = 'finley,ripley'
### ADVANCED OPTIONS ###
diff --git a/scripts/extracttests.sh b/scripts/extracttests.sh
index 8212fc8..eb92ad7 100755
--- a/scripts/extracttests.sh
+++ b/scripts/extracttests.sh
@@ -55,4 +55,4 @@ find . -name 'src' | xargs rm -r
rm -r scons
rm -r doc/user doc/cookbook
find doc -name '*.tex' | xargs rm
-rm -rf debian
+rm -rf localdebian
diff --git a/scripts/libmover.sh b/scripts/libmover.sh
new file mode 100755
index 0000000..91d2848
--- /dev/null
+++ b/scripts/libmover.sh
@@ -0,0 +1,26 @@
+
+
+#This script will take a library on macos (.so or .dylib)
+#and will replace the relative dependencies with absolute
+#deps in targetlibpath
+#
+# eg:
+# for name in `find lib -name '*.so'`;do echo $name;./libmover.sh $name `pwd`/lib; done
+
+
+if [ $# -ne 2 ]
+then
+ echo "Usage: $0 library_file_to_update targetlibpath"
+ exit 1
+fi
+
+libname=$1
+tlibpath=$2
+
+lines=`otool -L $libname | tail +3 | cut -f1 -d\ | cut -f2 | grep build/darwin`
+for name in $lines
+do
+ install_name_tool -change $name $tlibpath/`basename $name` $libname
+done
+
+
diff --git a/scripts/makesrc.sh b/scripts/makesrc.sh
index ddc8561..53b7057 100755
--- a/scripts/makesrc.sh
+++ b/scripts/makesrc.sh
@@ -2,7 +2,7 @@
#Make the source tarball for debian release
#Run this from a clean checkout
-SRCVERSION=`head -1 debian/changelog | cut -f2 -d- | cut -d\( -f2`
+SRCVERSION=`head -1 debian/changelog | tr -d '()' | tr -s '-' ' '| cut -d\ -f3`
svnversion | grep -q :
if [ $? == 0 ]
@@ -11,7 +11,9 @@ then
echo "Exiting"
exit 1
fi
-svnversion > svn_version
-tar -czf ../python-escript_$SRCVERSION.orig.tar.gz --exclude-vcs --exclude=debian --exclude=scons/*options.py *
+ls scons/*options.py > toexclude
+tar -czf ../python-escript_$SRCVERSION.orig.tar.gz --exclude-vcs --exclude=debian --exclude=localdebian --exclude=toexclude --exclude-from toexclude *
+
+rm toexclude
diff --git a/scripts/moveall.sh b/scripts/moveall.sh
new file mode 100755
index 0000000..e13215f
--- /dev/null
+++ b/scripts/moveall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Rewrites dependencies on all libraries in /lib to use /lib versions
+# rather than /build versions
+
+for name in `find lib esys -name '*.dylib' -o -name '*.so'`
+do
+ echo $name
+ scripts/libmover.sh $name `pwd`/lib
+done
diff --git a/scripts/py_comp.py b/scripts/py_comp.py
index 38dccf3..35b3e7c 100644
--- a/scripts/py_comp.py
+++ b/scripts/py_comp.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/scripts/release_sanity.py b/scripts/release_sanity.py
new file mode 100644
index 0000000..eb649e7
--- /dev/null
+++ b/scripts/release_sanity.py
@@ -0,0 +1,27 @@
+
+# Very basic sanity checks following a build
+# It is important that this script does not create any files unless
+# it is _certain_ they are removed when finished or failed.
+# We do not want the source directory polluted by actions here
+
+
+from esys.escript import *
+from esys.escript.linearPDEs import Poisson
+import esys.ripley as ripley
+import esys.finley as finley
+import esys.speckley as speckley
+from esys.weipa import saveVTK
+
+mydomain = finley.Rectangle(l0=1.,l1=1.,n0=40, n1=20)
+# define characteristic function of Gamma^D
+x = mydomain.getX()
+gammaD = whereZero(x[0])+whereZero(x[1])
+# define PDE and get its solution u
+mypde = Poisson(domain=mydomain)
+mypde.setValue(f=1,q=gammaD)
+u = mypde.getSolution()
+# write u to an external file
+#saveVTK("u.vtu",sol=u)
+
+
+
diff --git a/site_scons/dependencies.py b/site_scons/dependencies.py
index 3a3401d..4b87a6b 100644
--- a/site_scons/dependencies.py
+++ b/site_scons/dependencies.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, re, sys
@@ -311,7 +311,7 @@ def checkOptionalLibraries(env):
mkl_inc_path=''
mkl_lib_path=''
if env['mkl']:
- mkl_inc_path,mkl_lib_path=findLibWithHeader(env, env['mkl_libs'], 'mkl_solver.h', env['mkl_prefix'], lang='c++')
+ mkl_inc_path,mkl_lib_path=findLibWithHeader(env, env['mkl_libs'], 'mkl_pardiso.h', env['mkl_prefix'], lang='c++')
env.AppendUnique(CPPPATH = [mkl_inc_path])
env.AppendUnique(LIBPATH = [mkl_lib_path])
env.AppendUnique(LIBS = env['mkl_libs'])
diff --git a/site_scons/extractdebbuild.py b/site_scons/extractdebbuild.py
index a22c609..1d18b16 100644
--- a/site_scons/extractdebbuild.py
+++ b/site_scons/extractdebbuild.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2015 by The University of Queensland
+# Copyright (c) 2015-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2015 by The University of Queensland
+__copyright__="""Copyright (c) 2015-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/site_scons/grouptest.py b/site_scons/grouptest.py
index 0a6f81c..062361c 100644
--- a/site_scons/grouptest.py
+++ b/site_scons/grouptest.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -15,11 +15,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index ec563ca..c5c3b9c 100644
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import sys, os, time, py_compile, re, subprocess
@@ -200,8 +200,9 @@ def runPyUnitTest(target, source, env):
os.unlink(skipfile)
except Exception as e:
pass
- app = "cd "+pn+"; "+binpath(env, "run-escript")+" -ov "+binpath(env,
- "../tools/testrunner.py")+" -skipfile="+skipfile+" "+"-failfile="+failfile+" "+"-exit "+sn
+ app = "cd " + pn + "; " + binpath(env, "run-escript") + " -ov " + \
+ str(env.Dir('#').abspath) + "/tools/testrunner.py -skipfile=" + \
+ skipfile + " -failfile=" + failfile + " -exit " + sn
print("Executing test: ",app)
if env.Execute(app) == 0:
open(str(target[0]),'w').write("PASSED\n")
@@ -243,3 +244,8 @@ def effectiveName(inname):
if m.match(inname):
return "savanna"
return inname
+
+def osxlib_dep_rewrite(libname, targetdir, env):
+ if env.Execute("tools/libmover.sh %s %s"%(libname, targetdir)):
+ return 1
+ return None
\ No newline at end of file
diff --git a/site_scons/site_tools/nvcc.py b/site_scons/site_tools/nvcc.py
index fab77d6..33ff14d 100644
--- a/site_scons/site_tools/nvcc.py
+++ b/site_scons/site_tools/nvcc.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/py_src/SConscript b/speckley/py_src/SConscript
index 48b5b71..4551b41 100644
--- a/speckley/py_src/SConscript
+++ b/speckley/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/py_src/__init__.py b/speckley/py_src/__init__.py
index fa5d2a5..31703d8 100644
--- a/speckley/py_src/__init__.py
+++ b/speckley/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -19,11 +19,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escript # This is just to ensure required libraries are loaded
diff --git a/speckley/src/AbstractAssembler.cpp b/speckley/src/AbstractAssembler.cpp
index 8f5ff8b..b508793 100644
--- a/speckley/src/AbstractAssembler.cpp
+++ b/speckley/src/AbstractAssembler.cpp
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/AbstractAssembler.h b/speckley/src/AbstractAssembler.h
index 95deaad..8ba8470 100644
--- a/speckley/src/AbstractAssembler.h
+++ b/speckley/src/AbstractAssembler.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/Brick.cpp b/speckley/src/Brick.cpp
index e60c468..7adfd12 100644
--- a/speckley/src/Brick.cpp
+++ b/speckley/src/Brick.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/Brick.h b/speckley/src/Brick.h
index 90cf747..45fdde3 100644
--- a/speckley/src/Brick.h
+++ b/speckley/src/Brick.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/BrickGradients.cpp b/speckley/src/BrickGradients.cpp
index d19a432..e97ae0a 100644
--- a/speckley/src/BrickGradients.cpp
+++ b/speckley/src/BrickGradients.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/BrickIntegrals.cpp b/speckley/src/BrickIntegrals.cpp
index 7af82ad..f4a7b1e 100644
--- a/speckley/src/BrickIntegrals.cpp
+++ b/speckley/src/BrickIntegrals.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/BrickReductions.cpp b/speckley/src/BrickReductions.cpp
index 7aa3e28..4db4664 100644
--- a/speckley/src/BrickReductions.cpp
+++ b/speckley/src/BrickReductions.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/CrossDomainCoupler.cpp b/speckley/src/CrossDomainCoupler.cpp
index aaae9f2..b077748 100644
--- a/speckley/src/CrossDomainCoupler.cpp
+++ b/speckley/src/CrossDomainCoupler.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/CrossDomainCoupler.h b/speckley/src/CrossDomainCoupler.h
index 5ef44c1..f7ab240 100644
--- a/speckley/src/CrossDomainCoupler.h
+++ b/speckley/src/CrossDomainCoupler.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/DefaultAssembler2D.cpp b/speckley/src/DefaultAssembler2D.cpp
index 16b75e4..3962d9f 100644
--- a/speckley/src/DefaultAssembler2D.cpp
+++ b/speckley/src/DefaultAssembler2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/DefaultAssembler2D.h b/speckley/src/DefaultAssembler2D.h
index 5e28080..05e6327 100644
--- a/speckley/src/DefaultAssembler2D.h
+++ b/speckley/src/DefaultAssembler2D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/DefaultAssembler3D.cpp b/speckley/src/DefaultAssembler3D.cpp
index 2582bf9..47c5010 100644
--- a/speckley/src/DefaultAssembler3D.cpp
+++ b/speckley/src/DefaultAssembler3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/DefaultAssembler3D.h b/speckley/src/DefaultAssembler3D.h
index 202fe96..c92f021 100644
--- a/speckley/src/DefaultAssembler3D.h
+++ b/speckley/src/DefaultAssembler3D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/Rectangle.cpp b/speckley/src/Rectangle.cpp
index 172eed2..8ceb758 100644
--- a/speckley/src/Rectangle.cpp
+++ b/speckley/src/Rectangle.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/Rectangle.h b/speckley/src/Rectangle.h
index 3c47e3c..d815ffd 100644
--- a/speckley/src/Rectangle.h
+++ b/speckley/src/Rectangle.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/RectangleGradients.cpp b/speckley/src/RectangleGradients.cpp
index fba0910..aaf4e95 100644
--- a/speckley/src/RectangleGradients.cpp
+++ b/speckley/src/RectangleGradients.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/RectangleIntegrals.cpp b/speckley/src/RectangleIntegrals.cpp
index 0589793..d940c86 100644
--- a/speckley/src/RectangleIntegrals.cpp
+++ b/speckley/src/RectangleIntegrals.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/RectangleReductions.cpp b/speckley/src/RectangleReductions.cpp
index e508100..6d68d4b 100644
--- a/speckley/src/RectangleReductions.cpp
+++ b/speckley/src/RectangleReductions.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/SConscript b/speckley/src/SConscript
index 2f70e08..4e5cc61 100644
--- a/speckley/src/SConscript
+++ b/speckley/src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/Speckley.h b/speckley/src/Speckley.h
index 6c52a81..1590626 100644
--- a/speckley/src/Speckley.h
+++ b/speckley/src/Speckley.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/SpeckleyDomain.cpp b/speckley/src/SpeckleyDomain.cpp
index cd5a12f..d3dd1ea 100644
--- a/speckley/src/SpeckleyDomain.cpp
+++ b/speckley/src/SpeckleyDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/SpeckleyDomain.h b/speckley/src/SpeckleyDomain.h
index eac328b..9e1c12d 100644
--- a/speckley/src/SpeckleyDomain.h
+++ b/speckley/src/SpeckleyDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/SpeckleyException.cpp b/speckley/src/SpeckleyException.cpp
index be150b5..59cce1d 100644
--- a/speckley/src/SpeckleyException.cpp
+++ b/speckley/src/SpeckleyException.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/SpeckleyException.h b/speckley/src/SpeckleyException.h
index 544b10d..b2e0b41 100644
--- a/speckley/src/SpeckleyException.h
+++ b/speckley/src/SpeckleyException.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/WaveAssembler2D.cpp b/speckley/src/WaveAssembler2D.cpp
index 9506c28..7aac117 100644
--- a/speckley/src/WaveAssembler2D.cpp
+++ b/speckley/src/WaveAssembler2D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/WaveAssembler2D.h b/speckley/src/WaveAssembler2D.h
index ed3e60a..4334358 100644
--- a/speckley/src/WaveAssembler2D.h
+++ b/speckley/src/WaveAssembler2D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/WaveAssembler3D.cpp b/speckley/src/WaveAssembler3D.cpp
index f186431..432dfce 100644
--- a/speckley/src/WaveAssembler3D.cpp
+++ b/speckley/src/WaveAssembler3D.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/WaveAssembler3D.h b/speckley/src/WaveAssembler3D.h
index eb933ef..442cb07 100644
--- a/speckley/src/WaveAssembler3D.h
+++ b/speckley/src/WaveAssembler3D.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/domainhelpers.cpp b/speckley/src/domainhelpers.cpp
index 96ce56e..66d64ce 100644
--- a/speckley/src/domainhelpers.cpp
+++ b/speckley/src/domainhelpers.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/domainhelpers.h b/speckley/src/domainhelpers.h
index 7a948e4..5c2981d 100644
--- a/speckley/src/domainhelpers.h
+++ b/speckley/src/domainhelpers.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/lagrange_functions.h b/speckley/src/lagrange_functions.h
index 7becdf3..c665150 100644
--- a/speckley/src/lagrange_functions.h
+++ b/speckley/src/lagrange_functions.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/speckleycpp.cpp b/speckley/src/speckleycpp.cpp
index 2b8a079..f5fa098 100644
--- a/speckley/src/speckleycpp.cpp
+++ b/speckley/src/speckleycpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/src/system_dep.h b/speckley/src/system_dep.h
index 4a0972a..2879145 100644
--- a/speckley/src/system_dep.h
+++ b/speckley/src/system_dep.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/test/SConscript b/speckley/test/SConscript
index 402906a..a403ec7 100644
--- a/speckley/test/SConscript
+++ b/speckley/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/test/python/SConscript b/speckley/test/python/SConscript
index f60c4fe..e465ca6 100644
--- a/speckley/test/python/SConscript
+++ b/speckley/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/speckley/test/python/run_SpeckleyRipleyCoupler.py b/speckley/test/python/run_SpeckleyRipleyCoupler.py
index d6f63a0..17c501e 100644
--- a/speckley/test/python/run_SpeckleyRipleyCoupler.py
+++ b/speckley/test/python/run_SpeckleyRipleyCoupler.py
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -14,11 +14,11 @@
##############################################################################
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/speckley/test/python/run_customAssemblersOnSpeckley.py b/speckley/test/python/run_customAssemblersOnSpeckley.py
index 9650b7c..cfe7ab8 100644
--- a/speckley/test/python/run_customAssemblersOnSpeckley.py
+++ b/speckley/test/python/run_customAssemblersOnSpeckley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import esys.escriptcore.utestselect as unittest
diff --git a/speckley/test/python/run_diracOnSpeckley.py b/speckley/test/python/run_diracOnSpeckley.py
index 8b34aa6..c1df889 100644
--- a/speckley/test/python/run_diracOnSpeckley.py
+++ b/speckley/test/python/run_diracOnSpeckley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, sys
diff --git a/speckley/test/python/run_readWriteOnSpeckley.py b/speckley/test/python/run_readWriteOnSpeckley.py
index cb536ae..8a6a9fa 100644
--- a/speckley/test/python/run_readWriteOnSpeckley.py
+++ b/speckley/test/python/run_readWriteOnSpeckley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/speckley/test/python/run_specialOnSpeckley.py b/speckley/test/python/run_specialOnSpeckley.py
index 2eedc5a..b03416e 100644
--- a/speckley/test/python/run_specialOnSpeckley.py
+++ b/speckley/test/python/run_specialOnSpeckley.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import division, print_function
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os
diff --git a/svn_version b/svn_version
index d93404e..c8ad85c 100644
--- a/svn_version
+++ b/svn_version
@@ -1 +1 @@
-5777
+6110
diff --git a/tools/escriptconvert/SConscript b/tools/escriptconvert/SConscript
index 17e8fa1..13acccf 100644
--- a/tools/escriptconvert/SConscript
+++ b/tools/escriptconvert/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/tools/escriptconvert/escriptconvert.cpp b/tools/escriptconvert/escriptconvert.cpp
index 7bf4cef..23fbe3f 100644
--- a/tools/escriptconvert/escriptconvert.cpp
+++ b/tools/escriptconvert/escriptconvert.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/tools/escriptconvert/esdcreate.cpp b/tools/escriptconvert/esdcreate.cpp
index 41842b6..77c9a4a 100644
--- a/tools/escriptconvert/esdcreate.cpp
+++ b/tools/escriptconvert/esdcreate.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/tools/overlord/SConscript b/tools/overlord/SConscript
index b5917de..75dc6f5 100644
--- a/tools/overlord/SConscript
+++ b/tools/overlord/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/tools/overlord/overlord.c b/tools/overlord/overlord.c
index 5d63fb7..74b9e1e 100644
--- a/tools/overlord/overlord.c
+++ b/tools/overlord/overlord.c
@@ -1,11 +1,11 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/tools/testrunner.py b/tools/testrunner.py
index df7f153..b0c1ee6 100644
--- a/tools/testrunner.py
+++ b/tools/testrunner.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/py_src/SConscript b/weipa/py_src/SConscript
index 036d4e9..097ac75 100644
--- a/weipa/py_src/SConscript
+++ b/weipa/py_src/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/py_src/__init__.py b/weipa/py_src/__init__.py
index 49554b2..a65b8b7 100644
--- a/weipa/py_src/__init__.py
+++ b/weipa/py_src/__init__.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
from .weipacpp import visitInitialize, visitPublishData
diff --git a/weipa/src/DataVar.cpp b/weipa/src/DataVar.cpp
index c71e999..de3fa63 100644
--- a/weipa/src/DataVar.cpp
+++ b/weipa/src/DataVar.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/DataVar.h b/weipa/src/DataVar.h
index 1a90a6b..e795cd8 100644
--- a/weipa/src/DataVar.h
+++ b/weipa/src/DataVar.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/DomainChunk.h b/weipa/src/DomainChunk.h
index f26b2de..35d9ceb 100644
--- a/weipa/src/DomainChunk.h
+++ b/weipa/src/DomainChunk.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/ElementData.h b/weipa/src/ElementData.h
index 1d9d868..aaa724a 100644
--- a/weipa/src/ElementData.h
+++ b/weipa/src/ElementData.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/EscriptDataset.cpp b/weipa/src/EscriptDataset.cpp
index 4fe5b90..6accc87 100644
--- a/weipa/src/EscriptDataset.cpp
+++ b/weipa/src/EscriptDataset.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
@@ -447,10 +447,12 @@ bool EscriptDataset::saveSilo(string fileName, bool useMultiMesh)
DataVar_ptr var = viIt->dataChunks[0];
if (var->getRank() == 2) {
tensorDefStrings.push_back(var->getTensorDef());
- tensorDefs.push_back((char*)tensorDefStrings.back().c_str());
tensorNames.push_back((char*)var->getName().c_str());
}
}
+ for (vector<string>::const_iterator sit=tensorDefStrings.begin();
+ sit != tensorDefStrings.end(); sit++)
+ tensorDefs.push_back((char*)sit->c_str());
if (tensorDefs.size()) {
DBSetDir(dbfile, "/");
@@ -1102,10 +1104,12 @@ void EscriptDataset::putSiloMultiMesh(DBfile* dbfile, const string& meshName)
siloPath << "/";
siloPath << meshName;
tempstrings.push_back(siloPath.str());
- meshnames.push_back((char*)tempstrings.back().c_str());
meshtypes.push_back(DB_UCDMESH);
}
}
+ for (vector<string>::const_iterator sit=tempstrings.begin();
+ sit != tempstrings.end(); sit++)
+ meshnames.push_back((char*)sit->c_str());
// ignore empty mesh
if (!meshnames.empty()) {
@@ -1150,10 +1154,12 @@ void EscriptDataset::putSiloMultiVar(DBfile* dbfile, const VarInfo& vi,
siloPath << "/";
siloPath << vi.varName;
tempstrings.push_back(siloPath.str());
- varnames.push_back((char*)tempstrings.back().c_str());
vartypes.push_back(DB_UCDVAR);
}
}
+ for (vector<string>::const_iterator sit=tempstrings.begin();
+ sit != tempstrings.end(); sit++)
+ varnames.push_back((char*)sit->c_str());
// ignore empty variables
if (!varnames.empty()) {
diff --git a/weipa/src/EscriptDataset.h b/weipa/src/EscriptDataset.h
index 538e3ef..b3de6f1 100644
--- a/weipa/src/EscriptDataset.h
+++ b/weipa/src/EscriptDataset.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/FinleyDomain.cpp b/weipa/src/FinleyDomain.cpp
index 079a848..a1d5aca 100644
--- a/weipa/src/FinleyDomain.cpp
+++ b/weipa/src/FinleyDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/FinleyDomain.h b/weipa/src/FinleyDomain.h
index 7bb2e96..f405080 100644
--- a/weipa/src/FinleyDomain.h
+++ b/weipa/src/FinleyDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/FinleyElements.cpp b/weipa/src/FinleyElements.cpp
index 31f484e..cd18d6e 100644
--- a/weipa/src/FinleyElements.cpp
+++ b/weipa/src/FinleyElements.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/FinleyElements.h b/weipa/src/FinleyElements.h
index db199f9..1f797b5 100644
--- a/weipa/src/FinleyElements.h
+++ b/weipa/src/FinleyElements.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/FinleyNodes.cpp b/weipa/src/FinleyNodes.cpp
index 6271a65..242b8e2 100644
--- a/weipa/src/FinleyNodes.cpp
+++ b/weipa/src/FinleyNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/FinleyNodes.h b/weipa/src/FinleyNodes.h
index 3c3c5e7..a111eed 100644
--- a/weipa/src/FinleyNodes.h
+++ b/weipa/src/FinleyNodes.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/NodeData.h b/weipa/src/NodeData.h
index 4ce17f1..9036b7e 100644
--- a/weipa/src/NodeData.h
+++ b/weipa/src/NodeData.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/RipleyDomain.cpp b/weipa/src/RipleyDomain.cpp
index 130e039..0a839bf 100644
--- a/weipa/src/RipleyDomain.cpp
+++ b/weipa/src/RipleyDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/RipleyDomain.h b/weipa/src/RipleyDomain.h
index 0c96276..a20ef08 100644
--- a/weipa/src/RipleyDomain.h
+++ b/weipa/src/RipleyDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/RipleyElements.cpp b/weipa/src/RipleyElements.cpp
index 3fac39e..2fa1d2b 100644
--- a/weipa/src/RipleyElements.cpp
+++ b/weipa/src/RipleyElements.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/RipleyElements.h b/weipa/src/RipleyElements.h
index de1cab6..b0d8f3c 100644
--- a/weipa/src/RipleyElements.h
+++ b/weipa/src/RipleyElements.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/RipleyNodes.cpp b/weipa/src/RipleyNodes.cpp
index 6836112..a0086ae 100644
--- a/weipa/src/RipleyNodes.cpp
+++ b/weipa/src/RipleyNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/RipleyNodes.h b/weipa/src/RipleyNodes.h
index 9706750..e01d189 100644
--- a/weipa/src/RipleyNodes.h
+++ b/weipa/src/RipleyNodes.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SConscript b/weipa/src/SConscript
index 37b9ac0..0e26ed0 100644
--- a/weipa/src/SConscript
+++ b/weipa/src/SConscript
@@ -1,11 +1,11 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SpeckleyDomain.cpp b/weipa/src/SpeckleyDomain.cpp
index 770a00c..565dea6 100644
--- a/weipa/src/SpeckleyDomain.cpp
+++ b/weipa/src/SpeckleyDomain.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SpeckleyDomain.h b/weipa/src/SpeckleyDomain.h
index e7274a9..d7a1222 100644
--- a/weipa/src/SpeckleyDomain.h
+++ b/weipa/src/SpeckleyDomain.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SpeckleyElements.cpp b/weipa/src/SpeckleyElements.cpp
index f9a3df6..600c005 100644
--- a/weipa/src/SpeckleyElements.cpp
+++ b/weipa/src/SpeckleyElements.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SpeckleyElements.h b/weipa/src/SpeckleyElements.h
index 02f45e8..d828408 100644
--- a/weipa/src/SpeckleyElements.h
+++ b/weipa/src/SpeckleyElements.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SpeckleyNodes.cpp b/weipa/src/SpeckleyNodes.cpp
index fe093c2..28f154a 100644
--- a/weipa/src/SpeckleyNodes.cpp
+++ b/weipa/src/SpeckleyNodes.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/SpeckleyNodes.h b/weipa/src/SpeckleyNodes.h
index 954e159..b97f622 100644
--- a/weipa/src/SpeckleyNodes.h
+++ b/weipa/src/SpeckleyNodes.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/VisItControl.cpp b/weipa/src/VisItControl.cpp
index 80d0b38..93a2cd7 100644
--- a/weipa/src/VisItControl.cpp
+++ b/weipa/src/VisItControl.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/VisItControl.h b/weipa/src/VisItControl.h
index 75e1600..6eac8ec 100644
--- a/weipa/src/VisItControl.h
+++ b/weipa/src/VisItControl.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/VisItData.cpp b/weipa/src/VisItData.cpp
index 59aa793..bcf10ca 100644
--- a/weipa/src/VisItData.cpp
+++ b/weipa/src/VisItData.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/VisItData.h b/weipa/src/VisItData.h
index f46d916..944646c 100644
--- a/weipa/src/VisItData.h
+++ b/weipa/src/VisItData.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/weipa.h b/weipa/src/weipa.h
index 11374a6..2c86552 100644
--- a/weipa/src/weipa.h
+++ b/weipa/src/weipa.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/src/weipacpp.cpp b/weipa/src/weipacpp.cpp
index 99bd4a9..852c6ca 100644
--- a/weipa/src/weipacpp.cpp
+++ b/weipa/src/weipacpp.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/test/EscriptDatasetTestCase.cpp b/weipa/test/EscriptDatasetTestCase.cpp
index 8758cb1..b60d4b0 100644
--- a/weipa/test/EscriptDatasetTestCase.cpp
+++ b/weipa/test/EscriptDatasetTestCase.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/test/EscriptDatasetTestCase.h b/weipa/test/EscriptDatasetTestCase.h
index 1afd3c5..4b2b540 100644
--- a/weipa/test/EscriptDatasetTestCase.h
+++ b/weipa/test/EscriptDatasetTestCase.h
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/test/SConscript b/weipa/test/SConscript
index 713789f..25573c8 100644
--- a/weipa/test/SConscript
+++ b/weipa/test/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/test/python/SConscript b/weipa/test/python/SConscript
index 8688653..11453f3 100644
--- a/weipa/test/python/SConscript
+++ b/weipa/test/python/SConscript
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
diff --git a/weipa/test/python/run_savesilo_tests.py b/weipa/test/python/run_savesilo_tests.py
index 50fa2ea..f10ffc2 100644
--- a/weipa/test/python/run_savesilo_tests.py
+++ b/weipa/test/python/run_savesilo_tests.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, math
diff --git a/weipa/test/python/run_savevtk_tests.py b/weipa/test/python/run_savevtk_tests.py
index e36b688..505e175 100644
--- a/weipa/test/python/run_savevtk_tests.py
+++ b/weipa/test/python/run_savevtk_tests.py
@@ -1,12 +1,12 @@
##############################################################################
#
-# Copyright (c) 2003-2015 by The University of Queensland
+# Copyright (c) 2003-2016 by The University of Queensland
# http://www.uq.edu.au
#
# Primary Business: Queensland, Australia
-# Licensed under the Open Software License version 3.0
-# http://www.opensource.org/licenses/osl-3.0.php
+# Licensed under the Apache License, version 2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
# Development 2012-2013 by School of Earth Sciences
@@ -16,11 +16,11 @@
from __future__ import print_function, division
-__copyright__="""Copyright (c) 2003-2015 by The University of Queensland
+__copyright__="""Copyright (c) 2003-2016 by The University of Queensland
http://www.uq.edu.au
Primary Business: Queensland, Australia"""
-__license__="""Licensed under the Open Software License version 3.0
-http://www.opensource.org/licenses/osl-3.0.php"""
+__license__="""Licensed under the Apache License, version 2.0
+http://www.apache.org/licenses/LICENSE-2.0"""
__url__="https://launchpad.net/escript-finley"
import os, math
diff --git a/weipa/test/weipa_UnitTest.cpp b/weipa/test/weipa_UnitTest.cpp
index 9acea95..7d7520a 100644
--- a/weipa/test/weipa_UnitTest.cpp
+++ b/weipa/test/weipa_UnitTest.cpp
@@ -1,12 +1,12 @@
/*****************************************************************************
*
-* Copyright (c) 2003-2015 by The University of Queensland
+* Copyright (c) 2003-2016 by The University of Queensland
* http://www.uq.edu.au
*
* Primary Business: Queensland, Australia
-* Licensed under the Open Software License version 3.0
-* http://www.opensource.org/licenses/osl-3.0.php
+* Licensed under the Apache License, version 2.0
+* http://www.apache.org/licenses/LICENSE-2.0
*
* Development until 2012 by Earth Systems Science Computational Center (ESSCC)
* Development 2012-2013 by School of Earth Sciences
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git
More information about the debian-science-commits
mailing list