From 8dc55d12d65e72863c9dfbb19b528cb7b899a2d9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 12 Sep 2007 04:49:49 +0000
Subject: [PATCH] *** empty log message ***
---
Common/DefaultOptions.h | 4 ++--
Common/Options.cpp | 40 +++++++++++++++++-----------------------
2 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index f35ae61558..046faa7bdf 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -922,9 +922,9 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "ElementOrder" , opt_mesh_order , 1. , // "Order" is a reserved token in the parser
"Element order (1=linear elements, N (<6) = elements of higher order)" },
- { F|O, "C1Continuity" , opt_mesh_c1 , 0. , // "Order" is a reserved token in the parser
+ { F|O, "C1Continuity" , opt_mesh_c1 , 0. ,
"Impose C1 continuity to high order meshes, only valid in 2D plane and ElemenOrder = 2 and 3 (todo) (Default : C0 continuity)" },
- { F|O, "SmoothInternalEdges" , opt_mesh_smooth_internal_edges , 0 , // "Order" is a reserved token in the parser
+ { F|O, "SmoothInternalEdges" , opt_mesh_smooth_internal_edges , 0 ,
"Number of smoothing steps of internal edges for high order meshes" },
{ F|O, "Explode" , opt_mesh_explode , 1.0 ,
"Element shrinking factor (between 0 and 1)" },
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 8f1d240fc4..48f81cc1cd 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.356 2007-09-11 15:28:59 geuzaine Exp $
+// $Id: Options.cpp,v 1.357 2007-09-12 04:49:49 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -355,7 +355,7 @@ void Print_Options(int num, int level, int diff, int help, char *filename)
if(filename) fclose(file);
}
-char * Get_OptionSaveLevel(int level){
+char *Get_OptionSaveLevel(int level){
if(level & GMSH_SESSIONRC){
return "General.SessionFileName";
}
@@ -843,8 +843,8 @@ int Get_ColorForString(StringX4Int SX4I[], int alpha,
opt = &PViewOptions::reference; \
else{ \
if(num < 0 || num >= PView::list.size()){ \
- Msg(WARNING, "View[%d] does not exist", num) ; \
- return (error_val) ; \
+ Msg(WARNING, "View[%d] does not exist", num); \
+ return (error_val); \
} \
view = PView::list[num]; \
data = view->getData(); \
@@ -2046,7 +2046,7 @@ char *opt_view_axes_format2(OPT_ARGS_STR)
return opt->AxesFormat[2];
}
-char * opt_view_gen_raise0(OPT_ARGS_STR)
+char *opt_view_gen_raise0(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2060,7 +2060,7 @@ char * opt_view_gen_raise0(OPT_ARGS_STR)
return opt->GenRaiseX;
}
-char * opt_view_gen_raise1(OPT_ARGS_STR)
+char *opt_view_gen_raise1(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2074,7 +2074,7 @@ char * opt_view_gen_raise1(OPT_ARGS_STR)
return opt->GenRaiseY;
}
-char * opt_view_gen_raise2(OPT_ARGS_STR)
+char *opt_view_gen_raise2(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2119,7 +2119,7 @@ void _string2stipple(char str[32], int &repeat, int &pattern)
}
}
-char * opt_view_stipple0(OPT_ARGS_STR)
+char *opt_view_stipple0(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2130,7 +2130,7 @@ char * opt_view_stipple0(OPT_ARGS_STR)
return opt->StippleString[0];
}
-char * opt_view_stipple1(OPT_ARGS_STR)
+char *opt_view_stipple1(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2141,7 +2141,7 @@ char * opt_view_stipple1(OPT_ARGS_STR)
return opt->StippleString[1];
}
-char * opt_view_stipple2(OPT_ARGS_STR)
+char *opt_view_stipple2(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2152,7 +2152,7 @@ char * opt_view_stipple2(OPT_ARGS_STR)
return opt->StippleString[2];
}
-char * opt_view_stipple3(OPT_ARGS_STR)
+char *opt_view_stipple3(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2163,7 +2163,7 @@ char * opt_view_stipple3(OPT_ARGS_STR)
return opt->StippleString[3];
}
-char * opt_view_stipple4(OPT_ARGS_STR)
+char *opt_view_stipple4(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2174,7 +2174,7 @@ char * opt_view_stipple4(OPT_ARGS_STR)
return opt->StippleString[4];
}
-char * opt_view_stipple5(OPT_ARGS_STR)
+char *opt_view_stipple5(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2185,7 +2185,7 @@ char * opt_view_stipple5(OPT_ARGS_STR)
return opt->StippleString[5];
}
-char * opt_view_stipple6(OPT_ARGS_STR)
+char *opt_view_stipple6(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2196,7 +2196,7 @@ char * opt_view_stipple6(OPT_ARGS_STR)
return opt->StippleString[6];
}
-char * opt_view_stipple7(OPT_ARGS_STR)
+char *opt_view_stipple7(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2207,7 +2207,7 @@ char * opt_view_stipple7(OPT_ARGS_STR)
return opt->StippleString[7];
}
-char * opt_view_stipple8(OPT_ARGS_STR)
+char *opt_view_stipple8(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -2218,7 +2218,7 @@ char * opt_view_stipple8(OPT_ARGS_STR)
return opt->StippleString[8];
}
-char * opt_view_stipple9(OPT_ARGS_STR)
+char *opt_view_stipple9(OPT_ARGS_STR)
{
GET_VIEW("");
if(action & GMSH_SET) {
@@ -4786,10 +4786,6 @@ double opt_mesh_lc_integration_precision(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
CTX.mesh.lc_integration_precision = val;
-#if defined(HAVE_FLTK)
- // if(WID && (action & GMSH_GUI))
- // WID->mesh_value[0]->value(CTX.mesh.nb_smoothing);
-#endif
return CTX.mesh.lc_integration_precision;
}
@@ -5862,7 +5858,6 @@ double opt_view_saturate_values(OPT_ARGS_NUM)
return opt->SaturateValues;
}
-
double opt_view_max_recursion_level(OPT_ARGS_NUM)
{
GET_VIEW(0.);
@@ -5913,7 +5908,6 @@ double opt_view_target_error(OPT_ARGS_NUM)
return l->adaptive->getTolerance();
}
-
double opt_view_type(OPT_ARGS_NUM)
{
GET_VIEW(0.);
--
GitLab