/[escript]/branches/numpy/escript/src/escriptcpp.cpp
ViewVC logotype

Log of /branches/numpy/escript/src/escriptcpp.cpp

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 2453 - (view) (annotate) - [select for diffs]
Modified Tue Jun 2 22:54:20 2009 UTC (9 years, 8 months ago) by jfenwick
File length: 15620 byte(s)
Diff to previous 2441
Removing NONUMARRAY defines


Revision 2441 - (view) (annotate) - [select for diffs]
Modified Fri May 29 00:22:42 2009 UTC (9 years, 8 months ago) by jfenwick
File length: 15895 byte(s)
Diff to previous 2400
Branch now current with Trunk revision 2440

Revision 2400 - (view) (annotate) - [select for diffs]
Modified Wed Apr 29 01:37:54 2009 UTC (9 years, 9 months ago) by jfenwick
File length: 15846 byte(s)
Diff to previous 2396
Added directives to comment out numarray code.
This code does not pass unit tests but I need a checkpoint

Revision 2396 - (view) (annotate) - [select for diffs]
Modified Thu Apr 23 23:58:29 2009 UTC (9 years, 9 months ago) by jfenwick
File length: 15768 byte(s)
Diff to previous 2313
Branching to port escript to use numpy rather than numarray


Revision 2313 - (view) (annotate) - [select for diffs]
Modified Tue Mar 17 03:41:17 2009 UTC (9 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15768 byte(s)
Diff to previous 2308
pyvisi is now rejecting to work under MPI with more than 1 processor. Tests for this configuration are dropped now.




Revision 2308 - (view) (annotate) - [select for diffs]
Modified Mon Mar 16 01:20:56 2009 UTC (9 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15717 byte(s)
Diff to previous 2283
size_t may be 64 bits which is incompatible to MPI_INT. This problem is fixed by inserting a cast in Mesh_read.c. 
Moreover a fix has been added making sure that gmsh and triangle are executed on one processor only.




Revision 2283 - (view) (annotate) - [select for diffs]
Modified Fri Feb 20 01:08:21 2009 UTC (10 years ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15668 byte(s)
Diff to previous 2271
doxygen doco now correctly reports global project revsion number.
link to epydoc is now via a relative URL (avoids the problem of nightly doxygen pointing at out of date release epydoc).

Revision 2271 - (view) (annotate) - [select for diffs]
Modified Mon Feb 16 05:08:29 2009 UTC (10 years ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15714 byte(s)
Diff to previous 2204
Merging version 2269 to trunk


Revision 2204 - (view) (annotate) - [select for diffs]
Modified Fri Jan 9 01:33:39 2009 UTC (10 years, 1 month ago) by caltinay
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15486 byte(s)
Diff to previous 2142
Fixed a little doxygen typo in the hyperlink.


Revision 2142 - (view) (annotate) - [select for diffs]
Modified Tue Dec 9 06:22:57 2008 UTC (10 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15484 byte(s)
Diff to previous 2105
Added showEscriptParams to output a list of available params.


Revision 2105 - (view) (annotate) - [select for diffs]
Modified Fri Nov 28 01:52:12 2008 UTC (10 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15429 byte(s)
Diff to previous 2100
Data::copySelf() now returns an object instead of a pointer.
Fixed a bug in copyFromArray relating to expanded data.

Revision 2100 - (view) (annotate) - [select for diffs]
Modified Wed Nov 26 08:13:00 2008 UTC (10 years, 2 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15470 byte(s)
Diff to previous 2084
This commit cleans up the incompressible solver and adds a DarcyFlux solver in model module. 
Some documentation for both classes has been added.
The convection code is only linear at the moment.




Revision 2084 - (view) (annotate) - [select for diffs]
Modified Fri Nov 21 05:20:42 2008 UTC (10 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15303 byte(s)
Diff to previous 2078
Fixed a warning in cpp unit tests under dodebug
Pointed the url for python doco at shake200 rather than iservo.
Added support for trace and transpose to LazyData.
Fixed bug in trace to initialise running totals.

Revision 2078 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 16:10:10 2008 UTC (10 years, 3 months ago) by phornby
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15277 byte(s)
Diff to previous 2076
Two changes.

1. Move blocktimer from escript to esysUtils.
2. Make it possible to link to paso as a DLL or .so.

Should have no effect on 'nix's

In respect of 1., blocktimer had begun to spring up everywhere, so
for the moment I thought it best to move it to the only other library that
pops up all over the place.

In respect of 2., paso needed to be a DLL in order to use the windows intelc /fast
option, which does aggressive multi-file optimisations. Even in its current form, it either
vectorises or parallelises  hundreds more loops in the esys system than appear in the pragmas.

In achieving 2. I have not been too delicate in adding

PASO_DLL_API

declarations to the .h files in paso/src. Only toward the end of the process of
the conversion, when the number of linker errors dropped below 20, say, did I choosy about what
functions in a header I declared PASO_DLL_API. As a result, there are likely to be many routines
declared as external functions symbols that are in fact internal to the paso DLL. 
Why is this an issue?  It prevents the intelc compiler from getting aggressive on the paso module.
With pain there is sometimes gain. At least all the DLL rules in windows give good
(non-microsoft) compiler writers a chance to really shine.

So, if you should see a PASO_DLL_API on a function in a paso header file,
and think to yourself, "that function is only called in paso, why export it?", then feel free to
delete the PASO_DLL_API export declaration.

Here's hoping for no breakage.....

Revision 2076 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 12:34:17 2008 UTC (10 years, 3 months ago) by phornby
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15275 byte(s)
Diff to previous 2064

I may get into trouble for this.
boost-python 1.34 does have a docstring_options class,
but does not have a 3 argument constructor for
it. So the test has been modified to 


#if ((BOOST_VERSION/100)%1000 > 34) || (BOOST_VERSION/100000 >1)

If you wish to make things more delicate, one can define a 2 argument construction
of docopt just for 1.34 (with an #elif). Probably not worth the effort frankly.

Hope that this has not broken anything for anyone else. The SVN logs suggest this is a
little fragile.....

Also, please be aware that much of our chemistry interface code, that we wish to use with
escript, makes extensive use of boost python.
Having two different boost versions mucking with the python interpreter sounds
like a really bad idea, I'm sure you'll agree.
The problem is that it is not a simple task for us to build new versions of boost-python
on all our platforms. Consequently, it would be nice to be informed when you guys
intend to upgrade a support library of this nature so that we can plan and allocate
resources to keep up.

Cheers.



Revision 2064 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 04:06:34 2008 UTC (10 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15275 byte(s)
Diff to previous 2061
docstring_options was added in boost 1.34 - macro'd it out if you are 
compiling earlier than that.


Revision 2061 - (view) (annotate) - [select for diffs]
Modified Wed Nov 19 03:40:21 2008 UTC (10 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 15095 byte(s)
Diff to previous 2005
Fixing some warnings from epydoc.
Disabled c++ signatures in python docstrings.
Removed references to Bruce in epydoc and the users guide.

Revision 2005 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 01:21:39 2008 UTC (10 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 14626 byte(s)
Diff to previous 1897
Bringing all changes across from schroedinger.
(Note this does not mean development is done, just that it will happen
on the trunk for now).
If anyone notices any problems please contact me.



Revision 1897 - (view) (annotate) - [select for diffs]
Modified Mon Oct 20 00:32:30 2008 UTC (10 years, 4 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 14407 byte(s)
Diff to previous 1877
Modified Data::toString() so it doesn't throw on DataEmpty.
Added setEscriptParamInt and getEscriptParamInt as free functions.
At the moment all they do is allow you to set the param TOO_MANY_LINES.
This is used to determine when printing a Data object will show you the 
points and when it will print a summary.

I've set the default value back to 80 lines.
If you need to see more lines use (in python):

setEscriptParamInt("TOO_MANY_LINES",80000)



Revision 1877 - (view) (annotate) - [select for diffs]
Modified Tue Oct 14 02:58:39 2008 UTC (10 years, 4 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 14170 byte(s)
Diff to previous 1872
convection.py checkpointing uses mkdir/rmdir, and under MPI there
was a race condition.

mkdir needs to be run on only one CPU and then a barrier to prevent
working processors from using the directory before it exists.

Added methods domain.MPIBarrier and domain.onMasterProcessor() to
implement this technique.

A more general solution might be possible in the future.


Revision 1872 - (view) (annotate) - [select for diffs]
Modified Mon Oct 13 00:18:55 2008 UTC (10 years, 4 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 14034 byte(s)
Diff to previous 1859
Closing the moreshared branch


Revision 1859 - (view) (annotate) - [select for diffs]
Modified Wed Oct 8 03:03:37 2008 UTC (10 years, 4 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13830 byte(s)
Diff to previous 1841
first version of testing for transport solver.

Revision 1841 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 03:57:52 2008 UTC (10 years, 4 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13642 byte(s)
Diff to previous 1811
modification on LinearPDE class and a first version of Transport class

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 4 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13566 byte(s)
Diff to previous 1805
Copyright updated in all files


Revision 1805 - (view) (annotate) - [select for diffs]
Modified Wed Sep 24 23:39:00 2008 UTC (10 years, 4 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13601 byte(s)
Diff to previous 1803
Added python-level methods getMPISizeWorld() and getMPIRankWorld() for MPI process info.
Test suite run_inputOutput.py runs on any number of cores now, hybrid may still be a problem.


Revision 1803 - (view) (annotate) - [select for diffs]
Modified Wed Sep 24 06:20:29 2008 UTC (10 years, 4 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13499 byte(s)
Diff to previous 1801
All about making DataEmpty instances throw.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Exposed getDim from AbstractDomain to python to fix bug.

Added isEmpty member to DataAbstract to allow it to throw is queries are 
made about a DataEmpty instance.


Added exceptions to DataAbstract, DataEmpty and Data to prevent calls 
being made against DataEmpty objects.
The following still work as expected on DataEmpty instances

copy, getDomain, getFunctionSpace, isEmpty, isExpanded, isProtected, 
isTagged, setprotection.

You can also call interpolate, however it should throw if you try to 
change FunctionSpaces.



Revision 1801 - (view) (annotate) - [select for diffs]
Modified Fri Sep 19 01:37:09 2008 UTC (10 years, 5 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13446 byte(s)
Diff to previous 1800
Fixed serialization of I/O for MPI...code didn't compile without MPI


Revision 1800 - (view) (annotate) - [select for diffs]
Modified Thu Sep 18 05:28:20 2008 UTC (10 years, 5 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13507 byte(s)
Diff to previous 1799
Serialized parallel I/O when writing mesh or data to NetCDF file on multiple MPI processors.
Added domain method getMPIComm() to complement getMPISize() and getMPIRank().


Revision 1799 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 06:33:18 2008 UTC (10 years, 5 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13419 byte(s)
Diff to previous 1796
Added Data::copySelf() [Note: this is exposed as copy() in python].
This method returns a pointer to a deep copy of the target.
There are c++ tests but no python tests for this yet.

All DataAbstracts now have a deepCopy() which simplifies the 
implementation of the compy methods.



Revision 1796 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 01:45:46 2008 UTC (10 years, 5 months ago) by jfenwick
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13336 byte(s)
Diff to previous 1718
Merged noarrayview branch onto trunk.



Revision 1718 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 05:50:11 2008 UTC (10 years, 6 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13440 byte(s)
Diff to previous 1716
method returning reference id added to FunctionSpace class

Revision 1716 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 05:03:49 2008 UTC (10 years, 6 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13333 byte(s)
Diff to previous 1628
getListOfTags method added to FunctionSpace class

Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 7 months ago) by phornby
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13259 byte(s)
Diff to previous 1561

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.



Revision 1561 - (view) (annotate) - [select for diffs]
Modified Wed May 21 06:58:52 2008 UTC (10 years, 9 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13440 byte(s)
Diff to previous 1426
Added python method printParallelThreadCounts() to tell how many MPI CPUs and OpenMP threads we are using (for testing hybrid runs)


Revision 1426 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 06:12:15 2008 UTC (10 years, 11 months ago) by trankine
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13372 byte(s)
Diff to previous 1417
Merge the changes to these few files with the windows port branch to test just these changes under linux and altix.

Revision 1417 - (view) (annotate) - [select for diffs]
Modified Mon Feb 25 04:45:48 2008 UTC (10 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 13063 byte(s)
Diff to previous 1407
some more work on the transport solver.

Revision 1407 - (view) (annotate) - [select for diffs]
Modified Mon Feb 4 06:45:48 2008 UTC (11 years ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12989 byte(s)
Diff to previous 1388
new upwinding algorithm (still fails)

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 1 month ago) by trankine
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12900 byte(s)
Diff to previous 1387
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 1 month ago) by trankine
Original Path: temp/escript/src/escriptcpp.cpp
File length: 12900 byte(s)
Diff to previous 1384
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.

Revision 1384 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 02:29:38 2008 UTC (11 years, 1 month ago) by phornby
Original Path: temp_trunk_copy/escript/src/escriptcpp.cpp
File length: 12900 byte(s)
Diff to previous 1370
Make a temp copy of the trunk before checking in the windows changes



Revision 1370 - (view) (annotate) - [select for diffs]
Modified Wed Jan 2 09:21:43 2008 UTC (11 years, 1 month ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12900 byte(s)
Diff to previous 1364
explicit upwinding scheme added.

Revision 1364 - (view) (annotate) - [select for diffs]
Modified Mon Dec 17 07:22:45 2007 UTC (11 years, 2 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12899 byte(s)
Diff to previous 1313
finley interface to paso's transport solver added.

Revision 1313 - (view) (annotate) - [select for diffs]
Modified Tue Sep 25 01:44:26 2007 UTC (11 years, 4 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12448 byte(s)
Diff to previous 1312
Copied a handful of files from trunk-mpi-branch into trunk


Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 4 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12514 byte(s)
Diff to previous 1247
The MPI branch is hereby closed. All future work should be in trunk.

Previously in revision 1295 I merged the latest changes to trunk into trunk-mpi-branch.
In this revision I copied all files from trunk-mpi-branch over the corresponding
trunk files. I did not use 'svn merge', it was a copy.


Revision 1247 - (view) (annotate) - [select for diffs]
Modified Tue Aug 14 01:29:20 2007 UTC (11 years, 6 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12170 byte(s)
Diff to previous 1141
New python method getVersion() which returns the Subversion revision
from which escript was compiled


Revision 1141 - (view) (annotate) - [select for diffs]
Modified Tue May 15 04:24:51 2007 UTC (11 years, 9 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12126 byte(s)
Diff to previous 1137
Some changes to make things run on windows. There is still a problem with netcdf an long file names on windows but there is the suspicion that this is a bigger problem related to boost (compiler options). In fact runs with large numbers of iteration/time steps tend to create seg faults. 

Revision 1137 - (view) (annotate) - [select for diffs]
Modified Thu May 10 08:11:31 2007 UTC (11 years, 9 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 12030 byte(s)
Diff to previous 1118
This version passes the tests on windows except for 

   * vtk
   * netCDF

The version needs to be tested on altix and linux

Revision 1118 - (view) (annotate) - [select for diffs]
Modified Tue Apr 24 08:55:04 2007 UTC (11 years, 10 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11989 byte(s)
Diff to previous 1062
problem with reset of faulty PDE rhs fixed.

Revision 1062 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 06:17:53 2007 UTC (11 years, 10 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11941 byte(s)
Diff to previous 1059
reduced integration schemes are implemented now for grad, integrate, etc. Tests still to be added.

Revision 1059 - (view) (annotate) - [select for diffs]
Modified Fri Mar 23 11:01:53 2007 UTC (11 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11863 byte(s)
Diff to previous 1044
first steps toward reduced element integration order. The escript bit is done but the finley part still needs work.

Revision 1044 - (view) (annotate) - [select for diffs]
Modified Mon Mar 19 07:29:31 2007 UTC (11 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11596 byte(s)
Diff to previous 1034
clear name tagging is supported now.

Revision 1034 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 23:49:20 2007 UTC (11 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11286 byte(s)
Diff to previous 1023
In VC++ boost has problems with numarray arguments from python. This
fixes that problem by taking python::object arguments from the python
level and converting it into python::numeric::array on the C++ level.
This hasn't been tested with VC++ yet.

Moreover the two Data methods dealing with big numarrays as argument and
return value have been removed.



Revision 1023 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 05:43:36 2007 UTC (11 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11334 byte(s)
Diff to previous 964
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.

Revision 964 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:10:26 2007 UTC (12 years ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11283 byte(s)
Diff to previous 950
The set/getRefVal functions of Data objects have been removed (mainly to avoid later problems with MPI).
Moreover, a faster access to the reference id of samples has been introduced. I don't think that anybody will
profit form this at this stage but it will allow a faster dump of data objects.



Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11443 byte(s)
Diff to previous 922
escript data objects can now be saved to netCDF files, see http://www.unidata.ucar.edu/software/netcdf/.
Currently only constant data are implemented with expanded and tagged data to follow.
There are two new functions to dump a data object

   s=Data(...)
   s.dump(<filename>)

and to recover it

   s=load(<filename>, domain)

Notice that the function space of s is recovered but domain is still need. 

dump and load will replace archive and extract.

The installation needs now the netCDF installed. 



Revision 922 - (view) (annotate) - [select for diffs]
Modified Fri Jan 5 04:23:05 2007 UTC (12 years, 1 month ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11320 byte(s)
Diff to previous 921
setValueOfDataPoint accepts double value as argument now

Revision 921 - (view) (annotate) - [select for diffs]
Modified Fri Jan 5 00:54:37 2007 UTC (12 years, 1 month ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11245 byte(s)
Diff to previous 914
I have done some clarification on functions that allow to access individual data point values in a Data object. 
The term "data point number" is always local on a MPI process and referes to the value (data_point_in_sample, sample)
as a single identifyer (data_point_in_sample + sample * number_data_points_per_sample). a "global data point number"
referes to a tuple of a processour id and local data point number.

The function convertToNumArrayFromSampleNo has been removed now and convertToNumArrayFromDPNo renamed to getValueOfDataPoint.
There are two new functions:

   getNumberOfDataPoints
   setValueOfDataPoint

This allows you to do things like:

  in=Data(..)
  out=Data(..)
   for i in xrange(in.getNumberOfDataPoints())
       in_loc=in.getValueOfDataPoint(i)
       out_loc=< some operations on in_loc>
       out.setValueOfDataPoint(i,out_loc)


Also mindp  is renamed to  minGlobalDataPoint and there is a new function getValueOfGlobalDataPoint. While in MPI the functions getNumberOfDataPoints and getValueOfDataPoint are working locally on each process (so the code above is executed in parallel).
the latter allows getting a single value across all processors. 



Revision 914 - (view) (annotate) - [select for diffs]
Modified Thu Dec 14 04:38:18 2006 UTC (12 years, 2 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11165 byte(s)
Diff to previous 876
access to the number of samples added

Revision 876 - (view) (annotate) - [select for diffs]
Modified Thu Oct 19 03:50:23 2006 UTC (12 years, 4 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11104 byte(s)
Diff to previous 813
Added erf (error function) implementation


Revision 813 - (view) (annotate) - [select for diffs]
Modified Mon Aug 21 02:08:47 2006 UTC (12 years, 6 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11067 byte(s)
Diff to previous 804
Tensor products for Data objects are now computed by a C++ method
C_GeneralTensorProduct, which calls C function matrix_matrix_product
to do the actual calculation.

Can perform product with either input transposed in place, meaning
without first computing the transpose in a separate step.


Revision 804 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 01:12:16 2006 UTC (12 years, 6 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10840 byte(s)
Diff to previous 800
the new function swap_axes + tests added. (It replaces swap).



Revision 800 - (view) (annotate) - [select for diffs]
Modified Tue Aug 8 11:23:18 2006 UTC (12 years, 6 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10831 byte(s)
Diff to previous 797
new function _swap. Python wrapper + testing is still missing.



Revision 797 - (view) (annotate) - [select for diffs]
Modified Thu Aug 3 02:03:18 2006 UTC (12 years, 6 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10804 byte(s)
Diff to previous 783
function added to manually free unused memory in the memory manager

Revision 783 - (view) (annotate) - [select for diffs]
Modified Tue Jul 18 01:32:50 2006 UTC (12 years, 7 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10720 byte(s)
Diff to previous 775
coordinates, element size and normals returned by corresponding
FunctionSpace mesthods are now protected against updates. So 
+=, -=, *=, /=, setTaggedValue, fillFromNumArray will through an
excpetion.

The FunctionSpace class does nut buffer the oordinates, element size and
normals yet.



Revision 775 - (view) (annotate) - [select for diffs]
Modified Mon Jul 10 04:00:08 2006 UTC (12 years, 7 months ago) by ksteube
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10612 byte(s)
Diff to previous 767
Modified the following python methods in escript/py_src/util.py to
call faster C++ methods:
	escript_trace
	escript_transpose
	escript_symmetric
	escript_nonsymmetric


Revision 767 - (view) (annotate) - [select for diffs]
Modified Fri Jun 30 07:29:08 2006 UTC (12 years, 7 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10455 byte(s)
Diff to previous 699
new FunctionSpace method setTags added

Revision 699 - (view) (annotate) - [select for diffs]
Modified Fri Mar 31 06:27:56 2006 UTC (12 years, 10 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10401 byte(s)
Diff to previous 698
now float**Data is running

Revision 698 - (view) (annotate) - [select for diffs]
Modified Fri Mar 31 04:52:55 2006 UTC (12 years, 10 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10358 byte(s)
Diff to previous 693
test with tagged data pass now

Revision 693 - (view) (annotate) - [select for diffs]
Modified Thu Mar 30 08:34:08 2006 UTC (12 years, 10 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10426 byte(s)
Diff to previous 682
DataVariable removed. it is not used.

Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (12 years, 10 months ago) by robwdcock
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10452 byte(s)
Diff to previous 615
+ NEW BUILD SYSTEM

This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.

ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows

module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3



Revision 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (12 years, 11 months ago) by elspeth
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10442 byte(s)
Diff to previous 595
More copyright information.


Revision 595 - (view) (annotate) - [select for diffs]
Modified Tue Mar 14 23:52:45 2006 UTC (12 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10922 byte(s)
Diff to previous 576
test_utilOnFinley fixed (did run the tests that still fail)

Revision 576 - (view) (annotate) - [select for diffs]
Modified Fri Mar 3 08:28:42 2006 UTC (12 years, 11 months ago) by gross
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11201 byte(s)
Diff to previous 571
some steps towards eigenvalue and eigenvector calculation

Revision 571 - (view) (annotate) - [select for diffs]
Modified Tue Feb 28 06:53:17 2006 UTC (12 years, 11 months ago) by jgs
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 11041 byte(s)
Diff to previous 480
modify whereZero etc methods to also accept a tolerance parameter

Revision 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (13 years ago) by jgs
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10940 byte(s)
Diff to previous 474
rationalise #includes and forward declarations


Revision 474 - (view) (annotate) - [select for diffs]
Modified Mon Jan 30 04:23:44 2006 UTC (13 years ago) by jgs
Original Path: trunk/escript/src/escriptcpp.cpp
File length: 10906 byte(s)
Copied from: trunk/escript/src/Data/escriptcpp.cpp revision 469
Diff to previous 468
restructure escript source tree
move src/Data/* -> src
remove inc
modify #includes and cpppath settings accordingly


Revision 468 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 06:50:39 2006 UTC (13 years ago) by jgs
Original Path: trunk/escript/src/Data/escriptcpp.cpp
File length: 11009 byte(s)
Diff to previous 391
reorganised esysUtils to remove inc directory

Revision 391 - (view) (annotate) - [select for diffs]
Modified Tue Dec 20 05:36:50 2005 UTC (13 years, 2 months ago) by gross
Original Path: trunk/escript/src/Data/escriptcpp.cpp
File length: 11019 byte(s)
Diff to previous 358
intreface for setting the number of threads from python

Revision 358 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 07:55:19 2005 UTC (13 years, 2 months ago) by cochrane
Original Path: trunk/escript/src/Data/escriptcpp.cpp
File length: 10873 byte(s)
Diff to previous 285
Updated link to epydoc generated documentation on the web site.


Revision 285 - (view) (annotate) - [select for diffs]
Modified Thu Dec 1 06:40:04 2005 UTC (13 years, 2 months ago) by gross
Original Path: trunk/escript/src/Data/escriptcpp.cpp
File length: 10882 byte(s)
Diff to previous 155
length method is removed as it is too slow. use length in util.py instead

Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 3 months ago) by jgs
Original Path: trunk/escript/src/Data/escriptcpp.cpp
File length: 10975 byte(s)
Diff to previous 153
move all directories from trunk/esys2 into trunk and remove esys2


Revision 153 - (view) (annotate) - [select for diffs]
Modified Tue Oct 25 01:51:20 2005 UTC (13 years, 3 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10975 byte(s)
Diff to previous 150
Merge of development branch dev-02 back to main trunk on 2005-10-25


Revision 150 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 03:44:45 2005 UTC (13 years, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10779 byte(s)
Diff to previous 149
Merge of development branch dev-02 back to main trunk on 2005-09-15


Revision 149 - (view) (annotate) - [select for diffs]
Modified Thu Sep 1 03:31:39 2005 UTC (13 years, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10579 byte(s)
Diff to previous 148
Merge of development branch dev-02 back to main trunk on 2005-09-01


Revision 148 - (view) (annotate) - [select for diffs]
Modified Tue Aug 23 01:24:31 2005 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10485 byte(s)
Diff to previous 147
Merge of development branch dev-02 back to main trunk on 2005-08-23


Revision 147 - (view) (annotate) - [select for diffs]
Modified Fri Aug 12 01:45:47 2005 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10486 byte(s)
Diff to previous 126
erge of development branch dev-02 back to main trunk on 2005-08-12


Revision 126 - (view) (annotate) - [select for diffs]
Modified Fri Jul 22 03:53:08 2005 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10486 byte(s)
Diff to previous 123
Merge of development branch back to main trunk on 2005-07-22


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10386 byte(s)
Diff to previous 122
Merge of development branch back to main trunk on 2005-07-08


Revision 122 - (view) (annotate) - [select for diffs]
Modified Thu Jun 9 05:38:05 2005 UTC (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 10327 byte(s)
Diff to previous 121
Merge of development branch back to main trunk on 2005-06-09


Revision 121 - (view) (annotate) - [select for diffs]
Modified Fri May 6 04:26:16 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 9742 byte(s)
Diff to previous 119
Merge of development branch back to main trunk on 2005-05-06


Revision 119 - (view) (annotate) - [select for diffs]
Modified Tue Apr 12 04:45:05 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 9176 byte(s)
Diff to previous 117
*** empty log message ***


Revision 117 - (view) (annotate) - [select for diffs]
Modified Fri Apr 1 05:48:57 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 9076 byte(s)
Diff to previous 110
*** empty log message ***


Revision 110 - (view) (annotate) - [select for diffs]
Modified Mon Feb 14 04:14:42 2005 UTC (14 years ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 8974 byte(s)
Diff to previous 108
*** empty log message ***


Revision 108 - (view) (annotate) - [select for diffs]
Modified Thu Jan 27 06:21:59 2005 UTC (14 years ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 8826 byte(s)
Diff to previous 104
*** empty log message ***


Revision 104 - (view) (annotate) - [select for diffs]
Modified Fri Dec 17 07:43:12 2004 UTC (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 8753 byte(s)
Diff to previous 102
*** empty log message ***


Revision 102 - (view) (annotate) - [select for diffs]
Added Wed Dec 15 07:08:39 2004 UTC (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/escriptcpp.cpp
File length: 8711 byte(s)
*** empty log message ***


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26