[cig-commits] commit 1862 by buerg to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Tue Aug 27 08:25:15 PDT 2013
Revision 1862
Make ASPIRE compatible with newest version of deal.II.
U trunk/aspire/source/geometry_model/interface.cc
U trunk/aspire/source/gravity_model/interface.cc
U trunk/aspire/source/initial_conditions/interface.cc
U trunk/aspire/source/material_model/interface.cc
U trunk/aspire/source/temperature_boundary_conditions/function.cc
U trunk/aspire/source/temperature_boundary_conditions/interface.cc
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1862&peg=1862
Diff:
Modified: trunk/aspire/source/geometry_model/interface.cc
===================================================================
--- trunk/aspire/source/geometry_model/interface.cc 2013-08-26 04:22:04 UTC (rev 1861)
+++ trunk/aspire/source/geometry_model/interface.cc 2013-08-27 15:24:02 UTC (rev 1862)
@@ -101,11 +101,20 @@
{
const std::string pattern_of_names
= std_cxx1x::get<dim>(registered_plugins).get_pattern_of_names ();
- prm.declare_entry ("Model name", "",
- Patterns::Selection (pattern_of_names),
- "Select one of the following models:
"
- +
- std_cxx1x::get<dim>(registered_plugins).get_description_string());
+
+ try
+ {
+ prm.declare_entry ("Model name", "",
+ Patterns::Selection (pattern_of_names),
+ "Select one of the following models:
"
+ +
+ std_cxx1x::get<dim>(registered_plugins).get_description_string());
+ }
+
+ catch (const ParameterHandler::ExcValueDoesNotMatchPattern&)
+ {
+ // ignore the fact that the default value for this parameter does not match the pattern
+ }
}
prm.leave_subsection ();
Modified: trunk/aspire/source/gravity_model/interface.cc
===================================================================
--- trunk/aspire/source/gravity_model/interface.cc 2013-08-26 04:22:04 UTC (rev 1861)
+++ trunk/aspire/source/gravity_model/interface.cc 2013-08-27 15:24:02 UTC (rev 1862)
@@ -108,11 +108,20 @@
{
const std::string pattern_of_names
= std_cxx1x::get<dim>(registered_plugins).get_pattern_of_names ();
- prm.declare_entry ("Model name", "",
- Patterns::Selection (pattern_of_names),
- "Select one of the following models:
"
- +
- std_cxx1x::get<dim>(registered_plugins).get_description_string());
+
+ try
+ {
+ prm.declare_entry ("Model name", "",
+ Patterns::Selection (pattern_of_names),
+ "Select one of the following models:
"
+ +
+ std_cxx1x::get<dim>(registered_plugins).get_description_string());
+ }
+
+ catch (const ParameterHandler::ExcValueDoesNotMatchPattern&)
+ {
+ // ignore the fact the the default value for this parameter does not match the pattern
+ }
}
prm.leave_subsection ();
Modified: trunk/aspire/source/initial_conditions/interface.cc
===================================================================
--- trunk/aspire/source/initial_conditions/interface.cc 2013-08-26 04:22:04 UTC (rev 1861)
+++ trunk/aspire/source/initial_conditions/interface.cc 2013-08-27 15:24:02 UTC (rev 1862)
@@ -119,11 +119,20 @@
{
const std::string pattern_of_names
= std_cxx1x::get<dim>(registered_plugins).get_pattern_of_names ();
- prm.declare_entry ("Model name", "",
- Patterns::Selection (pattern_of_names),
- "Select one of the following models:
"
- +
- std_cxx1x::get<dim>(registered_plugins).get_description_string());
+
+ try
+ {
+ prm.declare_entry ("Model name", "",
+ Patterns::Selection (pattern_of_names),
+ "Select one of the following models:
"
+ +
+ std_cxx1x::get<dim>(registered_plugins).get_description_string());
+ }
+
+ catch (const ParameterHandler::ExcValueDoesNotMatchPattern&)
+ {
+ // ignore the fact that the default value for this parameter does not match the pattern
+ }
}
prm.leave_subsection ();
Modified: trunk/aspire/source/material_model/interface.cc
===================================================================
--- trunk/aspire/source/material_model/interface.cc 2013-08-26 04:22:04 UTC (rev 1861)
+++ trunk/aspire/source/material_model/interface.cc 2013-08-27 15:24:02 UTC (rev 1862)
@@ -291,11 +291,20 @@
{
const std::string pattern_of_names
= std_cxx1x::get<dim>(registered_plugins).get_pattern_of_names ();
- prm.declare_entry ("Model name", "",
- Patterns::Selection (pattern_of_names),
- "Select one of the following models:
"
- +
- std_cxx1x::get<dim>(registered_plugins).get_description_string());
+
+ try
+ {
+ prm.declare_entry ("Model name", "",
+ Patterns::Selection (pattern_of_names),
+ "Select one of the following models:
"
+ +
+ std_cxx1x::get<dim>(registered_plugins).get_description_string());
+ }
+
+ catch (const ParameterHandler::ExcValueDoesNotMatchPattern&)
+ {
+ // ignore the fact that the default value for this parameter does not match the pattern
+ }
}
prm.leave_subsection ();
Modified: trunk/aspire/source/temperature_boundary_conditions/function.cc
===================================================================
--- trunk/aspire/source/temperature_boundary_conditions/function.cc 2013-08-26 04:22:04 UTC (rev 1861)
+++ trunk/aspire/source/temperature_boundary_conditions/function.cc 2013-08-27 15:24:02 UTC (rev 1862)
@@ -71,8 +71,16 @@
{
Functions::ParsedFunction<dim>::declare_parameters (prm, 1);
- prm.declare_entry ("min", "", Patterns::Double (0.0), "minimum temperature on the boundary");
- prm.declare_entry ("max", "", Patterns::Double (0.0), "maximum temperature on the boundary");
+ try
+ {
+ prm.declare_entry ("min", "", Patterns::Double (0.0), "minimum temperature on the boundary");
+ prm.declare_entry ("max", "", Patterns::Double (0.0), "maximum temperature on the boundary");
+ }
+
+ catch (const ParameterHandler::ExcValueDoesNotMatchPattern&)
+ {
+ // ignore the fact that the default value for this parameter does not match the pattern
+ }
}
prm.leave_subsection();
}
Modified: trunk/aspire/source/temperature_boundary_conditions/interface.cc
===================================================================
--- trunk/aspire/source/temperature_boundary_conditions/interface.cc 2013-08-26 04:22:04 UTC (rev 1861)
+++ trunk/aspire/source/temperature_boundary_conditions/interface.cc 2013-08-27 15:24:02 UTC (rev 1862)
@@ -105,11 +105,20 @@
{
const std::string pattern_of_names
= std_cxx1x::get<dim>(registered_plugins).get_pattern_of_names ();
- prm.declare_entry ("Model name", "",
- Patterns::Selection (pattern_of_names),
- "Select one of the following models:
"
- +
- std_cxx1x::get<dim>(registered_plugins).get_description_string());
+
+ try
+ {
+ prm.declare_entry ("Model name", "",
+ Patterns::Selection (pattern_of_names),
+ "Select one of the following models:
"
+ +
+ std_cxx1x::get<dim>(registered_plugins).get_description_string());
+ }
+
+ catch (const ParameterHandler::ExcValueDoesNotMatchPattern&)
+ {
+ // ignore the fact that the default value for this parameter does not match the pattern
+ }
}
prm.leave_subsection ();
More information about the CIG-COMMITS
mailing list