/[escript]/trunk/finley/src/Assemble_integrate.c
ViewVC logotype

Log of /trunk/finley/src/Assemble_integrate.c

Parent Directory Parent Directory | Revision Log Revision Log


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

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

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 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 10 months ago) by trankine
File length: 4482 byte(s)
Diff to previous 1387 , to selected 150
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 10 months ago) by trankine
Original Path: temp/finley/src/Assemble_integrate.c
File length: 4482 byte(s)
Diff to previous 1384 , to selected 150
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, 10 months ago) by phornby
Original Path: temp_trunk_copy/finley/src/Assemble_integrate.c
File length: 4482 byte(s)
Diff to previous 1312 , to selected 150
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
File length: 4482 byte(s)
Diff to previous 1064 , to selected 150
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 1064 - (view) (annotate) - [select for diffs]
Modified Tue Mar 27 06:21:02 2007 UTC (12 years, 7 months ago) by gross
File length: 4518 byte(s)
Diff to previous 1028 , to selected 150
test for reduced integration order for grad, interpolate and integrate added.
Bug shown by the tests have been fixed.



Revision 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (12 years, 8 months ago) by gross
File length: 5155 byte(s)
Diff to previous 853 , to selected 150
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 853 - (view) (annotate) - [select for diffs]
Modified Wed Sep 20 05:56:36 2006 UTC (13 years, 1 month ago) by gross
File length: 5285 byte(s)
Diff to previous 777 , to selected 150
some performance problems wit openmp fixed.

Revision 777 - (view) (annotate) - [select for diffs]
Modified Wed Jul 12 08:54:45 2006 UTC (13 years, 4 months ago) by gross
File length: 5034 byte(s)
Diff to previous 616 , to selected 150
integration with persistent jacobeans is running now

Revision 616 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:46:56 2006 UTC (13 years, 7 months ago) by elspeth
File length: 6243 byte(s)
Diff to previous 471 , to selected 150
Copyright added to more source files.


Revision 471 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:33:02 2006 UTC (13 years, 9 months ago) by jgs
File length: 6565 byte(s)
Copied from: trunk/finley/src/finley/Assemble_integrate.c revision 469
Diff to previous 201 , to selected 150
reorganise finley src tree to remove inc dir and src/finley directory


Revision 201 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:10:21 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finley/Assemble_integrate.c
File length: 6565 byte(s)
Copied from: trunk/finley/src/finleyC/Assemble_integrate.c revision 175
Diff to previous 155 , to selected 150
copy finleyC and CPPAdapter to finley and finley/CPPAdapter to
facilitate scons builds


Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (14 years ago) by jgs
Original Path: trunk/finley/src/finleyC/Assemble_integrate.c
File length: 6565 byte(s)
Diff to previous 150
move all directories from trunk/esys2 into trunk and remove esys2


Revision 150 - (view) (annotate) - [selected]
Modified Thu Sep 15 03:44:45 2005 UTC (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 6565 byte(s)
Diff to previous 123
Merge of development branch dev-02 back to main trunk on 2005-09-15


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5581 byte(s)
Diff to previous 102 , to selected 150
Merge of development branch back to main trunk on 2005-07-08


Revision 102 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 07:08:39 2004 UTC (14 years, 11 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5175 byte(s)
Diff to previous 100 , to selected 150
*** empty log message ***


Revision 100 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 03:48:48 2004 UTC (14 years, 11 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5482 byte(s)
Diff to previous 97 , to selected 150
*** empty log message ***


Revision 97 - (view) (annotate) - [select for diffs]
Modified Tue Dec 14 05:39:33 2004 UTC (14 years, 11 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5567 byte(s)
Diff to previous 82 , to selected 150
*** empty log message ***


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (15 years ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5389 byte(s)
Diff to selected 150
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