/[escript]/branches/arrexp_2137_win/paso/src/Paso_MPI.h
ViewVC logotype

Contents of /branches/arrexp_2137_win/paso/src/Paso_MPI.h

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (show annotations)
Fri Jul 11 13:12:46 2008 UTC (10 years, 11 months ago) by phornby
Original Path: trunk/paso/src/Paso_MPI.h
File MIME type: text/plain
File size: 1652 byte(s)

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.


1
2 /* $Id$ */
3
4 /*******************************************************
5 *
6 * Copyright 2003-2007 by ACceSS MNRF
7 * Copyright 2007 by University of Queensland
8 *
9 * http://esscc.uq.edu.au
10 * Primary Business: Queensland, Australia
11 * Licensed under the Open Software License version 3.0
12 * http://www.opensource.org/licenses/osl-3.0.php
13 *
14 *******************************************************/
15
16 #ifndef INC_PASO_MPI
17 #define INC_PASO_MPI
18
19 #include "Common.h"
20 #include "Paso.h"
21
22 #ifdef PASO_MPI
23 #include "mpi_C.h"
24 #else
25 typedef int MPI_Comm;
26 typedef int MPI_Request;
27 #define MPI_INT 6
28 #define MPI_DOUBLE 11
29 #define MPI_COMM_WORLD 91
30 #endif
31
32 typedef int Paso_MPI_rank;
33
34 #define PASO_MPI_TODO { fprintf( stdout, "\nTODO : %s:%d\n", __FILE__, __LINE__); MPI_Finalize(); exit(1); }
35
36 /* Datatypes */
37 struct Paso_MPIInfo {
38 dim_t reference_counter;
39 int size;
40 Paso_MPI_rank rank;
41 MPI_Comm comm;
42 int msg_tag_counter;
43 };
44
45 typedef struct Paso_MPIInfo Paso_MPIInfo;
46
47 /* Function prototypes */
48 Paso_MPIInfo* Paso_MPIInfo_alloc( MPI_Comm comm );
49 void Paso_MPIInfo_free( Paso_MPIInfo* );
50 Paso_MPIInfo *Paso_MPIInfo_getReference( Paso_MPIInfo* in );
51 int Paso_MPIInfo_initialized( void );
52 index_t Paso_MPIInfo_mod(index_t n, index_t k);
53 dim_t Paso_MPIInfo_setDistribution(Paso_MPIInfo* in ,index_t min_id,index_t max_id,index_t* distribution);
54 void Paso_MPIInfo_Split( Paso_MPIInfo *mpi_info, dim_t n, dim_t* local_N,index_t* offset);
55 bool_t Paso_MPIInfo_noError( Paso_MPIInfo *mpi_info);
56 char *Paso_MPI_appendRankToFileName(const char *, int, int);
57
58 #endif /* INC_PASO_MPI */

  ViewVC Help
Powered by ViewVC 1.1.26