/[escript]/branches/trilinos_from_5897/dudley/src/Assemble_integrate.cpp
ViewVC logotype

Log of /branches/trilinos_from_5897/dudley/src/Assemble_integrate.cpp

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 6079 - (view) (annotate) - [select for diffs]
Modified Mon Mar 21 12:22:38 2016 UTC (2 years, 11 months ago) by caltinay
File length: 2860 byte(s)
Diff to previous 6009
Big commit - making dudley much more like finley to make it more
managable. Fixed quite a few issues that had been fixed in finley.
Disposed of all ReducedNode/ReducedDOF entities that dudley never supported.
Compiles and passes tests.


Revision 6009 - (view) (annotate) - [select for diffs]
Modified Wed Mar 2 04:13:26 2016 UTC (2 years, 11 months ago) by caltinay
File length: 3048 byte(s)
Diff to previous 5898
Much needed sync with trunk...


Revision 5898 - (view) (annotate) - [select for diffs]
Modified Fri Feb 5 03:37:49 2016 UTC (3 years ago) by caltinay
File length: 3485 byte(s)
Diff to previous 5863
trilinos playground


Revision 5863 - (view) (annotate) - [select for diffs]
Modified Wed Jan 13 02:25:48 2016 UTC (3 years, 1 month ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3485 byte(s)
Diff to previous 5593
Copyright dates updated.
\version for doxygen to read


Revision 5593 - (view) (annotate) - [select for diffs]
Modified Fri Apr 24 01:36:26 2015 UTC (3 years, 9 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3485 byte(s)
Diff to previous 5589
Fixing institution name to comply with policy

Revision 5589 - (view) (annotate) - [select for diffs]
Modified Wed Apr 22 03:13:44 2015 UTC (3 years, 10 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3481 byte(s)
Diff to previous 5483
Changes brought across from the debian preparation branch.



Revision 5483 - (view) (annotate) - [select for diffs]
Modified Thu Feb 19 04:28:56 2015 UTC (4 years ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3481 byte(s)
Diff to previous 5480
More python fixes

Revision 5480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 18 04:35:50 2015 UTC (4 years ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3430 byte(s)
Diff to previous 5448
Stage 1 of removing escriptDataC



Revision 5448 - (view) (annotate) - [select for diffs]
Modified Fri Feb 6 05:31:37 2015 UTC (4 years ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3424 byte(s)
Diff to previous 5407
Updating all the dates

Revision 5407 - (view) (annotate) - [select for diffs]
Modified Thu Dec 18 02:48:24 2014 UTC (4 years, 2 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3424 byte(s)
Diff to previous 4657
release changes

Revision 4657 - (view) (annotate) - [select for diffs]
Modified Thu Feb 6 06:12:20 2014 UTC (5 years ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3424 byte(s)
Diff to previous 4346
I changed some files.
Updated copyright notices, added GeoComp.




Revision 4346 - (view) (annotate) - [select for diffs]
Modified Tue Apr 2 04:46:45 2013 UTC (5 years, 10 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.cpp
File length: 3356 byte(s)
Copied from: branches/doubleplusgood/dudley/src/Assemble_integrate.cpp revision 4345
Diff to previous 4332
Bringing the changes from doubleplusgood branch.
Can't merge directly because svn doesn't transfer changes to renamed files (mutter grumble).

Revision 4332 - (view) (annotate) - [select for diffs]
Modified Thu Mar 21 04:21:14 2013 UTC (5 years, 11 months ago) by jfenwick
Original Path: branches/doubleplusgood/dudley/src/Assemble_integrate.cpp
File length: 3356 byte(s)
Diff to previous 4261
like sand though the hourglass

Revision 4261 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 06:09:33 2013 UTC (5 years, 11 months ago) by jfenwick
Original Path: branches/doubleplusgood/dudley/src/Assemble_integrate.cpp
File length: 3376 byte(s)
Copied from: branches/doubleplusgood/dudley/src/Assemble_integrate.c revision 4257
Diff to previous 4257
Initial all c++ build.
But ... there are now reinterpret_cast<>'s

Revision 4257 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 03:42:40 2013 UTC (5 years, 11 months ago) by jfenwick
Original Path: branches/doubleplusgood/dudley/src/Assemble_integrate.c
File length: 3376 byte(s)
Diff to previous 4154
Some simple experiments for c++ Finley


Revision 4154 - (view) (annotate) - [select for diffs]
Modified Tue Jan 22 09:30:23 2013 UTC (6 years, 1 month ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.c
File length: 3376 byte(s)
Diff to previous 3981
Round 1 of copyright fixes

Revision 3981 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 02:47:54 2012 UTC (6 years, 5 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.c
File length: 3376 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 (6 years, 8 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.c
File length: 3191 byte(s)
Diff to previous 3259
Copyright changes

Revision 3259 - (view) (annotate) - [select for diffs]
Modified Mon Oct 11 01:48:14 2010 UTC (8 years, 4 months ago) by jfenwick
Original Path: trunk/dudley/src/Assemble_integrate.c
File length: 3191 byte(s)
Diff to previous 3251
Merging dudley and scons updates from branches


Revision 3251 - (view) (annotate) - [select for diffs]
Modified Thu Oct 7 04:02:30 2010 UTC (8 years, 4 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3191 byte(s)
Diff to previous 3227
Merged sconcript changes - weipa doesn't build unit test binary

Revision 3227 - (view) (annotate) - [select for diffs]
Modified Thu Sep 30 06:07:08 2010 UTC (8 years, 4 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3191 byte(s)
Diff to previous 3224
Pass1 or moving MPI stuff out of paso


Revision 3224 - (view) (annotate) - [select for diffs]
Modified Wed Sep 29 05:19:37 2010 UTC (8 years, 4 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3191 byte(s)
Diff to previous 3206
indent -linux -nce -i4 -bl -bli0 -l120


Revision 3206 - (view) (annotate) - [select for diffs]
Modified Fri Sep 24 03:20:22 2010 UTC (8 years, 4 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3641 byte(s)
Diff to previous 3205
Remove references to reducedShapeFunction


Revision 3205 - (view) (annotate) - [select for diffs]
Modified Fri Sep 24 00:30:43 2010 UTC (8 years, 5 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3647 byte(s)
Diff to previous 3184
Removing -total from field names


Revision 3184 - (view) (annotate) - [select for diffs]
Modified Wed Sep 15 00:23:42 2010 UTC (8 years, 5 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3652 byte(s)
Diff to previous 3086
Removed volume from ElementFile_Jacobeans


Revision 3086 - (view) (annotate) - [select for diffs]
Modified Thu Aug 5 05:07:58 2010 UTC (8 years, 6 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3630 byte(s)
Diff to previous 3080
Another pass at removing finley


Revision 3080 - (view) (annotate) - [select for diffs]
Modified Tue Aug 3 04:28:03 2010 UTC (8 years, 6 months ago) by jfenwick
Original Path: branches/domexper/dudley/src/Assemble_integrate.c
File length: 3630 byte(s)
Diff to previous 3079
inital rename

Revision 3079 - (view) (annotate) - [select for diffs]
Modified Tue Aug 3 04:04:51 2010 UTC (8 years, 6 months ago) by jfenwick
Original Path: branches/domexper/finley/src/Assemble_integrate.c
File length: 3630 byte(s)
Diff to previous 2881
Some experiments on finley


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (9 years ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3630 byte(s)
Diff to previous 2770
Don't panic.
Updating copyright stamps


Revision 2770 - (view) (annotate) - [select for diffs]
Modified Wed Nov 25 01:24:51 2009 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3630 byte(s)
Diff to previous 2748
Removed buffer implementation of Lazy.
Removed supporting Alloc/Free Sample buffer calls.

Revision 2748 - (view) (annotate) - [select for diffs]
Modified Tue Nov 17 07:32:59 2009 UTC (9 years, 3 months ago) by gross
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3714 byte(s)
Diff to previous 2548
Macro elements are implemented now. VTK writer for macro elements still needs testing.

Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (9 years, 7 months ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4482 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 ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4482 byte(s)
Diff to previous 1981
Merging version 2269 to trunk


Revision 1981 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 05:27:33 2008 UTC (10 years, 3 months ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4369 byte(s)
Diff to previous 1811
More warning removal.


Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 4 months ago) by ksteube
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4365 byte(s)
Diff to previous 1628
Copyright updated in all files


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 7 months ago) by phornby
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4400 byte(s)
Diff to previous 1388

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, 1 month ago) by trankine
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4482 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, 1 month ago) by trankine
Original Path: temp/finley/src/Assemble_integrate.c
File length: 4482 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, 1 month ago) by phornby
Original Path: temp_trunk_copy/finley/src/Assemble_integrate.c
File length: 4482 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, 5 months ago) by ksteube
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4482 byte(s)
Diff to previous 1064
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 (11 years, 10 months ago) by gross
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 4518 byte(s)
Diff to previous 1028
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 (11 years, 11 months ago) by gross
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 5155 byte(s)
Diff to previous 853
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 (12 years, 5 months ago) by gross
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 5285 byte(s)
Diff to previous 777
some performance problems wit openmp fixed.

Revision 777 - (view) (annotate) - [select for diffs]
Modified Wed Jul 12 08:54:45 2006 UTC (12 years, 7 months ago) by gross
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 5034 byte(s)
Diff to previous 616
integration with persistent jacobeans is running now

Revision 616 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:46:56 2006 UTC (12 years, 11 months ago) by elspeth
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 6243 byte(s)
Diff to previous 471
Copyright added to more source files.


Revision 471 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:33:02 2006 UTC (13 years ago) by jgs
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 6565 byte(s)
Copied from: trunk/finley/src/finley/Assemble_integrate.c revision 469
Diff to previous 201
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, 3 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
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 (13 years, 3 months 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) - [select for diffs]
Modified Thu Sep 15 03:44:45 2005 UTC (13 years, 5 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 (13 years, 7 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5581 byte(s)
Diff to previous 102
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, 2 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_integrate.c
File length: 5175 byte(s)
Diff to previous 100
*** empty log message ***


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


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


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