[cig-commits] r13566 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:14:31 -0800 (Tue, 09 Dec 2008)
New Revision: 13566

Modified:
   cs/cigma/trunk/src/FE.cpp
   cs/cigma/trunk/src/Field.cpp
   cs/cigma/trunk/src/Quadrature.cpp
Log:
Updated factory methods

Modified: cs/cigma/trunk/src/FE.cpp
===================================================================
--- cs/cigma/trunk/src/FE.cpp	2008-12-10 02:14:29 UTC (rev 13565)
+++ cs/cigma/trunk/src/FE.cpp	2008-12-10 02:14:31 UTC (rev 13566)
@@ -11,12 +11,18 @@
 
 shared_ptr<FE> FE::New(const FE_Info& fe_info)
 {
-    shared_ptr<FE> fe(new FE);
+    TRI_LOG_STR("FE::New");
 
-    fe->quadrature = Quadrature::New(fe_info.q_info);
-    fe->cell = Cell::New(fe_info.q_info.cell_type_name.c_str());
-    fe->setBasisAtQuad(fe_info.p_fe_basis);
+    shared_ptr<FE> fe;
 
+    if (fe_info)
+    {
+        fe = shared_ptr<FE>(new FE);
+        fe->quadrature = Quadrature::New(fe_info.q_info);
+        fe->cell = Cell::New(fe_info.q_info.cell_type_name.c_str());
+        fe->setBasisAtQuad(fe_info.p_fe_basis);
+    }
+
     return fe;
 }
 

Modified: cs/cigma/trunk/src/Field.cpp
===================================================================
--- cs/cigma/trunk/src/Field.cpp	2008-12-10 02:14:29 UTC (rev 13565)
+++ cs/cigma/trunk/src/Field.cpp	2008-12-10 02:14:31 UTC (rev 13566)
@@ -15,60 +15,16 @@
 {
     TRI_LOG_STR("Field::NewField");
 
-    shared_ptr<Field> field(new Field);
+    shared_ptr<Field> field;
     
-    field->dofs = DofHandler::New(field_info.p_field);
-
-    /*
-    if (field_info.p_field)
+    if (field_info)
     {
-        field->setDofsPath(field_info.p_field);
-    } // */
-
-    field->mesh = MeshPart::New(field_info.mesh_info);
-
-    /*
-    if (field_info.mesh_info.p_mesh)
-    {
-        field->setMeshPath(field_info.mesh_info.p_mesh);
+        field = shared_ptr<Field>(new Field);
+        field->dofs = DofHandler::New(field_info.p_field);
+        field->mesh = MeshPart::New(field_info.mesh_info);
+        field->fe = FE::New(field_info.fe_info);
     }
-    else if (field_info.mesh_info.p_nc &&
-             field_info.mesh_info.p_eb)
-    {
-        field->setMeshPath2(field_info.mesh_info.p_nc,
-                            field_info.mesh_info.p_eb);
-    }
-    else
-    {
-        std::ostringstream stream;
-        stream << "Mesh for field '" << field_info.p_field << "'"
-               << " was not specified" << std::ends;
-        throw cigma::Exception("Function::NewFunction", stream.str());
-    } // */
-
-
-    field->fe = FE::New(field_info.fe_info);
-
-    /*
-    if (field_info.fe_info.q_info.p_quadrature)
-    {
-        field->setQuadPath(field_info.fe_info.q_info.p_quadrature);
-    }
-    else if (field_info.fe_info.q_info.p_weights &&
-             field_info.fe_info.q_info.p_points)
-    {
-        field->setQuadPath2(field_info.fe_info.q_info.p_weights,
-                            field_info.fe_info.q_info.p_points);
-    }
-
-    if (field_info.fe_info.q_info.cell_type_name != "")
-    {
-        field->setCell(field_info.fe_info.q_info.cell_type_name);
-    }
-
-    field->setBasisAtQuad(field_info.fe_info.p_fe_basis);
-    // */
-
+    
     return field;
 }
 

Modified: cs/cigma/trunk/src/Quadrature.cpp
===================================================================
--- cs/cigma/trunk/src/Quadrature.cpp	2008-12-10 02:14:29 UTC (rev 13565)
+++ cs/cigma/trunk/src/Quadrature.cpp	2008-12-10 02:14:31 UTC (rev 13566)
@@ -142,7 +142,8 @@
 
 shared_ptr<Quadrature> Quadrature::New(const QuadratureInfo& q_info)
 {
-    //TRI_LOG_STR("Quadrature::New()");
+    TRI_LOG_STR("Quadrature::New");
+
     shared_ptr<Quadrature> Q;
 
     if (q_info.p_quadrature)