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

Log of /trunk/escript/src/DataFactory.cpp

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 4507)

Revision 4014 - (view) (annotate) - [select for diffs]
Modified Thu Oct 4 03:28:35 2012 UTC (6 years, 11 months ago) by caltinay
File length: 14950 byte(s)
Diff to previous 3981
Changed data source to use ripley's netCDF reader,
added tests and changed ERMapper test to have different x and y sizes.


Revision 3981 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 02:47:54 2012 UTC (6 years, 11 months ago) by jfenwick
File length: 14950 byte(s)
Diff to previous 3911
First pass of updating copyright notices

Revision 3911 - (view) (annotate) - [select for diffs]
Modified Thu Jun 14 01:01:03 2012 UTC (7 years, 3 months ago) by jfenwick
File length: 14831 byte(s)
Diff to previous 3317
Copyright changes

Revision 3317 - (view) (annotate) - [select for diffs]
Modified Thu Oct 28 00:50:41 2010 UTC (8 years, 10 months ago) by caltinay
File length: 14831 byte(s)
Diff to previous 3259
Removed bogus mpi.h includes, replaced others by our esysUtils wrapper
and rearranged so that the wrapper always comes before netcdf which fixes
linking problems when disabling mpi on systems with netCDF 4.x.


Revision 3259 - (view) (annotate) - [select for diffs]
Modified Mon Oct 11 01:48:14 2010 UTC (8 years, 11 months ago) by jfenwick
File length: 14839 byte(s)
Diff to previous 2881
Merging dudley and scons updates from branches


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (9 years, 7 months ago) by jfenwick
File length: 14839 byte(s)
Diff to previous 2841
Don't panic.
Updating copyright stamps


Revision 2841 - (view) (annotate) - [select for diffs]
Modified Thu Jan 14 01:02:56 2010 UTC (9 years, 8 months ago) by jfenwick
File length: 14839 byte(s)
Diff to previous 2838
Unit tests for 2838 and adding setTags variant which takes a string instead of a tag num.



Revision 2838 - (view) (annotate) - [select for diffs]
Modified Wed Jan 13 06:01:03 2010 UTC (9 years, 8 months ago) by jfenwick
File length: 13879 byte(s)
Diff to previous 2548
Vector, Tensor, Tensor3, Tensor4 can now take a (nested) sequence for 
their initial value.



Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (10 years, 1 month ago) by jfenwick
File length: 12403 byte(s)
Diff to previous 2271
Updating copyright notices

Revision 2271 - (view) (annotate) - [select for diffs]
Modified Mon Feb 16 05:08:29 2009 UTC (10 years, 7 months ago) by jfenwick
File length: 12403 byte(s)
Diff to previous 1872
Merging version 2269 to trunk


Revision 1872 - (view) (annotate) - [select for diffs]
Modified Mon Oct 13 00:18:55 2008 UTC (10 years, 11 months ago) by jfenwick
File length: 12399 byte(s)
Diff to previous 1811
Closing the moreshared branch


Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 11 months ago) by ksteube
File length: 12386 byte(s)
Diff to previous 1808
Copyright updated in all files


Revision 1808 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 03:14:56 2008 UTC (10 years, 11 months ago) by jfenwick
File length: 12421 byte(s)
Diff to previous 1796
Removed some commented out lines.
Modified DataExpanded to not throw when creating objects with zero 
samples.
Modified toString() to report "(data contains no samples)" rather than 
printing a blank line.
Modified DataExpanded::dump() and load so that they do not attempt so 
save/load the ids and data fields if the data object contains no 
samples.




Revision 1796 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 01:45:46 2008 UTC (11 years ago) by jfenwick
File length: 12640 byte(s)
Diff to previous 1748
Merged noarrayview branch onto trunk.



Revision 1748 - (view) (annotate) - [select for diffs]
Modified Wed Sep 3 06:10:39 2008 UTC (11 years ago) by ksteube
File length: 11811 byte(s)
Diff to previous 1631
MPI parallelism for Data().dump and load.  Use multiple NetCDF
files, one file per MPI process


Revision 1631 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 07:16:39 2008 UTC (11 years, 2 months ago) by trankine
File length: 11645 byte(s)
Diff to previous 1628
eliminate unused var argument of catch statement.

Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 2 months ago) by phornby
File length: 11647 byte(s)
Diff to previous 1487

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 1487 - (view) (annotate) - [select for diffs]
Modified Thu Apr 10 05:28:01 2008 UTC (11 years, 5 months ago) by gross
File length: 11469 byte(s)
Diff to previous 1388
reordering when reading Netcfd files added.

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 8 months ago) by trankine
File length: 11152 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, 8 months ago) by trankine
Original Path: temp/escript/src/DataFactory.cpp
File length: 11152 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, 8 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/DataFactory.cpp
File length: 11152 byte(s)
Diff to previous 1312
Make a temp copy of the trunk before checking in the windows changes



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 11 months ago) by ksteube
File length: 11152 byte(s)
Diff to previous 1141
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 1141 - (view) (annotate) - [select for diffs]
Modified Tue May 15 04:24:51 2007 UTC (12 years, 4 months ago) by gross
File length: 11284 byte(s)
Diff to previous 1131
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 1131 - (view) (annotate) - [select for diffs]
Modified Tue May 8 05:52:21 2007 UTC (12 years, 4 months ago) by gross
File length: 11146 byte(s)
Diff to previous 1023
netcdf c++ interface removed

Revision 1023 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 05:43:36 2007 UTC (12 years, 6 months ago) by gross
File length: 11146 byte(s)
Diff to previous 1020
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.

Revision 1020 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 10:12:36 2007 UTC (12 years, 6 months ago) by phornby
File length: 10882 byte(s)
Diff to previous 985
Added explicit destructors to all Exception classes.

Fixed an ifdef in TestCase.cpp

Made the conditional definition of M_PI in LocalOps.h
depend only on M_PI being undefined.

Replace dynamically dimensioned arrays in DataFactory & DataTagged with malloc.

sort() method of list does not take a named argument
(despite the manual's claims to the contary).



Revision 985 - (view) (annotate) - [select for diffs]
Modified Tue Feb 20 04:02:10 2007 UTC (12 years, 6 months ago) by gross
File length: 10499 byte(s)
Diff to previous 983
 small bug for openmp fixed.

Revision 983 - (view) (annotate) - [select for diffs]
Modified Tue Feb 20 02:49:08 2007 UTC (12 years, 6 months ago) by gross
File length: 10458 byte(s)
Diff to previous 982
full Data object dump and load now available. Tests added.

Revision 982 - (view) (annotate) - [select for diffs]
Modified Mon Feb 19 23:55:52 2007 UTC (12 years, 6 months ago) by gross
File length: 9513 byte(s)
Diff to previous 967
data object load checks for sample  ordering now.

Revision 967 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 09:40:12 2007 UTC (12 years, 7 months ago) by gross
File length: 8478 byte(s)
Diff to previous 950
dump and load of expanded data via netCDF added. some test are still missing.

Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years, 7 months ago) by gross
File length: 7773 byte(s)
Diff to previous 615
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 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (13 years, 5 months ago) by elspeth
File length: 2187 byte(s)
Diff to previous 478
More copyright information.


Revision 478 - (view) (annotate) - [select for diffs]
Modified Tue Jan 31 02:21:49 2006 UTC (13 years, 7 months ago) by jgs
File length: 2509 byte(s)
Diff to previous 474
rationalise #includes


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


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


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataFactory.cpp
File length: 2557 byte(s)
Initial revision


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