/[escript]/branches/arrayview_from_1695_trunk/finley/src/Mesh_read.c
ViewVC logotype

Log of /branches/arrayview_from_1695_trunk/finley/src/Mesh_read.c

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1781 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 05:03:14 2008 UTC (10 years, 7 months ago) by jfenwick
File length: 36015 byte(s)
Diff to previous 1696
Branch commit

Merged changes from trunk version 1695 up to and including version 1779.



Revision 1696 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 03:33:40 2008 UTC (10 years, 8 months ago) by jfenwick
File length: 28958 byte(s)
Diff to previous 1660
Branching to perform experiments on removing DataArrayView


Revision 1660 - (view) (annotate) - [select for diffs]
Modified Mon Jul 21 03:23:46 2008 UTC (10 years, 9 months ago) by ksteube
Original Path: trunk/finley/src/Mesh_read.c
File length: 28958 byte(s)
Diff to previous 1646
Some variables were not declared as a result of recent cleanup


Revision 1646 - (view) (annotate) - [select for diffs]
Modified Tue Jul 15 05:27:39 2008 UTC (10 years, 9 months ago) by phornby
Original Path: trunk/finley/src/Mesh_read.c
File length: 28882 byte(s)
Diff to previous 1637
Unused vars due to the #if 0's in the code.

Revision 1637 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 05:34:59 2008 UTC (10 years, 9 months ago) by ksteube
Original Path: trunk/finley/src/Mesh_read.c
File length: 28730 byte(s)
Diff to previous 1628
Resolved some compiler warnings
Changed blocktimer to not use strdup, intead malloc and strcpy


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

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 1402 - (view) (annotate) - [select for diffs]
Modified Thu Jan 31 00:17:49 2008 UTC (11 years, 2 months ago) by ksteube
Original Path: trunk/finley/src/Mesh_read.c
File length: 28671 byte(s)
Diff to previous 1388
now implemented to read/fan out elements


Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 3 months ago) by trankine
Original Path: trunk/finley/src/Mesh_read.c
File length: 23580 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, 3 months ago) by trankine
Original Path: temp/finley/src/Mesh_read.c
File length: 23580 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, 3 months ago) by phornby
Original Path: temp_trunk_copy/finley/src/Mesh_read.c
File length: 23580 byte(s)
Diff to previous 1360
Make a temp copy of the trunk before checking in the windows changes



Revision 1360 - (view) (annotate) - [select for diffs]
Modified Thu Dec 13 05:05:00 2007 UTC (11 years, 4 months ago) by ksteube
Original Path: trunk/finley/src/Mesh_read.c
File length: 23580 byte(s)
Diff to previous 1312
Partial implementation of ReadMeshMPI.
Will eventually replace ReadMesh but for now has a different name.


Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 6 months ago) by ksteube
Original Path: trunk/finley/src/Mesh_read.c
File length: 10439 byte(s)
Diff to previous 1170
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 1170 - (view) (annotate) - [select for diffs]
Modified Fri May 25 05:24:57 2007 UTC (11 years, 10 months ago) by btully
Original Path: trunk/finley/src/Mesh_read.c
File length: 8434 byte(s)
Diff to previous 1156
Added new methods for integration of Tri's and Tet's For Order 2 and 3.
NB: There is a conflict in the testing of the getNormal() function. On consultation with Lutz, we have concluded this is an issue with the test rather than the new methods.


Revision 1156 - (view) (annotate) - [select for diffs]
Modified Mon May 21 06:45:14 2007 UTC (11 years, 11 months ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 8432 byte(s)
Diff to previous 1062
node label optimization

Revision 1062 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 06:17:53 2007 UTC (12 years ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 8218 byte(s)
Diff to previous 1044
reduced integration schemes are implemented now for grad, integrate, etc. Tests still to be added.

Revision 1044 - (view) (annotate) - [select for diffs]
Modified Mon Mar 19 07:29:31 2007 UTC (12 years, 1 month ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 8062 byte(s)
Diff to previous 1028
clear name tagging is supported now.

Revision 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (12 years, 1 month ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 7930 byte(s)
Diff to previous 964
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 964 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:10:26 2007 UTC (12 years, 2 months ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 7819 byte(s)
Diff to previous 939
The set/getRefVal functions of Data objects have been removed (mainly to avoid later problems with MPI).
Moreover, a faster access to the reference id of samples has been introduced. I don't think that anybody will
profit form this at this stage but it will allow a faster dump of data objects.



Revision 939 - (view) (annotate) - [select for diffs]
Modified Thu Jan 25 04:23:38 2007 UTC (12 years, 2 months ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 8807 byte(s)
Diff to previous 934
bug in finley mesh reader fixed

Revision 934 - (view) (annotate) - [select for diffs]
Modified Tue Jan 23 09:52:45 2007 UTC (12 years, 2 months ago) by gross
Original Path: trunk/finley/src/Mesh_read.c
File length: 8806 byte(s)
Diff to previous 730
gmsh file reader for finley

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


Revision 616 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:46:56 2006 UTC (13 years, 1 month ago) by elspeth
Original Path: trunk/finley/src/Mesh_read.c
File length: 8577 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, 2 months ago) by jgs
Original Path: trunk/finley/src/Mesh_read.c
File length: 8899 byte(s)
Copied from: trunk/finley/src/finley/Mesh_read.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, 4 months ago) by jgs
Original Path: trunk/finley/src/finley/Mesh_read.c
File length: 8899 byte(s)
Copied from: trunk/finley/src/finleyC/Mesh_read.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, 5 months ago) by jgs
Original Path: trunk/finley/src/finleyC/Mesh_read.c
File length: 8899 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, 7 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Mesh_read.c
File length: 8899 byte(s)
Diff to previous 149
Merge of development branch dev-02 back to main trunk on 2005-09-15


Revision 149 - (view) (annotate) - [select for diffs]
Modified Thu Sep 1 03:31:39 2005 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Mesh_read.c
File length: 7645 byte(s)
Diff to previous 126
Merge of development branch dev-02 back to main trunk on 2005-09-01


Revision 126 - (view) (annotate) - [select for diffs]
Modified Fri Jul 22 03:53:08 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Mesh_read.c
File length: 7354 byte(s)
Diff to previous 123
Merge of development branch back to main trunk on 2005-07-22


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Mesh_read.c
File length: 7518 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 (14 years, 5 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Mesh_read.c
File length: 7162 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