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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/src/core_extract_op.cpp
   cs/cigma/trunk/src/core_extract_op.h
Log:
Switched from old factory method

Modified: cs/cigma/trunk/src/core_extract_op.cpp
===================================================================
--- cs/cigma/trunk/src/core_extract_op.cpp	2008-12-10 02:14:03 UTC (rev 13550)
+++ cs/cigma/trunk/src/core_extract_op.cpp	2008-12-10 02:14:04 UTC (rev 13551)
@@ -1,5 +1,7 @@
 #include "core_extract_op.h"
+#include "core_readers.h"
 #include "tri_logger.hpp"
+
 #include <boost/shared_ptr.hpp>
 #include <iostream>
 #include <cassert>
@@ -24,16 +26,39 @@
 
     if (!mesh)
     {
-        mesh = ReadMeshPart(mesh_info);
+        //mesh = ReadMeshPart(mesh_info);
+        mesh = shared_ptr<MeshPart>(new MeshPart);
+        mesh->setPath(mesh_info.p_mesh);
     }
+    if (!mesh)
+    {
+        string msg("Uninitialized mesh");
+        throw cigma::Exception("ExtractOp::configure", msg);
+    }
     assert(mesh);
     assert(mesh->coords);
     assert(mesh->connect);
 
     if (!quadrature)
     {
-        quadrature = ReadQuadrature(quadrature_info);
+        //quadrature = ReadQuadrature(quadrature_info);
+        quadrature = shared_ptr<Quadrature>(new Quadrature);
+
+        if (quadrature_info.cell_type_name == "")
+        {
+            quadrature->setPath(quadrature_info.p_quadrature);
+            quadrature->setCellType(mesh->getCellType());
+        }
+        else
+        {
+            quadrature->setCell(quadrature_info.cell_type_name);
+        }
     }
+    if (!quadrature)
+    {
+        string msg("Uninitialized quadrature");
+        throw cigma::Exception("ExtractOp::configure", msg);
+    }
     assert(quadrature);
 
     return;

Modified: cs/cigma/trunk/src/core_extract_op.h
===================================================================
--- cs/cigma/trunk/src/core_extract_op.h	2008-12-10 02:14:03 UTC (rev 13550)
+++ cs/cigma/trunk/src/core_extract_op.h	2008-12-10 02:14:04 UTC (rev 13551)
@@ -4,10 +4,11 @@
 #include <boost/shared_ptr.hpp>
 
 #include "core_base_op.h"
-#include "core_readers.h"
 #include "core_array.h"
+#include "core_args.h"
 #include "MeshPart.h"
 #include "Quadrature.h"
+#include "FE.h"
 
 namespace cigma
 {
@@ -28,9 +29,13 @@
 
     MeshInfo mesh_info;
     QuadratureInfo quadrature_info;
+    //FE_Info fe_info;
+    //FieldInfo field_info;
 
     boost::shared_ptr<MeshPart> mesh;
     boost::shared_ptr<Quadrature> quadrature;
+    //boost::shared_ptr<FE> fe;
+    //boost::shared_ptr<Field> field;
 
     cigma::array<double> weights;
     cigma::array<double> points;