Skip to content
Snippets Groups Projects
Commit bf2cdc51 authored by Jean-François Remacle's avatar Jean-François Remacle
Browse files

*** empty log message ***

parent 045a1c6b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 313 additions and 58 deletions
DataStr/Tree.cpp
+ 1
− 8
View file @ bf2cdc51
// $Id: Tree.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $ // $Id: Tree.cpp,v 1.8 2001-10-31 16:33:46 remacle Exp $
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -167,13 +167,6 @@ int Tree_Right(Tree_T *tree, void *data) ...@@ -167,13 +167,6 @@ int Tree_Right(Tree_T *tree, void *data)
return (1); return (1);
} }
void Tree_Action(Tree_T *tree, void (*action) (void *data, void *dummy))
{
if(!tree) return;
avl_foreach(tree->root, action, AVL_FORWARD);
}
int Tree_Size(Tree_T *tree) { int Tree_Size(Tree_T *tree) {
if(!tree) return 0; if(!tree) return 0;
......
DataStr/Tree.h
+ 8
− 1
View file @ bf2cdc51
...@@ -21,8 +21,15 @@ void *Tree_PQuery(Tree_T *Tree, void *data); ...@@ -21,8 +21,15 @@ void *Tree_PQuery(Tree_T *Tree, void *data);
int Tree_Suppress(Tree_T *Tree, void *data); int Tree_Suppress(Tree_T *Tree, void *data);
int Tree_Left(Tree_T *tree, void *data); int Tree_Left(Tree_T *tree, void *data);
int Tree_Right(Tree_T *tree, void *data); int Tree_Right(Tree_T *tree, void *data);
void Tree_Action(Tree_T *tree, void (*action) (void *data, void *dummy));
int Tree_Size(Tree_T *tree) ; int Tree_Size(Tree_T *tree) ;
inline void Tree_Action(Tree_T *tree, void (*action) (void *data, void *dummy))
{
if(!tree) return;
avl_foreach(tree->root, action, AVL_FORWARD);
}
#endif #endif
DataStr/avl.cpp
+ 1
− 30
View file @ bf2cdc51
// $Id: avl.cpp,v 1.5 2001-01-08 08:05:41 geuzaine Exp $ // $Id: avl.cpp,v 1.6 2001-10-31 16:33:46 remacle Exp $
/* /*
* This is a modified version for Gmsh (for c++, 64-bit architectures, etc.) * This is a modified version for Gmsh (for c++, 64-bit architectures, etc.)
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "Malloc.h" #include "Malloc.h"
#define ALLOC(type, number) (type *) Malloc((unsigned) sizeof(type) * number) #define ALLOC(type, number) (type *) Malloc((unsigned) sizeof(type) * number)
#define NIL(type) (type *) 0
#define FREE(item) (void) Free(item) #define FREE(item) (void) Free(item)
#define XRNMAX(a,b) ((a) > (b) ? (a) : (b)) #define XRNMAX(a,b) ((a) > (b) ? (a) : (b))
#define HEIGHT(node) (node == NIL(avl_node) ? -1 : (node)->height) #define HEIGHT(node) (node == NIL(avl_node) ? -1 : (node)->height)
...@@ -57,8 +56,6 @@ static avl_node *find_rightmost(avl_node **node_p); ...@@ -57,8 +56,6 @@ static avl_node *find_rightmost(avl_node **node_p);
static void do_rebalance(avl_node ***stack_nodep, int stack_n); static void do_rebalance(avl_node ***stack_nodep, int stack_n);
static void rotate_left(avl_node **node_p); static void rotate_left(avl_node **node_p);
static void rotate_right(avl_node **node_p); static void rotate_right(avl_node **node_p);
static void avl_walk_forward(avl_node *node, void (*func)(void *key, void *value));
static void avl_walk_backward(avl_node *node, void (*func)(void *key, void *value));
static void free_entry(avl_node *node, void (*key_free)(void *key), static void free_entry(avl_node *node, void (*key_free)(void *key),
void (*value_free)(void *value)); void (*value_free)(void *value));
static avl_node *new_node(void *key, void *value); static avl_node *new_node(void *key, void *value);
...@@ -307,32 +304,6 @@ static void rotate_right(avl_node **node_p) ...@@ -307,32 +304,6 @@ static void rotate_right(avl_node **node_p)
compute_height(new_root); compute_height(new_root);
} }
static void avl_walk_forward(avl_node *node, void (*func)(void *key, void *value))
{
if (node != NIL(avl_node)) {
avl_walk_forward(node->left, func);
(*func)(node->key, node->value);
avl_walk_forward(node->right, func);
}
}
static void avl_walk_backward(avl_node *node, void (*func)(void *key, void *value))
{
if (node != NIL(avl_node)) {
avl_walk_backward(node->right, func);
(*func)(node->key, node->value);
avl_walk_backward(node->left, func);
}
}
void avl_foreach(avl_tree *tree, void (*func)(void *key, void *value), int direction)
{
if (direction == AVL_FORWARD) {
avl_walk_forward(tree->root, func);
} else {
avl_walk_backward(tree->root, func);
}
}
int avl_extremum(avl_tree *tree, int side, void **value_p) int avl_extremum(avl_tree *tree, int side, void **value_p)
{ {
......
DataStr/avl.h
+ 28
− 1
View file @ bf2cdc51
...@@ -59,17 +59,44 @@ struct avl_generator_struct { ...@@ -59,17 +59,44 @@ struct avl_generator_struct {
#define AVL_MOST_RIGHT 1 #define AVL_MOST_RIGHT 1
#define avl_is_member(tree, key) avl_lookup(tree, key, (void **) 0) #define avl_is_member(tree, key) avl_lookup(tree, key, (void **) 0)
#define NIL(type) (type *) 0
#define avl_foreach_item(table, gen, dir, key_p, value_p) \ #define avl_foreach_item(table, gen, dir, key_p, value_p) \
for(gen = avl_init_gen(table, dir); \ for(gen = avl_init_gen(table, dir); \
avl_gen(gen, key_p, value_p) || (avl_free_gen(gen),0);) avl_gen(gen, key_p, value_p) || (avl_free_gen(gen),0);)
inline void avl_walk_forward(avl_node *node, void (*func)(void *key, void *value))
{
if (node != NIL(avl_node)) {
avl_walk_forward(node->left, func);
(*func)(node->key, node->value);
avl_walk_forward(node->right, func);
}
}
inline void avl_walk_backward(avl_node *node, void (*func)(void *key, void *value))
{
if (node != NIL(avl_node)) {
avl_walk_backward(node->right, func);
(*func)(node->key, node->value);
avl_walk_backward(node->left, func);
}
}
inline void avl_foreach(avl_tree *tree, void (*func)(void *key, void *value), int direction)
{
if (direction == AVL_FORWARD) {
avl_walk_forward(tree->root, func);
} else {
avl_walk_backward(tree->root, func);
}
}
avl_tree *avl_init_table(int (*compar)(const void *key1, const void *key2)); avl_tree *avl_init_table(int (*compar)(const void *key1, const void *key2));
int avl_lookup(avl_tree *tree, void *key, void **value_p); int avl_lookup(avl_tree *tree, void *key, void **value_p);
int avl_insert(avl_tree *tree, void *key, void *value); int avl_insert(avl_tree *tree, void *key, void *value);
int avl_delete(avl_tree *tree, void **key_p, void **value_p); int avl_delete(avl_tree *tree, void **key_p, void **value_p);
void avl_foreach(avl_tree *tree, void (*func)(void *key, void *value), int direction);
void avl_free_table(avl_tree *tree, void (*key_free)(void *key), void (*value_free)(void *value)); void avl_free_table(avl_tree *tree, void (*key_free)(void *key), void (*value_free)(void *value));
int avl_count(avl_tree *tree); int avl_count(avl_tree *tree);
int avl_check_tree(avl_tree *tree); int avl_check_tree(avl_tree *tree);
......
Fltk/Socket.cpp
+ 3
− 2
View file @ bf2cdc51
/* $Id: Socket.cpp,v 1.12 2001-08-26 12:12:18 geuzaine Exp $ */ /* $Id: Socket.cpp,v 1.13 2001-10-31 16:33:46 remacle Exp $ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -147,7 +147,8 @@ int Socket_StartProgram(char *progname, char *sockname){ ...@@ -147,7 +147,8 @@ int Socket_StartProgram(char *progname, char *sockname){
} }
len = sizeof(from); len = sizeof(from);
if ( (sock = accept(s, (struct sockaddr *)&from, &len)) < 0) { socklen_t slen = len;
if ( (sock = accept(s, (struct sockaddr *)&from, &slen)) < 0) {
Msg(GERROR, "Socket accept failed"); Msg(GERROR, "Socket accept failed");
return -1; return -1;
} }
......
Mesh/3D_Mesh.cpp
+ 81
− 10
View file @ bf2cdc51
// $Id: 3D_Mesh.cpp,v 1.31 2001-10-29 08:52:20 geuzaine Exp $ // $Id: 3D_Mesh.cpp,v 1.32 2001-10-31 16:33:46 remacle Exp $
/* /*
...@@ -16,12 +16,15 @@ ...@@ -16,12 +16,15 @@
*/ */
#include <time.h>
#include <vector>
#include "Gmsh.h" #include "Gmsh.h"
#include "Numeric.h" #include "Numeric.h"
#include "Mesh.h" #include "Mesh.h"
#include "3D_Mesh.h" #include "3D_Mesh.h"
#include "Create.h" #include "Create.h"
#include "Context.h" #include "Context.h"
#include "mGeomSearch.h"
extern Mesh *THEM, *LOCAL; extern Mesh *THEM, *LOCAL;
extern Context_T CTX; extern Context_T CTX;
...@@ -39,6 +42,7 @@ static int ZONEELIMINEE, Methode = 0; ...@@ -39,6 +42,7 @@ static int ZONEELIMINEE, Methode = 0;
Simplex MyNewBoundary; Simplex MyNewBoundary;
int Alerte_Point_Scabreux; int Alerte_Point_Scabreux;
void DebugSimplexe (Simplex * s){ void DebugSimplexe (Simplex * s){
int i; int i;
...@@ -146,7 +150,7 @@ int Pt_In_Volume (double X, double Y, double Z, Mesh * m, ...@@ -146,7 +150,7 @@ int Pt_In_Volume (double X, double Y, double Z, Mesh * m,
return (0); return (0);
} }
int Pt_In_Circum (Simplex * s, Vertex * v){ inline int Pt_In_Circum (Simplex * s, Vertex * v){
double d1, d2, eps; double d1, d2, eps;
/* Determine si un point est dans le cercle circonscrit a un simplexe */ /* Determine si un point est dans le cercle circonscrit a un simplexe */
...@@ -168,6 +172,35 @@ int Pt_In_Circum (Simplex * s, Vertex * v){ ...@@ -168,6 +172,35 @@ int Pt_In_Circum (Simplex * s, Vertex * v){
return (0); return (0);
} }
struct SimplexInteriorCheck
{
bool operator() ( Simplex * s , double x[3], double u[3])
{
Vertex v(x[0],x[1],x[2]);
return Pt_In_Circum (s, &v);
}
};
struct SimplexInBox
{
double sizeBox;
SimplexInBox(double sb) : sizeBox(sb) {}
bool operator() ( Simplex * s , double min[3], double max[3])
{
double ss;
if(sizeBox > s->Radius) ss = s->Radius;
else ss = sizeBox;
min[0] = s->Center.X - ss;
max[0] = s->Center.X + ss;
min[1] = s->Center.Y - ss;
max[1] = s->Center.Y + ss;
min[2] = s->Center.Z - ss;
max[2] = s->Center.Z + ss;
}
};
AOMD::mGeomSearch < Simplex, SimplexInBox, SimplexInteriorCheck > *fastSearch = 0;
void Action_First_Simplexes (void *a, void *b){ void Action_First_Simplexes (void *a, void *b){
Simplex **q; Simplex **q;
...@@ -467,6 +500,8 @@ int recur_bowyer (Simplex * s){ ...@@ -467,6 +500,8 @@ int recur_bowyer (Simplex * s){
return 1; return 1;
} }
bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){
int i; int i;
Simplex *s; Simplex *s;
...@@ -536,7 +571,10 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){ ...@@ -536,7 +571,10 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){
else{ else{
Tree_Add (m->Vertices, &THEV); Tree_Add (m->Vertices, &THEV);
for (i = 0; i < List_Nbr (Simplexes_New); i++){ for (i = 0; i < List_Nbr (Simplexes_New); i++){
Tree_Add (m->Simplexes, List_Pointer (Simplexes_New, i)); Simplex *theNewS;
List_Read (Simplexes_New, i, &theNewS);
Tree_Add (m->Simplexes, &theNewS);
if(fastSearch)fastSearch->AddObject(theNewS);
} }
/* Suppression des simplexes elimines */ /* Suppression des simplexes elimines */
...@@ -545,6 +583,7 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){ ...@@ -545,6 +583,7 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){
List_Read (Simplexes_Destroyed, i, &s); List_Read (Simplexes_Destroyed, i, &s);
if (!Tree_Suppress (m->Simplexes, &s)) if (!Tree_Suppress (m->Simplexes, &s))
Msg(GERROR, "Impossible to delete simplex"); Msg(GERROR, "Impossible to delete simplex");
if(fastSearch)fastSearch->RemoveObject(s);
Free_Simplex (&s,0); Free_Simplex (&s,0);
} }
...@@ -562,22 +601,50 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){ ...@@ -562,22 +601,50 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){
void Convex_Hull_Mesh (List_T * Points, Mesh * m){ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
int i, j, N, n; int i, j, N, n;
int Nbr_OK = 0, Nbr_NOTOK = 0; int Nbr_OK = 0, Nbr_NOTOK = 0;
double xxx[3],uuu[3];
N = List_Nbr (Points); N = List_Nbr (Points);
n = IMAX (N / 20, 1); n = IMAX (N / 20, 1);
clock_t t1 = clock();
Box_6_Tetraedron (Points, m); Box_6_Tetraedron (Points, m);
// List_Sort (Points, comparePosition); // List_Sort (Points, comparePosition);
SimplexInteriorCheck ick;
SimplexInBox ibx (LC3D/30.);
fastSearch = new AOMD::mGeomSearch < Simplex, SimplexInBox, SimplexInteriorCheck >
( m->Grid.min.X,m->Grid.max.X,
m->Grid.min.Y,m->Grid.max.Y,
m->Grid.min.Z,m->Grid.max.Z,
ibx,ick, 30,30,30);
int nbEasy = 0, nbFast = 0;
for (i = 0; i < N; i++){ for (i = 0; i < N; i++){
THES = NULL; THES = NULL;
List_Read (Points, i, &THEV); List_Read (Points, i, &THEV);
xxx[0]= THEV->Pos.X;
xxx[1]= THEV->Pos.Y;
xxx[2]= THEV->Pos.Z;
if(fastSearch) THES = fastSearch->find(xxx,uuu);
if(!THES)
{
if (Simplexes_New) if (Simplexes_New)
for (j = 0; j < List_Nbr (Simplexes_New); j++){ for (j = 0; j < List_Nbr (Simplexes_New); j++){
Action_First_Simplexes (List_Pointer (Simplexes_New, j), NULL); Action_First_Simplexes (List_Pointer (Simplexes_New, j), NULL);
if(THES)
{
nbEasy++;
break;
}
}
}
else
{
nbFast++;
} }
if (!THES){ if (!THES){
Tree_Action (m->Simplexes, Action_First_Simplexes); Tree_Action (m->Simplexes, Action_First_Simplexes);
Nbr_OK++; Nbr_OK++;
...@@ -589,7 +656,7 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){ ...@@ -589,7 +656,7 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
volume = 0.0; volume = 0.0;
Tree_Action (m->Simplexes, VSIM); Tree_Action (m->Simplexes, VSIM);
Msg(STATUS3, "Nod=%d/%d Elm=%d", i+1,N,Tree_Nbr(m->Simplexes)); Msg(STATUS3, "Nod=%d/%d Elm=%d", i+1,N,Tree_Nbr(m->Simplexes));
Msg(STATUS1, "Vol=%g",volume); Msg(STATUS1, "Vol=%g (%d %d %d)",volume,nbFast,nbEasy,i-nbFast-nbEasy);
} }
if (!THES){ if (!THES){
Msg(WARNING, "Vertex (%g,%g,%g) in no simplex", THEV->Pos.X,THEV->Pos.Y,THEV->Pos.Z); Msg(WARNING, "Vertex (%g,%g,%g) in no simplex", THEV->Pos.X,THEV->Pos.Y,THEV->Pos.Z);
...@@ -622,6 +689,10 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){ ...@@ -622,6 +689,10 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
} }
} }
} }
clock_t t2 = clock();
if(fastSearch)delete fastSearch;
printf("nbEasy = %d nbFast = %d N = %d t = %lf\n",nbEasy,nbFast,N,(double)(t2-t1)/CLOCKS_PER_SEC);
} }
void suppress_vertex (void *data, void *dum){ void suppress_vertex (void *data, void *dum){
......
Mesh/mGeomSearch.h 0 → 100644
+ 184
− 0
View file @ bf2cdc51
#ifndef _MGEOM_SEARCH_H
#define _MGEOM_SEARCH_H
#include <vector>
#include <algorithm>
#define MIN(x,y) ((x<y)?(x):(y))
#define MAX(x,y) ((x>y)?(x):(y))
#define TOL 1.e-06
namespace AOMD {
template <class T>
class Brick
{
public:
std::vector<T*> Objects;
Brick(){}
T* operator [] (int i)
{
if(i < 0 || i >= Objects.size())throw i;
T *obj = Objects[i];
return obj;
}
int size(){return Objects.size();}
};
template <class T, class GetBox, class InteriorCheck>
class mGeomSearch
{
Brick<T> *theTable;
int Nx,Ny,Nz;
double Xmin,Xmax,Ymin,Ymax,Zmin,Zmax;
int getBrickId (double X, double Y, double Z)
{
int Ix = (int)((double)Nx * (X-Xmin) / (Xmax-Xmin));
int Iy = (int)((double)Ny * (Y-Ymin) / (Ymax-Ymin));
int Iz = (int)((double)Nz * (Z-Zmin) / (Zmax-Zmin));
Ix = MIN(Ix,Nx-1);
Iy = MIN(Iy,Ny-1);
Iz = MIN(Iz,Nz-1);
if(Ix<0)Ix=0;
if(Iy<0)Iy=0;
if(Iz<0)Iz=0;
int index = Ix + Iy * Nx + Iz * Nx * Ny;
return index;
}
Brick<T> * getBrick (int index)
{
if(index <0 || index >= Nx*Ny*Nz)throw index;
Brick<T> *b = &(theTable[index]);
return b;
}
GetBox getBox;
InteriorCheck interiorCheck;
public:
mGeomSearch (double x1,
double x2,
double y1,
double y2,
double z1,
double z2,
GetBox g,
InteriorCheck i,
int nx = 10,
int ny = 10,
int nz = 10) : Nx(nx), Ny(ny), Nz(nz),getBox(g),interiorCheck(i)
{
Xmin = x1-TOL; Xmax = x2+TOL;
Ymin = y1-TOL; Ymax = y2+TOL;
Zmin = z1-TOL; Zmax = z2+TOL;
theTable = new Brick<T> [Nx*Ny*Nz];
}
~mGeomSearch ()
{
delete [] theTable;
};
Brick<T> *getBrick(double X, double Y, double Z)
{
return (getBrick(getBrickId(X,Y,Z)));
}
T * find (double X[3] , double U[3]);
bool AddObject ( T *);
bool RemoveObject ( T *);
};
template <class T,class GetBox, class InteriorCheck>
T * mGeomSearch<T,GetBox,InteriorCheck> :: find ( double X[3] ,
double U[3] )
{
Brick<T> *b = getBrick (X[0],X[1],X[2]);
if(!b) return 0;
for(int i=0;i<b->size();i++)
{
T * obj = (*b)[i];
if(interiorCheck(obj,X,U))return obj;
}
return 0;
}
template <class T,class GetBox, class InteriorCheck>
bool mGeomSearch<T,GetBox, InteriorCheck> :: AddObject ( T * obj )
{
int Ix1,Ix2,Iy1,Iy2,Iz1,Iz2;
int i,j,k,index;
Brick<T> *pBrick;
/*Template Objects must overload getBox function*/
double min[3];
double max[3];
getBox(obj,min,max);
Ix1 = (int)( (double)Nx * (min[0] - Xmin) /( Xmax - Xmin ));
Ix2 = (int)( (double)Nx * (max[0] - Xmin) /( Xmax - Xmin ));
Iy1 = (int)( (double)Ny * (min[1] - Ymin) /( Ymax - Ymin ));
Iy2 = (int)( (double)Ny * (max[1] - Ymin) /( Ymax - Ymin ));
Iz1 = (int)( (double)Nz * (min[2] - Zmin) /( Zmax - Zmin ));
Iz2 = (int)( (double)Nz * (max[2] - Zmin) /( Zmax - Zmin ));
Ix1 = MAX(Ix1,0);
Ix2 = MIN(Ix2,Nx-1);
Iy1 = MAX(Iy1,0);
Iy2 = MIN(Iy2,Ny-1);
Iz1 = MAX(Iz1,0);
Iz2 = MIN(Iz2,Nz-1);
for(i=Ix1;i<=Ix2;i++){
for(j=Iy1;j<=Iy2;j++){
for(k=Iz1;k<=Iz2;k++){
index = i + j * Nx + k * Nx * Ny;
pBrick = getBrick(index);
pBrick->Objects.push_back(obj);
}
}
}
return true;
}
template <class T,class GetBox, class InteriorCheck>
bool mGeomSearch<T,GetBox, InteriorCheck> :: RemoveObject ( T * obj )
{
int Ix1,Ix2,Iy1,Iy2,Iz1,Iz2;
int i,j,k,index;
Brick<T> *pBrick;
/*Template Objects must overload getBox function*/
double min[3];
double max[3];
getBox(obj,min,max);
Ix1 = (int)( (double)Nx * (min[0] - Xmin) /( Xmax - Xmin ));
Ix2 = (int)( (double)Nx * (max[0] - Xmin) /( Xmax - Xmin ));
Iy1 = (int)( (double)Ny * (min[1] - Ymin) /( Ymax - Ymin ));
Iy2 = (int)( (double)Ny * (max[1] - Ymin) /( Ymax - Ymin ));
Iz1 = (int)( (double)Nz * (min[2] - Zmin) /( Zmax - Zmin ));
Iz2 = (int)( (double)Nz * (max[2] - Zmin) /( Zmax - Zmin ));
Ix1 = MAX(Ix1,0);
Ix2 = MIN(Ix2,Nx-1);
Iy1 = MAX(Iy1,0);
Iy2 = MIN(Iy2,Ny-1);
Iz1 = MAX(Iz1,0);
Iz2 = MIN(Iz2,Nz-1);
for(i=Ix1;i<=Ix2;i++){
for(j=Iy1;j<=Iy2;j++){
for(k=Iz1;k<=Iz2;k++){
index = i + j * Nx + k * Nx * Ny;
pBrick = getBrick(index);
pBrick->Objects.erase ( std::remove (pBrick->Objects.begin(),pBrick->Objects.end(),obj) ,
pBrick->Objects.end () );
}
}
}
return true;
}
} // end of namespace
#undef TOL
#endif
Plugin/Makefile
+ 2
− 2
View file @ bf2cdc51
# $Id: Makefile,v 1.20 2001-10-30 09:52:40 geuzaine Exp $ # $Id: Makefile,v 1.21 2001-10-31 16:33:46 remacle Exp $
# #
# Makefile for "libAdapt.a" # Makefile for "libAdapt.a"
# #
...@@ -18,7 +18,7 @@ OS_FLAGS = ...@@ -18,7 +18,7 @@ OS_FLAGS =
VERSION_FLAGS = VERSION_FLAGS =
RMFLAGS = -f RMFLAGS = -f
CFLAGS = $(OPT_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE) $(GUI_INCLUDE) CFLAGS = -DMPICH_SKIP_MPICXX $(C_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE) $(GUI_INCLUDE)
SRC = Plugin.cpp\ SRC = Plugin.cpp\
LevelsetPlugin.cpp\ LevelsetPlugin.cpp\
......
Plugin/Plugin.cpp
+ 2
− 1
View file @ bf2cdc51
// $Id: Plugin.cpp,v 1.21 2001-10-25 07:22:46 geuzaine Exp $ // $Id: Plugin.cpp,v 1.22 2001-10-31 16:33:46 remacle Exp $
#include <map>
#ifndef _NODLL #ifndef _NODLL
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
......
Triangle/Makefile
+ 2
− 2
View file @ bf2cdc51
# $Id: Makefile,v 1.3 2001-08-20 08:25:24 geuzaine Exp $ # $Id: Makefile,v 1.4 2001-10-31 16:33:46 remacle Exp $
# #
# Makefile for "libTriangle.a" # Makefile for "libTriangle.a"
# #
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.IGNORE: .IGNORE:
CC = cc CC = gcc
AR = ar ruvs AR = ar ruvs
RM = rm RM = rm
RANLIB = ranlib RANLIB = ranlib
......
benchmarks/3d/magnetron/magnetron1-full.geo
+ 1
− 1
View file @ bf2cdc51
mm = 0.001 ; // 1 milimetre = 0.001 metre mm = 0.001 ; // 1 milimetre = 0.001 metre
lc = 2.1*mm ; // unite de base min pour la taille caracteristique du maillage lc = 0.75*mm ; // unite de base min pour la taille caracteristique du maillage
lcpba2 = 1.5*lc ; // lc dessous plaque base lcpba2 = 1.5*lc ; // lc dessous plaque base
lcpba1 = lc ; // lc dessus plaque base lcpba1 = lc ; // lc dessus plaque base
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment