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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1740 - (view) (annotate) - [select for diffs]
Modified Fri Aug 29 06:23:11 2008 UTC (10 years, 7 months ago) by gross
File length: 14813 byte(s)
Diff to previous 1628
and some fixes for the GMSH reader

Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 9 months ago) by phornby
File length: 14673 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, 3 months ago) by trankine
File length: 14694 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_readGmsh.c
File length: 14694 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_readGmsh.c
File length: 14694 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, 6 months ago) by ksteube
File length: 14694 byte(s)
Diff to previous 1179
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 1179 - (view) (annotate) - [select for diffs]
Modified Wed May 30 05:10:02 2007 UTC (11 years, 10 months ago) by gross
File length: 14055 byte(s)
Diff to previous 1178
some debug print outs removed.

Revision 1178 - (view) (annotate) - [select for diffs]
Modified Wed May 30 05:03:17 2007 UTC (11 years, 10 months ago) by gross
File length: 14151 byte(s)
Diff to previous 1177
bug in visualization interface test fixed.

Revision 1177 - (view) (annotate) - [select for diffs]
Modified Wed May 30 05:01:29 2007 UTC (11 years, 10 months ago) by gross
File length: 14055 byte(s)
Diff to previous 1156
debug print out removed.

Revision 1156 - (view) (annotate) - [select for diffs]
Modified Mon May 21 06:45:14 2007 UTC (11 years, 11 months ago) by gross
File length: 14114 byte(s)
Diff to previous 1092
node label optimization

Revision 1092 - (view) (annotate) - [select for diffs]
Modified Fri Apr 13 03:39:49 2007 UTC (12 years ago) by gross
File length: 13913 byte(s)
Diff to previous 1062
the useless profilinf for data.cpp removed (doDebug=yes should work again)
and a small bug in the gmsh reader fixed.


Revision 1062 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 06:17:53 2007 UTC (12 years ago) by gross
File length: 13913 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 (12 years, 1 month ago) by gross
File length: 13806 byte(s)
Diff to previous 1003
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 1003 - (view) (annotate) - [select for diffs]
Modified Thu Mar 1 01:53:37 2007 UTC (12 years, 1 month ago) by gross
File length: 13777 byte(s)
Diff to previous 997
small fix on the finley gmsh reader for the case of no face elements.

Revision 997 - (view) (annotate) - [select for diffs]
Modified Mon Feb 26 06:31:45 2007 UTC (12 years, 1 month ago) by gross
File length: 13136 byte(s)
Diff to previous 964
small small fixes in modellib

Revision 964 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:10:26 2007 UTC (12 years, 2 months ago) by gross
File length: 13129 byte(s)
Diff to previous 940
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 940 - (view) (annotate) - [select for diffs]
Modified Mon Jan 29 00:09:08 2007 UTC (12 years, 2 months ago) by gross
File length: 12952 byte(s)
Diff to previous 935
ivdep removed as it produces wrong results with OPenMP

Revision 935 - (view) (annotate) - [select for diffs]
Added Tue Jan 23 09:53:10 2007 UTC (12 years, 2 months ago) by gross
File length: 12955 byte(s)
a missing file

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