/[escript]/trunk/scons/windows_intelc_options.py
ViewVC logotype

Log of /trunk/scons/windows_intelc_options.py

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1633 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 07:45:17 2008 UTC (10 years, 11 months ago) by trankine
File length: 2268 byte(s)
Diff to previous 1628
Turn on netcdf in windows build. No new errors generated.... remarkable.

The correctly configured netCDF source and windows build config.
that matches enthought python25/vtk/PmdPyRT for windows, can be
obtained from

https://cgsrv1.arrc.csiro.au/subversion/swframeutils/thirdParty/netcdf/trunk

username & password needed. If you have access to our twiki, no new username is required,
but authorisation to read the repository will be required.


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

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 1427 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 07:54:48 2008 UTC (11 years, 3 months ago) by trankine
File length: 1919 byte(s)
Diff to previous 1388
brought from the windows port branch. Should make no difference to *nix's

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 5 months ago) by trankine
File length: 1920 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, 5 months ago) by trankine
Original Path: temp/scons/windows_intelc_options.py
File length: 1920 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, 5 months ago) by phornby
Original Path: temp_trunk_copy/scons/windows_intelc_options.py
File length: 1920 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, 8 months ago) by ksteube
File length: 1920 byte(s)
Diff to previous 1245
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 1245 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 14:27:20 2007 UTC (11 years, 10 months ago) by phornby
File length: 1492 byte(s)
Diff to previous 1242
Add in the netcdf libraries.

Revision 1242 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 06:45:41 2007 UTC (11 years, 10 months ago) by phornby
File length: 1495 byte(s)
Diff to previous 1232
Update for the new SConstruct

Revision 1232 - (view) (annotate) - [select for diffs]
Modified Fri Aug 10 06:44:04 2007 UTC (11 years, 10 months ago) by phornby
File length: 1114 byte(s)
Diff to previous 1160
Reduce the number of IS_WINDOWS_PLATFORM references in SConstruct.
Change path to boost etc in windows_mscv71_options.py 
Some of these changes are present in windows_mscv71_options.py, more changes needed once I get the mscv71 build going properly.

Revision 1160 - (view) (annotate) - [select for diffs]
Modified Wed May 23 00:44:01 2007 UTC (12 years, 1 month ago) by gross
File length: 1157 byte(s)
Diff to previous 1139
The OMP_NUM_THREADS environment variable is now imported into the scons evironment.

Revision 1139 - (view) (annotate) - [select for diffs]
Modified Mon May 14 05:12:53 2007 UTC (12 years, 1 month ago) by ksteube
File length: 1145 byte(s)
Diff to previous 1041
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.


Revision 1041 - (view) (annotate) - [select for diffs]
Modified Fri Mar 16 09:11:10 2007 UTC (12 years, 3 months ago) by phornby
File length: 1143 byte(s)
Diff to previous 1025
Change the netcdf path options to reflect the svn controlled netcdf path.



Revision 1025 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 08:02:12 2007 UTC (12 years, 3 months ago) by phornby
File length: 1155 byte(s)
Diff to previous 1019
More windows options.



Revision 1019 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 10:04:54 2007 UTC (12 years, 3 months ago) by phornby
File length: 1153 byte(s)
Diff to previous 1017
More windows options changes.



Revision 1017 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 07:35:46 2007 UTC (12 years, 3 months ago) by phornby
File length: 1045 byte(s)
Copied from: trunk/scons/windows_eg_options.py revision 1016
Diff to previous 869
Windows options files.



Revision 869 - (view) (annotate) - [select for diffs]
Added Fri Oct 13 03:48:29 2006 UTC (12 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_eg_options.py
File length: 1045 byte(s)
Add some example options files people can copy and modify for their node.



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