/[escript]/branches/arrayview_from_1695_trunk/escript/src/Utils.cpp
ViewVC logotype

Log of /branches/arrayview_from_1695_trunk/escript/src/Utils.cpp

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1781 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 05:03:14 2008 UTC (11 years, 1 month ago) by jfenwick
File length: 2201 byte(s)
Diff to previous 1696 , to selected 1620
Branch commit

Merged changes from trunk version 1695 up to and including version 1779.



Revision 1696 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 03:33:40 2008 UTC (11 years, 2 months ago) by jfenwick
File length: 2157 byte(s)
Diff to previous 1628 , to selected 1620
Branching to perform experiments on removing DataArrayView


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

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 1620 - (view) (annotate) - [selected]
Modified Fri Jun 27 02:30:18 2008 UTC (11 years, 3 months ago) by ksteube
Original Path: trunk/escript/src/Utils.cpp
File length: 2112 byte(s)
Diff to previous 1568
Included more MPI configuration options on Savanna


Revision 1568 - (view) (annotate) - [select for diffs]
Modified Sat May 24 03:15:08 2008 UTC (11 years, 5 months ago) by ksteube
Original Path: trunk/escript/src/Utils.cpp
File length: 1506 byte(s)
Diff to previous 1567 , to selected 1620
Some testing on ac.apac.edu.au, more work needed
New pyvisi example offscreen.py for offscreen rendering


Revision 1567 - (view) (annotate) - [select for diffs]
Modified Thu May 22 22:52:41 2008 UTC (11 years, 5 months ago) by ksteube
Original Path: trunk/escript/src/Utils.cpp
File length: 1528 byte(s)
Diff to previous 1561 , to selected 1620
scons all_tests passes on Savanna with OMP=1 and OMP=4.
New boost for Savanna.
A few more cases of #s -> %s.


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


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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 9 months ago) by trankine
Original Path: temp/escript/src/Utils.cpp
File length: 895 byte(s)
Diff to previous 1384 , to selected 1620
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, 9 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/Utils.cpp
File length: 895 byte(s)
Diff to previous 1312 , to selected 1620
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 (12 years, 1 month ago) by ksteube
Original Path: trunk/escript/src/Utils.cpp
File length: 895 byte(s)
Diff to previous 1247 , to selected 1620
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 (12 years, 2 months ago) by ksteube
Original Path: trunk/escript/src/Utils.cpp
File length: 1020 byte(s)
Diff to previous 797 , to selected 1620
New python method getVersion() which returns the Subversion revision
from which escript was compiled


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

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


Revision 478 - (view) (annotate) - [select for diffs]
Modified Tue Jan 31 02:21:49 2006 UTC (13 years, 8 months ago) by jgs
Original Path: trunk/escript/src/Utils.cpp
File length: 1226 byte(s)
Diff to previous 474 , to selected 1620
rationalise #includes


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


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

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