/[escript]/trunk/escript/src/escriptcpp.cpp
ViewVC logotype

Contents of /trunk/escript/src/escriptcpp.cpp

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (show annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 5 months ago) by phornby
File size: 13259 byte(s)

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.


1
2 /* $Id$ */
3
4 /*******************************************************
5 *
6 * Copyright 2003-2007 by ACceSS MNRF
7 * Copyright 2007 by University of Queensland
8 *
9 * http://esscc.uq.edu.au
10 * Primary Business: Queensland, Australia
11 * Licensed under the Open Software License version 3.0
12 * http://www.opensource.org/licenses/osl-3.0.php
13 *
14 *******************************************************/
15
16 #include "Data.h"
17 #include "FunctionSpace.h"
18 #include "FunctionSpaceFactory.h"
19 #include "DataFactory.h"
20 #include "AbstractContinuousDomain.h"
21 #include "AbstractDomain.h"
22 #include "Utils.h"
23 #include "AbstractSystemMatrix.h"
24 #include "AbstractTransportProblem.h"
25 #include "DataVector.h"
26
27 extern "C" {
28 #include "escript/blocktimer.h"
29 }
30
31 #include "esysUtils/esysExceptionTranslator.h"
32
33 #include <boost/python.hpp>
34 #include <boost/python/module.hpp>
35 #include <boost/python/def.hpp>
36 #include <boost/python/object.hpp>
37 #include <boost/python/tuple.hpp>
38 #include <boost/python/numeric.hpp>
39
40 using namespace boost::python;
41
42 /*! \mainpage Esys Documentation
43 *
44 * \version 1.0.0
45 *
46 * - \ref escript
47 *
48 * - \ref esys_exception "Esys Exception"
49 *
50 * - \ref finley
51 *
52 * - <a href=http://iservo.edu.au/esys/epydoc/index.html>Python module documentation (epydoc generated)</a>
53 *
54 */
55
56 /*! \page escript Escript
57 * Escript is the python module that contains the interfaces
58 * to the C++ side of escript.
59 *
60 * \version 1.0.0
61 *
62 * \section class_desc Class Description:
63 * Data
64 *
65 * \section class_limits Class Limitations:
66 * None
67 *
68 * \section class_conds Class Conditions of Use:
69 * None
70 *
71 * \section class_throws Throws:
72 * None
73 *
74 */
75
76 BOOST_PYTHON_MODULE(escriptcpp)
77 {
78 def("setNumberOfThreads",escript::setNumberOfThreads);
79 def("getNumberOfThreads",escript::getNumberOfThreads);
80 def("releaseUnusedMemory",escript::releaseUnusedMemory);
81 def("blocktimer_initialize",blocktimer_initialize);
82 def("blocktimer_reportSortByName",blocktimer_reportSortByName);
83 def("blocktimer_reportSortByTime",blocktimer_reportSortByTime);
84 def("blocktimer_increment",blocktimer_increment);
85 def("blocktimer_time",blocktimer_time);
86 def("getVersion",escript::getSvnVersion);
87 def("printParallelThreadCounts",escript::printParallelThreadCnt);
88
89
90 //
91 // Interface for AbstractDomain
92 //
93 class_<escript::AbstractDomain>("Domain",no_init)
94 .def("setTagMap",&escript::AbstractDomain::setTagMap)
95 .def("getTag",&escript::AbstractDomain::getTag)
96 .def("isValidTagName",&escript::AbstractDomain::isValidTagName)
97 .def("showTagNames",&escript::AbstractDomain::showTagNames)
98 .def("getX",&escript::AbstractDomain::getX)
99 .def("getNormal",&escript::AbstractDomain::getNormal)
100 .def("getSize",&escript::AbstractDomain::getSize)
101 .def("saveVTK",&escript::AbstractDomain::saveVTK)
102 .def("saveDX",&escript::AbstractDomain::saveDX)
103 .def("getMPISize",&escript::AbstractDomain::getMPISize)
104 .def("getMPIRank",&escript::AbstractDomain::getMPIRank)
105
106 .def(self == self)
107 .def(self != self);
108
109 //
110 // Interface for AbstractContinuousDomain
111 //
112 class_<escript::AbstractContinuousDomain, bases<escript::AbstractDomain> >("ContinuousDomain",no_init)
113 .def("getSystemMatrixTypeId",&escript::AbstractContinuousDomain::getSystemMatrixTypeId);
114
115 //
116 // Interface for FunctionSpace
117 //
118 class_<escript::FunctionSpace> fs_definer("FunctionSpace",init<>());
119 fs_definer.def("getDim",&escript::FunctionSpace::getDim);
120 fs_definer.def("getDomain",&escript::FunctionSpace::getDomain,
121 return_internal_reference<>());
122 fs_definer.def("getX",&escript::FunctionSpace::getX);
123 fs_definer.def("getNormal",&escript::FunctionSpace::getNormal);
124 fs_definer.def("getSize",&escript::FunctionSpace::getSize);
125 fs_definer.def("setTags",&escript::FunctionSpace::setTags);
126 fs_definer.def("getTagFromDataPointNo",
127 &escript::FunctionSpace::getTagFromDataPointNo);
128 fs_definer.def("__str__", &escript::FunctionSpace::toString);
129 fs_definer.def(self == self);
130 fs_definer.def(self != self);
131 //
132 // Interface for Data
133 //
134 class_<escript::Data>("Data","TEST DOCUMENTATION",init<>())
135 // various constructors for Data objects
136 .def(init<const numeric::array&, optional<const escript::FunctionSpace&, bool> >(args("value","what","expand")))
137 .def(init<const object&, optional<const escript::FunctionSpace&, bool> >(args("value","what","expand")))
138 .def(init<const double, const tuple&, optional<const escript::FunctionSpace&, bool> >(args("value","shape","what","expand")))
139 .def(init<const escript::Data&, const escript::FunctionSpace&>(args("value","what")))
140 .def(init<const escript::Data&>())
141 // Note for Lutz, Need to specify the call policy in order to return a
142 // reference. In this case return_internal_reference.
143 .def("__str__",&escript::Data::toString)
144 .def("getDomain",&escript::Data::getDomain,return_internal_reference<>())
145 .def("getFunctionSpace",&escript::Data::getFunctionSpace,return_internal_reference<>())
146 .def("isEmpty",&escript::Data::isEmpty)
147 .def("isProtected",&escript::Data::isProtected)
148 .def("setProtection",&escript::Data::setProtection)
149 .def("getShape",&escript::Data::getShapeTuple)
150 .def("getRank",&escript::Data::getDataPointRank)
151 .def("dump",&escript::Data::dump)
152 .def("copyWithMask",&escript::Data::copyWithMask)
153 .def("setTaggedValue",&escript::Data::setTaggedValue)
154 .def("setTaggedValue",&escript::Data::setTaggedValueByName)
155 .def("getNumberOfDataPoints",&escript::Data::getNumDataPoints)
156 .def("isExpanded",&escript::Data::isExpanded)
157 .def("isTagged",&escript::Data::isTagged)
158 .def("expand",&escript::Data::expand)
159 .def("tag",&escript::Data::tag)
160 .def("copy",&escript::Data::copy)
161 .def("setValueOfDataPoint",&escript::Data::setValueOfDataPointToPyObject)
162 .def("setValueOfDataPoint",&escript::Data::setValueOfDataPointToArray)
163 .def("setValueOfDataPoint",&escript::Data::setValueOfDataPoint)
164 .def("getValueOfDataPoint",&escript::Data::getValueOfDataPoint)
165 .def("getValueOfGlobalDataPoint",&escript::Data::getValueOfGlobalDataPoint)
166 .def("setToZero",&escript::Data::setToZero)
167 .def("interpolate",&escript::Data::interpolate)
168 .def("minGlobalDataPoint",&escript::Data::minGlobalDataPoint)
169 .def("saveDX",&escript::Data::saveDX)
170 .def("saveVTK",&escript::Data::saveVTK)
171 .def("getTagNumber",&escript::Data::getTagNumber)
172 .def("archiveData",&escript::Data::archiveData)
173 .def("extractData",&escript::Data::extractData)
174 // Unary functions for Data
175 .def("_interpolate",&escript::Data::interpolate)
176 .def("_grad",&escript::Data::gradOn)
177 .def("_grad",&escript::Data::grad)
178 .def("_transpose",&escript::Data::transpose)
179 .def("_trace",&escript::Data::trace)
180 .def("_maxval",&escript::Data::maxval)
181 .def("_minval",&escript::Data::minval)
182 .def("_wherePositive",&escript::Data::wherePositive)
183 .def("_whereNegative",&escript::Data::whereNegative)
184 .def("_whereNonNegative",&escript::Data::whereNonNegative)
185 .def("_whereNonPositive",&escript::Data::whereNonPositive)
186 .def("_whereZero",&escript::Data::whereZero,(arg("tol")=0.0))
187 .def("_whereNonZero",&escript::Data::whereNonZero,(arg("tol")=0.0))
188 .def("_erf",&escript::Data::erf)
189 .def("_sin",&escript::Data::sin)
190 .def("_cos",&escript::Data::cos)
191 .def("_tan",&escript::Data::tan)
192 .def("_asin",&escript::Data::asin)
193 .def("_acos",&escript::Data::acos)
194 .def("_atan",&escript::Data::atan)
195 .def("_sinh",&escript::Data::sinh)
196 .def("_cosh",&escript::Data::cosh)
197 .def("_tanh",&escript::Data::tanh)
198 .def("_asinh",&escript::Data::asinh)
199 .def("_acosh",&escript::Data::acosh)
200 .def("_atanh",&escript::Data::atanh)
201 .def("_exp",&escript::Data::exp)
202 .def("_sqrt",&escript::Data::sqrt)
203 .def("_log10",&escript::Data::log10)
204 .def("_log",&escript::Data::log)
205 .def("_sign",&escript::Data::sign)
206 .def("_symmetric",&escript::Data::symmetric)
207 .def("_nonsymmetric",&escript::Data::nonsymmetric)
208 .def("_trace",&escript::Data::trace)
209 .def("_swap_axes",&escript::Data::swapaxes)
210 .def("_eigenvalues",&escript::Data::eigenvalues)
211 .def("_eigenvalues_and_eigenvectors",&escript::Data::eigenvalues_and_eigenvectors,(arg("tol")=1.e-13))
212 // functions returning a single real number:
213 .def("_Lsup",&escript::Data::Lsup)
214 .def("_sup",&escript::Data::sup)
215 .def("_inf",&escript::Data::inf)
216 .def("_integrate",&escript::Data::integrate)
217
218 // following implements the python abs operator
219 .def("__abs__",&escript::Data::abs)
220 // following implements the python "-" negation operator
221 .def("__neg__",&escript::Data::neg)
222 // following implements the python "+" identity operator
223 .def("__pos__",&escript::Data::pos)
224 // following two functions implement the python [] operator
225 .def("__getitem__",&escript::Data::getItem)
226 .def("__setitem__",&escript::Data::setItemO)
227 .def("__setitem__",&escript::Data::setItemD)
228 // following two functions implement the python ** operator
229 .def("__pow__",&escript::Data::powO)
230 .def("__pow__",&escript::Data::powD)
231 .def("__rpow__",&escript::Data::rpowO)
232 // NOTE:: The order of these declarations is important. Anything
233 // declared before the generic declaration isn't found so the generic
234 // version will be called.
235 .def(self + other<object>())
236 .def(other<object>() + self)
237 .def(self + self)
238 .def(self += other<object>())
239 .def(self += self)
240
241 .def(self - other<object>())
242 .def(other<object>() - self)
243 .def(self - self)
244 .def(self -= other<object>())
245 .def(self -= self)
246
247 .def(self * other<object>())
248 .def(other<object>() * self)
249 .def(self * self)
250 .def(self *= other<object>())
251 .def(self *= self)
252
253 .def(self / other<object>())
254 .def(other<object>() / self)
255 .def(self / self)
256 .def(self /= other<object>())
257 .def(self /= self)
258 // Need scope resolution due to a bug either in the compiler or
259 // the boost code. This calls operator << for Data.
260 .def(self_ns::str(self));
261
262 //
263 // Factory methods for function space
264 //
265 def("ContinuousFunction",escript::continuousFunction);
266 def("ReducedContinuousFunction",escript::reducedContinuousFunction);
267 def("Function",escript::function);
268 def("ReducedFunction",escript::reducedFunction);
269 def("FunctionOnBoundary",escript::functionOnBoundary);
270 def("ReducedFunctionOnBoundary",escript::reducedFunctionOnBoundary);
271 def("FunctionOnContactZero",escript::functionOnContactZero);
272 def("ReducedFunctionOnContactZero",escript::reducedFunctionOnContactZero);
273 def("FunctionOnContactOne",escript::functionOnContactOne);
274 def("ReducedFunctionOnContactOne",escript::reducedFunctionOnContactOne);
275 def("Solution",escript::solution);
276 def("ReducedSolution",escript::reducedSolution);
277 def("DiracDeltaFunction",escript::diracDeltaFunction);
278
279 //
280 // Factory methods for Data
281 //
282 def("load",escript::load);
283 def("loadIsConfigured",escript::loadConfigured);
284 def("Scalar",escript::Scalar,
285 (arg("value")=0.0,
286 arg("what")=escript::FunctionSpace(),
287 arg("expanded")=false));
288 def("Vector",escript::Vector,
289 (arg("value")=0.0,
290 arg("what")=escript::FunctionSpace(),
291 arg("expanded")=false));
292 def("Tensor",escript::Tensor,
293 (arg("value")=0.0,
294 arg("what")=escript::FunctionSpace(),
295 arg("expanded")=false));
296 def("Tensor3",escript::Tensor3,
297 (arg("value")=0.0,
298 arg("what")=escript::FunctionSpace(),
299 arg("expanded")=false));
300 def("Tensor4",escript::Tensor4,
301 (arg("value")=0.0,
302 arg("what")=escript::FunctionSpace(),
303 arg("expanded")=false));
304
305 //
306 // Binary operators
307 //
308 def("C_GeneralTensorProduct",escript::C_GeneralTensorProduct,
309 (arg("arg0")=escript::Data(),
310 arg("arg1")=escript::Data(),
311 arg("axis_offset")=0,
312 arg("transpose")=0));
313
314 //
315 // Interface for AbstractSystemMatrix
316 //
317 class_<escript::AbstractSystemMatrix>("Operator",init<>())
318 .def("isEmpty",&escript::AbstractSystemMatrix::isEmpty)
319 .def("solve",&escript::AbstractSystemMatrix::solve)
320 .def("of",&escript::AbstractSystemMatrix::vectorMultiply)
321 .def("saveMM",&escript::AbstractSystemMatrix::saveMM)
322 .def("saveHB",&escript::AbstractSystemMatrix::saveHB)
323 .def("resetValues",&escript::AbstractSystemMatrix::resetValues)
324 .def(self*other<escript::Data>());
325 //
326 // Interface for AbstractTransportProblem
327 //
328 class_<escript::AbstractTransportProblem>("TransportProblem",init<>())
329 .def("isEmpty",&escript::AbstractTransportProblem::isEmpty)
330 .def("solve",&escript::AbstractTransportProblem::solve)
331 .def("setInitialValue",&escript::AbstractTransportProblem::setInitialValue)
332 .def("insertConstraint",&escript::AbstractTransportProblem::insertConstraint)
333 .def("reset",&escript::AbstractTransportProblem::resetTransport)
334 .def("getSafeTimeStepSize",&escript::AbstractTransportProblem::getSafeTimeStepSize);
335
336 //
337 // Register esysExceptionTranslator
338 //
339 register_exception_translator<esysUtils::EsysException>(&esysUtils::esysExceptionTranslator);
340
341 }

Properties

Name Value
svn:eol-style native
svn:keywords Author Date Id Revision

  ViewVC Help
Powered by ViewVC 1.1.26