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

Log of /trunk/finley/src/Mesh_merge.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: 7863 byte(s)
Diff to previous 6651
Updated the copyright header.



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: 7787 byte(s)
Diff to previous 6523
Make everyone sad by touching all the files

Copyright dates update


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: 7787 byte(s)
Diff to previous 6207
UPDATE THE COPYRIGHT DATES


Revision 6207 - (view) (annotate) - [select for diffs]
Modified Mon May 16 00:49:48 2016 UTC (4 years ago) by caltinay
File length: 7787 byte(s)
Diff to previous 6197
merged finley Mesh and MeshAdapter into FinleyDomain.


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: 7793 byte(s)
Diff to previous 6130
moved Distribution struct to escript and updated domains accordingly.
We can now build the full escript suite without paso (-:


Revision 6130 - (view) (annotate) - [select for diffs]
Modified Tue Apr 5 07:05:01 2016 UTC (4 years, 1 month ago) by caltinay
File length: 7766 byte(s)
Diff to previous 6119
more index_t != int fixes in dudley and finley. Both compile now with index
type long. Weipa doesn't.


Revision 6119 - (view) (annotate) - [select for diffs]
Modified Sun Apr 3 23:36:59 2016 UTC (4 years, 1 month ago) by caltinay
File length: 7649 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: 7649 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: 7659 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: 7710 byte(s)
Diff to previous 5997
removed some macros and moved index.h to escript.


Revision 5997 - (view) (annotate) - [select for diffs]
Modified Mon Feb 29 07:24:47 2016 UTC (4 years, 3 months ago) by caltinay
File length: 7690 byte(s)
Diff to previous 5988
moved esys MPI 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: 7693 byte(s)
Diff to previous 5863
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 5863 - (view) (annotate) - [select for diffs]
Modified Wed Jan 13 02:25:48 2016 UTC (4 years, 4 months ago) by jfenwick
File length: 8203 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: 8203 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: 8199 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: 8199 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: 8147 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: 8147 byte(s)
Diff to previous 4934
release changes

Revision 4934 - (view) (annotate) - [select for diffs]
Modified Tue May 13 00:28:11 2014 UTC (6 years ago) by jfenwick
File length: 8147 byte(s)
Diff to previous 4657
This commit is brought to you by the number 4934 and the tool "meld".
Merge of partially complete split world code from branch.




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: 8144 byte(s)
Diff to previous 4496
I changed some files.
Updated copyright notices, added GeoComp.




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: 8076 byte(s)
Diff to previous 4492
finley (WIP):
-moved all of finley into its namespace
-introduced some shared pointers
-Mesh is now a class
-other bits and pieces...


Revision 4492 - (view) (annotate) - [select for diffs]
Modified Tue Jul 2 01:44:11 2013 UTC (6 years, 11 months ago) by caltinay
File length: 8453 byte(s)
Diff to previous 4441
Finley changes that were held back while in release mode - moved more stuff
into finley namespace.


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: 8600 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: 8746 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: 8926 byte(s)
Diff to previous 4346
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 4346 - (view) (annotate) - [select for diffs]
Modified Tue Apr 2 04:46:45 2013 UTC (7 years, 2 months ago) by jfenwick
File length: 8233 byte(s)
Copied from: branches/doubleplusgood/finley/src/Mesh_merge.cpp revision 4345
Diff to previous 4261
Bringing the changes from doubleplusgood branch.
Can't merge directly because svn doesn't transfer changes to renamed files (mutter grumble).

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/Mesh_merge.cpp
File length: 8233 byte(s)
Copied from: branches/doubleplusgood/finley/src/Mesh_merge.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/Mesh_merge.c
File length: 8233 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/Mesh_merge.c
File length: 8233 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/Mesh_merge.c
File length: 8233 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/Mesh_merge.c
File length: 8048 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/Mesh_merge.c
File length: 8048 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/Mesh_merge.c
File length: 8014 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/Mesh_merge.c
File length: 7938 byte(s)
Diff to previous 2856
Don't panic.
Updating copyright stamps


Revision 2856 - (view) (annotate) - [select for diffs]
Modified Mon Jan 18 04:14:37 2010 UTC (10 years, 4 months ago) by gross
Original Path: trunk/finley/src/Mesh_merge.c
File length: 7938 byte(s)
Diff to previous 2748
FunctionSpaces provide now some information about their approximation order.

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/Mesh_merge.c
File length: 7916 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/Mesh_merge.c
File length: 7816 byte(s)
Diff to previous 2322
Updating copyright notices

Revision 2322 - (view) (annotate) - [select for diffs]
Modified Thu Mar 19 04:13:21 2009 UTC (11 years, 2 months ago) by gross
Original Path: trunk/finley/src/Mesh_merge.c
File length: 7816 byte(s)
Diff to previous 2320
ops

Revision 2320 - (view) (annotate) - [select for diffs]
Modified Thu Mar 19 03:40:16 2009 UTC (11 years, 2 months ago) by gross
Original Path: trunk/finley/src/Mesh_merge.c
File length: 7825 byte(s)
Diff to previous 1986
some modifictaions to make sure that Mesh_merge.c Mesh_glueFaces.c Mesh_joinFaces.c reject to work under MPI

Revision 1986 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 23:33:14 2008 UTC (11 years, 6 months ago) by jfenwick
Original Path: trunk/finley/src/Mesh_merge.c
File length: 7753 byte(s)
Diff to previous 1811
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/Mesh_merge.c
File length: 7749 byte(s)
Diff to previous 1388
Copyright updated in all files


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/Mesh_merge.c
File length: 7784 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/Mesh_merge.c
File length: 7784 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/Mesh_merge.c
File length: 7784 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/Mesh_merge.c
File length: 7784 byte(s)
Diff to previous 1062
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 1062 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 06:17:53 2007 UTC (13 years, 2 months ago) by gross
Original Path: trunk/finley/src/Mesh_merge.c
File length: 8191 byte(s)
Diff to previous 1028
reduced integration schemes are implemented now for grad, integrate, etc. Tests still to be added.

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/Mesh_merge.c
File length: 7978 byte(s)
Diff to previous 730
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 730 - (view) (annotate) - [select for diffs]
Modified Mon May 15 04:03:49 2006 UTC (14 years ago) by bcumming
Original Path: trunk/finley/src/Mesh_merge.c
File length: 8037 byte(s)
Diff to previous 616


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/Mesh_merge.c
File length: 7985 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/Mesh_merge.c
File length: 8307 byte(s)
Copied from: trunk/finley/src/finley/Mesh_merge.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/Mesh_merge.c
File length: 8307 byte(s)
Copied from: trunk/finley/src/finleyC/Mesh_merge.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/Mesh_merge.c
File length: 8307 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/Mesh_merge.c
File length: 8307 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/Mesh_merge.c
File length: 7474 byte(s)
Diff to previous 82
Merge of development branch back to main trunk on 2005-07-08


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/Mesh_merge.c
File length: 7205 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