Use more reliable data conversion in FieldInformation. Use new function to change fielddata type.

Author: Ayla Khan

src/Core/Algorithms/Legacy/Fields/FieldData/SetFieldDataToConstantValue.cc

@@ -68,9 +68,9 @@ SetFieldDataToConstantValueAlgo::runImpl(FieldHandle input, FieldHandle& output)
   std::string data_type = get_option(DataType);
   if (data_type != "same as input")
   {
-    fi.set_data_type(data_type);
+    fi.set_data_type_by_string(data_type);
   }
-  else if (!(fi.is_scalar()))
+  else if (! fi.is_scalar() )
   {
     fi.make_double();
   }
@@ -81,7 +81,7 @@ SetFieldDataToConstantValueAlgo::runImpl(FieldHandle input, FieldHandle& output)
     fi.set_basis_type(basis_order);
   }
 
-  output = CreateField(fi,input->mesh());
+  output = CreateField(fi, input->mesh());
 
   if (!output)
   {
@@ -90,10 +90,10 @@ SetFieldDataToConstantValueAlgo::runImpl(FieldHandle input, FieldHandle& output)
   }
 
   double new_value = get(Value).toDouble();
-  
+
   output->vfield()->resize_values();
   output->vfield()->set_all_values(new_value);
-  
+
   return (true);
 }
 

src/Core/Datatypes/Legacy/Field/FieldInformation.cc

@@ -565,64 +565,61 @@ FieldInformation::set_data_type(const std::string& type1)
   data_type = type;
 }
 
-void
+bool
 FieldInformation::set_data_type_by_string(const std::string& type)
 {
-  data_info_type data_type;
   if (type == "char")
   {
-    data_type = CHAR_E;
+    return make_char();
   }
   else if (type == "unsigned char")
   {
-    data_type = UNSIGNED_CHAR_E;
+    return make_unsigned_char();
   }
   else if (type == "short")
   {
-    data_type = SHORT_E;
+    return make_short();
   }
   else if (type == "unsigned short")
   {
-    data_type = UNSIGNED_SHORT_E;
+    return make_unsigned_short();
   }
   else if (type == "int")
   {
-    data_type = INT_E;
+    return make_int();
   }
   else if (type == "unsigned int")
   {
-    data_type = UNSIGNED_INT_E;
+    return make_unsigned_int();
   }
   else if (type == "long long")
   {
-    data_type = LONGLONG_E;
+    return make_long_long();
   }
   else if (type == "unsigned long long")
   {
-    data_type = UNSIGNED_LONGLONG_E;
+    return make_unsigned_long_long();
   }
-  if (type == "float")
+  else if (type == "float")
   {
-    data_type = FLOAT_E;
+    return make_float();
   }
   else if (type == "double")
   {
-    data_type = DOUBLE_E;
+    return make_double();
   }
   else if (type == "Vector")
   {
-    data_type = VECTOR_E;
+    return make_vector();
   }
   else if (type == "Tensor")
   {
-    data_type = TENSOR_E;
+    return make_tensor();
   }
   else
   {
-    // TODO: log this
-    data_type = NONE_E;
+    BOOST_THROW_EXCEPTION(UnknownMeshType() << Core::ErrorMessage("INTERNAL ERROR - unknown type"));
   }
-  return set_data_type(data_type);
 }
 
 void

src/Core/Datatypes/Legacy/Field/FieldInformation.h

@@ -193,7 +193,7 @@ class SCISHARE FieldInformation : public FieldTypeInformation {
 
     std::string get_data_type() const;
     void        set_data_type(const std::string&);
-    void        set_data_type_by_string(const std::string& type);
+    bool        set_data_type_by_string(const std::string& type);
     void        set_data_type(data_info_type);
 
     std::string get_container_type() const;