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

*** empty log message ***

parent 47fa3e28
No related branches found
No related tags found
No related merge requests found
// $Id: Field.cpp,v 1.18 2008-03-18 11:41:08 remacle Exp $ // $Id: Field.cpp,v 1.19 2008-03-18 14:43:53 remacle Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -192,6 +192,7 @@ class StructuredField : public Field{ ...@@ -192,6 +192,7 @@ class StructuredField : public Field{
public : public :
StructuredField(){ StructuredField(){
options["FileName"]=new FieldOptionString(file_name,&update_needed); options["FileName"]=new FieldOptionString(file_name,&update_needed);
data=NULL;
} }
const char *get_name(){ const char *get_name(){
return "Structured"; return "Structured";
......
// $Id: meshGEdge.cpp,v 1.55 2008-02-17 08:48:01 geuzaine Exp $ // $Id: meshGEdge.cpp,v 1.56 2008-03-18 14:43:53 remacle Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "Message.h" #include "Message.h"
#include "List.h" #include "List.h"
#include "Context.h" #include "Context.h"
#include "GModel.h"
extern Context_T CTX; extern Context_T CTX;
...@@ -298,7 +299,9 @@ void meshGEdge::operator() (GEdge *ge) ...@@ -298,7 +299,9 @@ void meshGEdge::operator() (GEdge *ge)
double t_end = bounds.high(); double t_end = bounds.high();
// first compute the length of the curve by integrating one // first compute the length of the curve by integrating one
double length = Integration(ge, t_begin, t_end, F_One, Points, 1.e-8); SPoint3 p1=ge->model()->bounds().min();
SPoint3 p2=ge->model()->bounds().max();
double length = Integration(ge, t_begin, t_end, F_One, Points, 1.e-8*p1.distance(p2));
ge->setLength(length); ge->setLength(length);
// Send a messsage to the GMSH environment // Send a messsage to the GMSH environment
......
...@@ -12,25 +12,6 @@ Field[3].LcMax = 300e3; ...@@ -12,25 +12,6 @@ Field[3].LcMax = 300e3;
Field[3].DistMax = 1000e3; Field[3].DistMax = 1000e3;
Field[3].DistMin = 300e3; Field[3].DistMin = 300e3;
Field[3].IField = 2; Field[3].IField = 2;
Background Field = 3; Field[4]=MathEval;
Background Field = 2; Field[4].F = "100e3";
Background Field = 3; Background Field = 4;
Background Field = 1;
Background Field = 2;
Background Field = 3;
Background Field = 2;
Background Field = 2;
Background Field = 2;
Background Field = 2;
Background Field = 3;
Background Field = 2;
Background Field = -1;
Background Field = 3;
Background Field = 1;
Background Field = 2;
Background Field = 3;
Background Field = 2;
Background Field = 1;
Background Field = 2;
Background Field = -1;
Background Field = 3;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment