[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38797] branches/soc-2011-avocado/blender/ intern/autoseam: Cleanup:
Andrea Weikert
elubie at gmx.net
Thu Jul 28 20:51:09 CEST 2011
Revision: 38797
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38797
Author: elubie
Date: 2011-07-28 18:51:09 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
Cleanup:
* remove example from ARPACK
* remove extern function declaration, instead include header where they are declared.
Modified Paths:
--------------
branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp
branches/soc-2011-avocado/blender/intern/autoseam/CMakeLists.txt
branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.cpp
branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.h
Removed Paths:
-------------
branches/soc-2011-avocado/blender/intern/autoseam/dssimp.c
branches/soc-2011-avocado/blender/intern/autoseam/dssimp.h
Modified: branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp 2011-07-28 18:25:23 UTC (rev 38796)
+++ branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp 2011-07-28 18:51:09 UTC (rev 38797)
@@ -33,21 +33,10 @@
#include "MEM_guardedalloc.h"
#include "EigenSolverArpack.h"
-
-#ifdef WITH_ARPACK
-#include "dssimp.h"
-//#include "f2c.h"
-//#include "carpack.h"
-#endif
-
-//define the dimension of each eigen vector
-//static integer c__256 = 256;
-
#define THRESHOLD_ZERO 0.0005
#define EXTRA_MEMORY_SIZE 10
-
AutoseamAdjacency::AutoseamAdjacency(int dimension)
{
m_adjacency = MatrixXd::Zero(dimension, dimension);
@@ -146,9 +135,6 @@
solver.matrix = a;
eigen_vectors = solver.calculate_eigen_space();
-
- //dssimp_();
-
if(a.rows() && a.cols() && eigen_vectors != NULL){
//Eigen::SelfAdjointEigenSolver<MatrixXd> es(a);
Modified: branches/soc-2011-avocado/blender/intern/autoseam/CMakeLists.txt
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/CMakeLists.txt 2011-07-28 18:25:23 UTC (rev 38796)
+++ branches/soc-2011-avocado/blender/intern/autoseam/CMakeLists.txt 2011-07-28 18:51:09 UTC (rev 38797)
@@ -56,13 +56,11 @@
AutoseamAdjacency.cpp
EigenSolver.h
EigenSolver.cpp
- EigenSolverArpack.h
- EigenSolverArpack.cpp
)
set (SRC_AUTOSEAM_ARPACK
- dssimp.c
- dssimp.h
+ EigenSolverArpack.h
+ EigenSolverArpack.cpp
)
if (WITH_ARPACK)
Modified: branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.cpp
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.cpp 2011-07-28 18:25:23 UTC (rev 38796)
+++ branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.cpp 2011-07-28 18:51:09 UTC (rev 38797)
@@ -35,8 +35,8 @@
#define minimum(a,b) (a <= b) ? a : b;
extern "C"{
- extern int dsaupd_(integer *, char *, integer *, char *, integer *, doublereal *, doublereal *, integer *, doublereal *, integer *, integer *, integer *, doublereal *, doublereal *, integer *, integer *, ftnlen, ftnlen);
- extern int dseupd_(logical *, char *, logical *, doublereal *, doublereal *, integer *, doublereal *, char *, integer *, char *, integer *, doublereal *, doublereal *, integer *, doublereal *, integer *, integer *, integer *, doublereal *, doublereal *, integer *, integer *, ftnlen, ftnlen, ftnlen);
+ #include "f2c.h"
+ #include "carpack.h"
}
Modified: branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.h
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.h 2011-07-28 18:25:23 UTC (rev 38796)
+++ branches/soc-2011-avocado/blender/intern/autoseam/EigenSolverArpack.h 2011-07-28 18:51:09 UTC (rev 38797)
@@ -34,10 +34,6 @@
#include <Eigen/Dense>
#include <Eigen/Eigenvalues>
-#ifdef WITH_ARPACK
- #include "dssimp.h"
-#endif
-
class EigenSolverArpack: public EigenSolver{
//member variables
Deleted: branches/soc-2011-avocado/blender/intern/autoseam/dssimp.c
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/dssimp.c 2011-07-28 18:25:23 UTC (rev 38796)
+++ branches/soc-2011-avocado/blender/intern/autoseam/dssimp.c 2011-07-28 18:51:09 UTC (rev 38797)
@@ -1,757 +0,0 @@
-/* dssimp.f -- translated by f2c (version 20100827).
- You must link the resulting object file with libf2c:
- on Microsoft Windows system, link with libf2c.lib;
- on Linux or Unix systems, link with .../path/to/libf2c.a -lm
- or, if you install libf2c.a in a standard place, with -lf2c -lm
- -- in that order, at the end of the command line, as in
- cc *.o -lf2c -lm
- Source for libf2c is in /netlib/f2c/libf2c.zip, e.g.,
-
- http://www.netlib.org/f2c/libf2c.zip
-*/
-
-#include "f2c.h"
-#include "carpack.h"
-
-/* Common Block Declarations */
-
-struct {
- integer logfil, ndigit, mgetv0, msaupd, msaup2, msaitr, mseigt, msapps,
- msgets, mseupd, mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets,
- mneupd, mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd;
-} debug_;
-
-#define debug_1 debug_
-
-/* Table of constant values */
-
-static integer c__9 = 9;
-static integer c__1 = 1;
-static integer c__256 = 256;
-static integer c__3 = 3;
-static integer c__6 = 6;
-static integer c__2 = 2;
-static integer c__25 = 25;
-static integer c_n6 = -6;
-static integer c__5 = 5;
-static doublereal c_b138 = -1.;
-
-/* Main program */ int MAIN__(void)
-{
- /* System generated locals */
- integer i__1;
- doublereal d__1;
-
- /* Builtin functions */
- /* Subroutine */ int s_copy(char *, char *, ftnlen, ftnlen);
- integer s_wsle(cilist *), do_lio(integer *, integer *, char *, ftnlen),
- e_wsle(void);
-
- /* Local variables */
- static doublereal d__[50] /* was [25][2] */;
- static integer j, n;
- static doublereal v[6400] /* was [256][25] */;
- extern /* Subroutine */ int av_(integer *, doublereal *, doublereal *);
- static doublereal ax[256];
- static integer nx, ido, ncv, nev;
- static doublereal tol;
- static char bmat[1];
- static integer info;
- static logical rvec;
- static integer ierr, mode1;
- extern doublereal dnrm2_(integer *, doublereal *, integer *);
- static doublereal sigma;
- static char which[2];
- static doublereal resid[256];
- static integer nconv;
- extern /* Subroutine */ int daxpy_(integer *, doublereal *, doublereal *,
- integer *, doublereal *, integer *);
- static doublereal workd[768];
- extern /* Subroutine */ int dmout_(integer *, integer *, integer *,
- doublereal *, integer *, integer *, char *, ftnlen);
- static integer ipntr[11];
- static doublereal workl[825];
- static integer iparam[11];
- static logical select[25];
- extern /* Subroutine */ int dsaupd_(integer *, char *, integer *, char *,
- integer *, doublereal *, doublereal *, integer *, doublereal *,
- integer *, integer *, integer *, doublereal *, doublereal *,
- integer *, integer *, ftnlen, ftnlen), dseupd_(logical *, char *,
- logical *, doublereal *, doublereal *, integer *, doublereal *,
- char *, integer *, char *, integer *, doublereal *, doublereal *,
- integer *, doublereal *, integer *, integer *, integer *,
- doublereal *, doublereal *, integer *, integer *, ftnlen, ftnlen,
- ftnlen);
- static integer ishfts, maxitr, lworkl;
-
- /* Fortran I/O blocks */
- static cilist io___7 = { 0, 6, 0, 0, 0 };
- static cilist io___8 = { 0, 6, 0, 0, 0 };
- static cilist io___9 = { 0, 6, 0, 0, 0 };
- static cilist io___23 = { 0, 6, 0, 0, 0 };
- static cilist io___24 = { 0, 6, 0, 0, 0 };
- static cilist io___25 = { 0, 6, 0, 0, 0 };
- static cilist io___26 = { 0, 6, 0, 0, 0 };
- static cilist io___32 = { 0, 6, 0, 0, 0 };
- static cilist io___33 = { 0, 6, 0, 0, 0 };
- static cilist io___34 = { 0, 6, 0, 0, 0 };
- static cilist io___35 = { 0, 6, 0, 0, 0 };
- static cilist io___39 = { 0, 6, 0, 0, 0 };
- static cilist io___40 = { 0, 6, 0, 0, 0 };
- static cilist io___41 = { 0, 6, 0, 0, 0 };
- static cilist io___42 = { 0, 6, 0, 0, 0 };
- static cilist io___43 = { 0, 6, 0, 0, 0 };
- static cilist io___44 = { 0, 6, 0, 0, 0 };
- static cilist io___45 = { 0, 6, 0, 0, 0 };
- static cilist io___46 = { 0, 6, 0, 0, 0 };
- static cilist io___47 = { 0, 6, 0, 0, 0 };
- static cilist io___48 = { 0, 6, 0, 0, 0 };
- static cilist io___49 = { 0, 6, 0, 0, 0 };
- static cilist io___50 = { 0, 6, 0, 0, 0 };
- static cilist io___51 = { 0, 6, 0, 0, 0 };
- static cilist io___52 = { 0, 6, 0, 0, 0 };
- static cilist io___53 = { 0, 6, 0, 0, 0 };
- static cilist io___54 = { 0, 6, 0, 0, 0 };
- static cilist io___55 = { 0, 6, 0, 0, 0 };
- static cilist io___56 = { 0, 6, 0, 0, 0 };
- static cilist io___57 = { 0, 6, 0, 0, 0 };
-
-
-
-/* This example program is intended to illustrate the */
-/* simplest case of using ARPACK in considerable detail. */
-/* This code may be used to understand basic usage of ARPACK */
-/* and as a template for creating an interface to ARPACK. */
-
-/* This code shows how to use ARPACK to find a few eigenvalues */
-/* (lambda) and corresponding eigenvectors (x) for the standard */
-/* eigenvalue problem: */
-
-/* A*x = lambda*x */
-
-/* where A is an n by n real symmetric matrix. */
-
-/* The main points illustrated here are */
-
-/* 1) How to declare sufficient memory to find NEV */
-/* eigenvalues of largest magnitude. Other options */
-/* are available. */
-
-/* 2) Illustration of the reverse communication interface */
-/* needed to utilize the top level ARPACK routine DSAUPD */
-/* that computes the quantities needed to construct */
-/* the desired eigenvalues and eigenvectors(if requested). */
-
-/* 3) How to extract the desired eigenvalues and eigenvectors */
-/* using the ARPACK routine DSEUPD. */
-
-/* The only thing that must be supplied in order to use this */
-/* routine on your problem is to change the array dimensions */
-/* appropriately, to specify WHICH eigenvalues you want to compute */
-/* and to supply a matrix-vector product */
-
-/* w <- Av */
-
-/* in place of the call to AV( ) below. */
-
-/* Once usage of this routine is understood, you may wish to explore */
-/* the other available options to improve convergence, to solve generalized */
-/* problems, etc. Look at the file ex-sym.doc in DOCUMENTS directory. */
-/* This codes implements */
-
-/* \Example-1 */
-/* ... Suppose we want to solve A*x = lambda*x in regular mode, */
-/* where A is derived from the central difference discretization */
-/* of the 2-dimensional Laplacian on the unit square with */
-/* zero Dirichlet boundary condition. */
-/* ... OP = A and B = I. */
-/* ... Assume "call av (n,x,y)" computes y = A*x */
-/* ... Use mode 1 of DSAUPD. */
-
-/* \BeginLib */
-
-/* \Routines called: */
-/* dsaupd ARPACK reverse communication interface routine. */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list