/[escript]/branches/windows_from_1456_trunk_1544_merged_in/bruce/src/Bruce.cpp
ViewVC logotype

Log of /branches/windows_from_1456_trunk_1544_merged_in/bruce/src/Bruce.cpp

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1578 - (view) (annotate) - [select for diffs]
Modified Wed May 28 11:16:10 2008 UTC (11 years, 3 months ago) by phornby
File length: 34837 byte(s)
Diff to previous 1575
Now restore the old 1544 merged branch to its previous state. 
(Yup, I forgot to do an svn cp and an svn switch before doing the merge....).



Revision 1575 - (view) (annotate) - [select for diffs]
Modified Wed May 28 11:07:33 2008 UTC (11 years, 3 months ago) by phornby
Original Path: branches/windows_from_1456_trunk_1544_merged_in_old/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 1546
Prepare for a shuffle of branch names to bring in the new trunk merge.



Revision 1546 - (view) (annotate) - [select for diffs]
Modified Thu May 1 07:09:49 2008 UTC (11 years, 4 months ago) by phornby
File length: 34837 byte(s)
Diff to previous 1523
Copy branch to new name to reflect the new trunk version merged in



Revision 1523 - (view) (annotate) - [select for diffs]
Modified Tue Apr 22 06:15:31 2008 UTC (11 years, 4 months ago) by phornby
Original Path: branches/windows_from_1456_trunk_1522_merged_in/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 1492
Rename to reflect the trunk version merged in.

Revision 1492 - (view) (annotate) - [select for diffs]
Modified Mon Apr 14 06:43:51 2008 UTC (11 years, 5 months ago) by trankine
Original Path: branches/windows_from_1456_trunk_1490_merged_in/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 1461
Copied remotely

Revision 1461 - (view) (annotate) - [select for diffs]
Modified Fri Mar 28 07:51:34 2008 UTC (11 years, 5 months ago) by trankine
Original Path: branches/windows_from_1456_trunk_merge_to_1459_trunk/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 1460
get the name right

Revision 1460 - (view) (annotate) - [select for diffs]
Modified Fri Mar 28 07:48:46 2008 UTC (11 years, 5 months ago) by trankine
Original Path: branches/windows_from_1456_trunk_merge_to1459_trunk/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 1457
update of branch to keep up with trunk

Revision 1457 - (view) (annotate) - [select for diffs]
Modified Fri Feb 29 06:18:21 2008 UTC (11 years, 6 months ago) by phornby
Original Path: branches/windows_from_1456_trunk/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 1388
Open new branch for system_dep.h fixup & dealing with intermittent run_tests failures on windows.



Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 8 months ago) by trankine
Original Path: trunk/bruce/src/Bruce.cpp
File length: 34837 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/bruce/src/Bruce.cpp
File length: 34837 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/bruce/src/Bruce.cpp
File length: 34837 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
Original Path: trunk/bruce/src/Bruce.cpp
File length: 34837 byte(s)
Diff to previous 870
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 870 - (view) (annotate) - [select for diffs]
Modified Fri Oct 13 05:01:25 2006 UTC (12 years, 11 months ago) by phornby
Original Path: trunk/bruce/src/Bruce.cpp
File length: 35292 byte(s)
Diff to previous 757
g++ on Linux would not swallow

std::string name(boost::python::extract<std::string>(keys[i_data]),0 , MAX_namelength);

so I broke it down for the poor thing:

const std::string &
full_name = boost::python::extract<std::string>(keys[i_data]);
std::string name(full_name, 0, MAX_namelength);




Revision 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 2 months ago) by woo409
Original Path: trunk/bruce/src/Bruce.cpp
File length: 35041 byte(s)
Diff to previous 682
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 5 months ago) by robwdcock
Original Path: trunk/bruce/src/Bruce.cpp
File length: 35321 byte(s)
Diff to previous 475
+ 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 475 - (view) (annotate) - [select for diffs]
Modified Mon Jan 30 05:36:15 2006 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/bruce/src/Bruce.cpp
File length: 35313 byte(s)
Diff to previous 465
rationalise #includes


Revision 465 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 01:08:17 2006 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/bruce/src/Bruce.cpp
File length: 35186 byte(s)
Copied from: trunk/bruce/src/Bruce/Bruce.cpp revision 463
Diff to previous 372
reorganise bruce source tree:
move all from src/Bruce -> src
remove inc
adjust all #includes appropriately



Revision 372 - (view) (annotate) - [select for diffs]
Modified Fri Dec 16 01:12:41 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/bruce/src/Bruce/Bruce.cpp
File length: 35300 byte(s)
Diff to previous 155
explicitly initialise integer members to zero

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/bruce/src/Bruce/Bruce.cpp
File length: 35271 byte(s)
Diff to previous 154
move all directories from trunk/esys2 into trunk and remove esys2


Revision 154 - (view) (annotate) - [select for diffs]
Modified Mon Nov 7 05:51:17 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/esys2/bruce/src/Bruce/Bruce.cpp
File length: 35271 byte(s)
Diff to previous 153
Merge of development branch dev-02 back to main trunk on 2005-11-07


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


Revision 151 - (view) (annotate) - [select for diffs]
Modified Thu Sep 22 01:55:00 2005 UTC (14 years ago) by jgs
Original Path: trunk/esys2/bruce/src/Bruce/Bruce.cpp
File length: 23919 byte(s)
Diff to previous 150
Merge of development branch dev-02 back to main trunk on 2005-09-22


Revision 150 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 03:44:45 2005 UTC (14 years ago) by jgs
Original Path: trunk/esys2/bruce/src/Bruce/Bruce.cpp
File length: 14030 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]
Added Thu Sep 1 03:31:39 2005 UTC (14 years ago) by jgs
Original Path: trunk/esys2/bruce/src/Bruce/Bruce.cpp
File length: 1931 byte(s)
Merge of development branch dev-02 back to main trunk on 2005-09-01


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