/[escript]/trunk/escript/src/blocktimer.c
ViewVC logotype

Log of /trunk/escript/src/blocktimer.c

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1887 - (view) (annotate) - [select for diffs]
Modified Wed Oct 15 03:26:25 2008 UTC (11 years, 1 month ago) by ksteube
File length: 4409 byte(s)
Diff to previous 1811
Fixed two typos that stopped the test suite from running.

Also, gcc 4.3.2 issued several warnings not seen before:
ignoring the return value of fscanf and using the wrong format
with printf.


Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (11 years, 2 months ago) by ksteube
File length: 4411 byte(s)
Diff to previous 1662
Copyright updated in all files


Revision 1662 - (view) (annotate) - [select for diffs]
Modified Tue Jul 22 01:49:21 2008 UTC (11 years, 4 months ago) by ksteube
File length: 4078 byte(s)
Diff to previous 1644
Ran a simple Escript program on Mac OS Darwin. Still much to do.


Revision 1644 - (view) (annotate) - [select for diffs]
Modified Tue Jul 15 05:25:32 2008 UTC (11 years, 4 months ago) by phornby
File length: 4078 byte(s)
Diff to previous 1637
tmp_str was unused var on windows.

Revision 1637 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 05:34:59 2008 UTC (11 years, 4 months ago) by ksteube
File length: 4078 byte(s)
Diff to previous 1634
Resolved some compiler warnings
Changed blocktimer to not use strdup, intead malloc and strcpy


Revision 1634 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 09:08:33 2008 UTC (11 years, 5 months ago) by phornby
File length: 3933 byte(s)
Diff to previous 1628
linux_gcc_eg_options.py:
remove the std99 option, it is no longer needed as the code compiles without
C 1999 extension (need for these extensions elinminated in windows port).
Turn on all warnings except unknown pragmas. Should catch a lot of stuff.

SConstruct:
Impassioned plea

system_dep.h:
Add the standard incantation for dealing with const declarations
in C code called from C and C++

blocktimer:
Get the calling interface right for C code called from C and C++
and use __const as defined in system_dep.h
(Should be re-factored into compiler_dep.h file).

MeshAdapterFactory.cpp:
Since we have (effectively) no control over netCDF policy,
cast const char *'s to char *'s



Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 5 months ago) by phornby
File length: 3917 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, 11 months ago) by trankine
File length: 3877 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, 11 months ago) by trankine
Original Path: temp/escript/src/blocktimer.c
File length: 3877 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, 11 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/blocktimer.c
File length: 3877 byte(s)
Diff to previous 1347
Make a temp copy of the trunk before checking in the windows changes



Revision 1347 - (view) (annotate) - [select for diffs]
Modified Fri Nov 16 05:37:07 2007 UTC (12 years ago) by ksteube
File length: 3877 byte(s)
Diff to previous 1314
Completed mesh.dump(file) and mesh=LoadMesh(file) by adding TagMap and
implementing MPI parallelism.
Now allocating ElementFile for ContactElements even if there are none.
Removed file Mesh_dump.c since dump/loadMesh are in CPPAdapter/MeshAdapter*.cpp.


Revision 1314 - (view) (annotate) - [select for diffs]
Added Tue Sep 25 01:46:27 2007 UTC (12 years, 2 months ago) by ksteube
File length: 3883 byte(s)
Copied a couple more files from MPI branch to trunk


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