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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 6939 - (view) (annotate) - [select for diffs]
Modified Mon Jan 20 03:37:18 2020 UTC (4 months, 1 week ago) by uqaeller
File length: 4070 byte(s)
Diff to previous 6913
Updated the copyright header.



Revision 6913 - (view) (annotate) - [select for diffs]
Modified Fri Nov 22 04:55:05 2019 UTC (6 months, 1 week ago) by aellery
File length: 3994 byte(s)
Diff to previous 6651
Added integration over Dirac Delta Data objects in Finley.



Revision 6651 - (view) (annotate) - [select for diffs]
Modified Wed Feb 7 02:12:08 2018 UTC (2 years, 3 months ago) by jfenwick
File length: 3601 byte(s)
Diff to previous 6572
Make everyone sad by touching all the files

Copyright dates update


Revision 6572 - (view) (annotate) - [select for diffs]
Modified Tue May 16 23:16:45 2017 UTC (3 years ago) by caltinay
File length: 3601 byte(s)
Diff to previous 6523
implementation of complex integrals in finley. (#398)


Revision 6523 - (view) (annotate) - [select for diffs]
Modified Tue Mar 7 06:50:34 2017 UTC (3 years, 2 months ago) by jfenwick
File length: 3039 byte(s)
Diff to previous 6197
UPDATE THE COPYRIGHT DATES


Revision 6197 - (view) (annotate) - [select for diffs]
Modified Fri Apr 29 14:02:32 2016 UTC (4 years, 1 month ago) by caltinay
File length: 3039 byte(s)
Diff to previous 6119
moved Distribution struct to escript and updated domains accordingly.
We can now build the full escript suite without paso (-:


Revision 6119 - (view) (annotate) - [select for diffs]
Modified Sun Apr 3 23:36:59 2016 UTC (4 years, 2 months ago) by caltinay
File length: 2951 byte(s)
Diff to previous 6112
merging trilinos branch to trunk.
We can now build with trilinos and use it instead of paso for single PDEs.
There are some more things to be done...


Revision 6112 - (view) (annotate) - [select for diffs]
Modified Thu Mar 31 09:40:10 2016 UTC (4 years, 2 months ago) by jfenwick
File length: 2951 byte(s)
Diff to previous 6001
Relicense all the things!



Revision 6001 - (view) (annotate) - [select for diffs]
Modified Tue Mar 1 05:01:49 2016 UTC (4 years, 3 months ago) by caltinay
File length: 2961 byte(s)
Diff to previous 5998
Bye bye esysUtils.
Also removed first.h as escript/DataTypes.h is now required everywhere
and fulfills that role by including a boost python header first.


Revision 5998 - (view) (annotate) - [select for diffs]
Modified Mon Feb 29 08:57:28 2016 UTC (4 years, 3 months ago) by caltinay
File length: 3013 byte(s)
Diff to previous 5988
removed some macros and moved index.h to escript.


Revision 5988 - (view) (annotate) - [select for diffs]
Modified Fri Feb 26 06:59:38 2016 UTC (4 years, 3 months ago) by caltinay
File length: 3013 byte(s)
Diff to previous 5965
eliminated Esys_setError() et al from finley. We do have the issue of
potentially throwing exceptions in some ranks and not others but I'd claim
that was the case before in various places.


Revision 5965 - (view) (annotate) - [select for diffs]
Modified Tue Feb 23 01:45:40 2016 UTC (4 years, 3 months ago) by caltinay
File length: 3196 byte(s)
Diff to previous 5863
removed more useless #defines.


Revision 5863 - (view) (annotate) - [select for diffs]
Modified Wed Jan 13 02:25:48 2016 UTC (4 years, 4 months ago) by jfenwick
File length: 3200 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 (5 years, 1 month ago) by jfenwick
File length: 3200 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 (5 years, 1 month ago) by jfenwick
File length: 3196 byte(s)
Diff to previous 5464
Changes brought across from the debian preparation branch.



Revision 5464 - (view) (annotate) - [select for diffs]
Modified Sat Feb 14 00:25:03 2015 UTC (5 years, 3 months ago) by jfenwick
File length: 3196 byte(s)
Diff to previous 5448
Fix for python compile warnings

Revision 5448 - (view) (annotate) - [select for diffs]
Modified Fri Feb 6 05:31:37 2015 UTC (5 years, 3 months ago) by jfenwick
File length: 3144 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 (5 years, 5 months ago) by jfenwick
File length: 3144 byte(s)
Diff to previous 4657
release changes

Revision 4657 - (view) (annotate) - [select for diffs]
Modified Thu Feb 6 06:12:20 2014 UTC (6 years, 3 months ago) by jfenwick
File length: 3144 byte(s)
Diff to previous 4626
I changed some files.
Updated copyright notices, added GeoComp.




Revision 4626 - (view) (annotate) - [select for diffs]
Modified Wed Jan 22 06:07:34 2014 UTC (6 years, 4 months ago) by caltinay
File length: 3076 byte(s)
Diff to previous 4496
Eliminated all const_cast<Data*> hacks in ripley and finley now that
Data.getSampleDataRO returns a const pointer.


Revision 4496 - (view) (annotate) - [select for diffs]
Modified Mon Jul 15 06:53:44 2013 UTC (6 years, 10 months ago) by caltinay
File length: 3135 byte(s)
Diff to previous 4441
finley (WIP):
-moved all of finley into its namespace
-introduced some shared pointers
-Mesh is now a class
-other bits and pieces...


Revision 4441 - (view) (annotate) - [select for diffs]
Modified Fri Jun 7 02:23:49 2013 UTC (6 years, 11 months ago) by caltinay
File length: 3144 byte(s)
Diff to previous 4431
finley now uses Data objects directly instead of going through the C wrapper.


Revision 4431 - (view) (annotate) - [select for diffs]
Modified Fri May 31 07:09:03 2013 UTC (7 years ago) by caltinay
File length: 3189 byte(s)
Diff to previous 4428
finley ElementFile is now a class...


Revision 4428 - (view) (annotate) - [select for diffs]
Modified Thu May 30 06:39:10 2013 UTC (7 years ago) by caltinay
File length: 3243 byte(s)
Diff to previous 4422
finley's NodeFile is now a class.
Associated changes:
- use of some C++ constructs/functions/types (1st pass)
- removal of obsolete pointer check
- merging of some duplicated code
- ...


Revision 4422 - (view) (annotate) - [select for diffs]
Modified Fri May 24 04:42:29 2013 UTC (7 years ago) by caltinay
File length: 3262 byte(s)
Diff to previous 4346
s/jacobeans/jacobians and other bits and pieces.


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

Revision 4327 - (view) (annotate) - [select for diffs]
Modified Wed Mar 20 05:09:11 2013 UTC (7 years, 2 months ago) by jfenwick
Original Path: branches/doubleplusgood/finley/src/Assemble_integrate.cpp
File length: 3767 byte(s)
Diff to previous 4261
some finley memory

Revision 4261 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 06:09:33 2013 UTC (7 years, 3 months ago) by jfenwick
Original Path: branches/doubleplusgood/finley/src/Assemble_integrate.cpp
File length: 3786 byte(s)
Copied from: branches/doubleplusgood/finley/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 (7 years, 3 months ago) by jfenwick
Original Path: branches/doubleplusgood/finley/src/Assemble_integrate.c
File length: 3786 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 (7 years, 4 months ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3786 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 (7 years, 8 months ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3786 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 (7 years, 11 months ago) by jfenwick
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3601 byte(s)
Diff to previous 3639
Copyright changes

Revision 3639 - (view) (annotate) - [select for diffs]
Modified Tue Oct 25 02:13:26 2011 UTC (8 years, 7 months ago) by caltinay
Original Path: trunk/finley/src/Assemble_integrate.c
File length: 3601 byte(s)
Diff to previous 3259
Assorted spelling fixes in finley C.


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


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (10 years, 4 months 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 (10 years, 6 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 (10 years, 6 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 (10 years, 10 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 (11 years, 3 months 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 (11 years, 6 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 (11 years, 8 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 (11 years, 10 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 (12 years, 4 months 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 (12 years, 4 months 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 (12 years, 4 months 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 (12 years, 8 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 (13 years, 2 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 (13 years, 2 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 (13 years, 8 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 (13 years, 10 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 (14 years, 2 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 (14 years, 4 months 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 (14 years, 6 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 (14 years, 6 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 (14 years, 8 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, 10 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 (15 years, 5 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 (15 years, 5 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 (15 years, 5 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 (15 years, 7 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