/[escript]/trunk/paso/src/SparseMatrix_addRow.c
ViewVC logotype

Annotation of /trunk/paso/src/SparseMatrix_addRow.c

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 7 months ago) by phornby
File MIME type: text/plain
File size: 1385 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 ksteube 1315
2 gross 1363 /* $Id:$ */
3 ksteube 1315
4     /*******************************************************
5     *
6     * Copyright 2007 by University of Queensland
7     *
8     * http://esscc.uq.edu.au
9     * Primary Business: Queensland, Australia
10     * Licensed under the Open Software License version 3.0
11     * http://www.opensource.org/licenses/osl-3.0.php
12     *
13     *******************************************************/
14    
15     /***************************************************************************/
16    
17 gross 1363 /* Paso: SparseMatrix: adds the row entries to an array */
18 ksteube 1315
19     /***************************************************************************/
20    
21 gross 1363 /* Author: l.gross@uq.edu.au */
22 ksteube 1315
23     /**************************************************************/
24    
25     #include "Paso.h"
26     #include "SparseMatrix.h"
27    
28 gross 1363 void Paso_SparseMatrix_addRow_CSR_OFFSET0(Paso_SparseMatrix* A, double* array) {
29 phornby 1628 dim_t ir,irow,icb,irb;
30 ksteube 1315 index_t iptr;
31     register double fac;
32     #pragma omp parallel for private(ir,irb,irow,fac,iptr,icb) schedule(static)
33     for (ir=0;ir< A->pattern->numOutput;ir++) {
34     for (irb=0;irb< A->row_block_size;irb++) {
35     irow=irb+A->row_block_size*ir;
36     fac=0.;
37     for (iptr=A->pattern->ptr[ir];iptr<A->pattern->ptr[ir+1]; iptr++) {
38     for (icb=0;icb< A->col_block_size;icb++)
39 gross 1363 fac+=A->val[iptr*A->block_size+irb+A->row_block_size*icb];
40 ksteube 1315 }
41     array[irow]+=fac;
42     }
43     }
44     }

  ViewVC Help
Powered by ViewVC 1.1.26