From 1dfa64d7af7d667b7ec80c33e7c63da426a2d435 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 15 Sep 2009 14:32:21 +0000
Subject: [PATCH] tweaks from ruth for solver/windows interface
---
Common/DefaultOptions.h | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 32b49d19c1..cadc1fb5c3 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -120,11 +120,11 @@ StringXString SolverOptions_String[] = {
"getdp" ,
#endif
"System command to launch solver 0 (should not contain the `&' character)" },
- { F|O, "InputName0" , opt_solver_input_name0 , "" ,
+ { F, "InputName0" , opt_solver_input_name0 , "" ,
"Default input file name for solver 0" },
{ F|O, "Extension0" , opt_solver_extension0 , ".pro" ,
"Default file name extension for solver 0" },
- { F|O, "MeshName0" , opt_solver_mesh_name0 , "" ,
+ { F, "MeshName0" , opt_solver_mesh_name0 , "" ,
"Default mesh file name for solver 0" },
{ F|O, "MeshCommand0" , opt_solver_mesh_command0 , "-msh %s" ,
"Command used to specify the mesh file for solver 0" },
@@ -171,11 +171,11 @@ StringXString SolverOptions_String[] = {
"Help string for solver 1" },
{ F|O, "Executable1" , opt_solver_executable1 , "" ,
"System command to launch solver 1 (should not contain the `&' character)" },
- { F|O, "InputName1" , opt_solver_input_name1 , "" ,
+ { F, "InputName1" , opt_solver_input_name1 , "" ,
"Default input file name for solver 1" },
{ F|O, "Extension1" , opt_solver_extension1 , "" ,
"Default file name extension for solver 1" },
- { F|O, "MeshName1" , opt_solver_mesh_name1 , "" ,
+ { F, "MeshName1" , opt_solver_mesh_name1 , "" ,
"Default mesh file name for solver 1" },
{ F|O, "MeshCommand1" , opt_solver_mesh_command1 , "" ,
"Command used to specify the mesh file for solver 1" },
@@ -222,11 +222,11 @@ StringXString SolverOptions_String[] = {
"Help string for solver 2" },
{ F|O, "Executable2" , opt_solver_executable2 , "" ,
"System command to launch solver 2 (should not contain the `&' character)" },
- { F|O, "InputName2" , opt_solver_input_name2 , "" ,
+ { F, "InputName2" , opt_solver_input_name2 , "" ,
"Default input file name for solver 2" },
{ F|O, "Extension2" , opt_solver_extension2 , "" ,
"Default file name extension for solver 2" },
- { F|O, "MeshName2" , opt_solver_mesh_name2 , "" ,
+ { F, "MeshName2" , opt_solver_mesh_name2 , "" ,
"Default mesh file name for solver 2" },
{ F|O, "MeshCommand2" , opt_solver_mesh_command2 , "" ,
"Command used to specify the mesh file for solver 2" },
@@ -273,11 +273,11 @@ StringXString SolverOptions_String[] = {
"Help string for solver 3" },
{ F|O, "Executable3" , opt_solver_executable3 , "" ,
"System command to launch solver 3 (should not contain the `&' character)" },
- { F|O, "InputName3" , opt_solver_input_name3 , "" ,
+ { F, "InputName3" , opt_solver_input_name3 , "" ,
"Default input file name for solver 3" },
{ F|O, "Extension3" , opt_solver_extension3 , "" ,
"Default file name extension for solver 3" },
- { F|O, "MeshName3" , opt_solver_mesh_name3 , "" ,
+ { F, "MeshName3" , opt_solver_mesh_name3 , "" ,
"Default mesh file name for solver 3" },
{ F|O, "MeshCommand3" , opt_solver_mesh_command3 , "" ,
"Command used to specify the mesh file for solver 3" },
@@ -324,11 +324,11 @@ StringXString SolverOptions_String[] = {
"Help string for solver 4" },
{ F|O, "Executable4" , opt_solver_executable4 , "" ,
"System command to launch solver 4 (should not contain the `&' character)" },
- { F|O, "InputName4" , opt_solver_input_name4 , "" ,
+ { F, "InputName4" , opt_solver_input_name4 , "" ,
"Default input file name for solver 4" },
{ F|O, "Extension4" , opt_solver_extension4 , "" ,
"Default file name extension for solver 4" },
- { F|O, "MeshName4" , opt_solver_mesh_name4 , "" ,
+ { F, "MeshName4" , opt_solver_mesh_name4 , "" ,
"Default mesh file name for solver 4" },
{ F|O, "MeshCommand4" , opt_solver_mesh_command4 , "" ,
"Command used to specify the mesh file for solver 4" },
@@ -1255,12 +1255,7 @@ StringXNumber SolverOptions_Number[] = {
{ F|O, "Plugins" , opt_solver_plugins , 0. ,
"Enable default solver plugins?" },
- { F|O, "PopupMessages0" , opt_solver_popup_messages0 ,
-#if defined(WIN32)
- 0. , // we already have the transient DOS window
-#else
- 1. ,
-#endif
+ { F|O, "PopupMessages0" , opt_solver_popup_messages0 , 1. ,
"Automatically display messages produced by solver 0" },
{ F|O, "PopupMessages1" , opt_solver_popup_messages1 , 1. ,
"Automatically display messages produced by solver 1" },
--
GitLab