[cig-commits] r9296 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-02-13 01:51:17 -0800 (Wed, 13 Feb 2008)
New Revision: 9296

Added:
   cs/benchmark/cigma/trunk/src/MeshIO.cpp
   cs/benchmark/cigma/trunk/src/MeshIO.h
Log:
Moved MeshIO out of Misc.{h,cpp}


Added: cs/benchmark/cigma/trunk/src/MeshIO.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/MeshIO.cpp	                        (rev 0)
+++ cs/benchmark/cigma/trunk/src/MeshIO.cpp	2008-02-13 09:51:17 UTC (rev 9296)
@@ -0,0 +1,148 @@
+#include <iostream>
+#include "MeshIO.h"
+#include "StringUtils.h"
+
+using namespace std;
+using namespace cigma;
+
+// ---------------------------------------------------------------------------
+
+void configure_mesh(AnyOption *opt, MeshIO *meshIO, const char *opt_prefix)
+{
+    assert(opt != 0);
+    assert(meshIO != 0);
+
+    char *in;
+    string optstr;
+    string mesh_name = opt_prefix;
+
+    in = opt->getValue(mesh_name.c_str());
+    if (in != 0)
+    {
+        meshIO->mesh_path = in;
+    }
+
+    optstr = mesh_name + "-coordinates";
+    in = opt->getValue(optstr.c_str());
+    if (in != 0)
+    {
+        meshIO->coords_path = in;
+    }
+
+    optstr = mesh_name + "-connectivity";
+    in = opt->getValue(optstr.c_str());
+    if (in != 0)
+    {
+        meshIO->connect_path = in;
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+MeshIO::MeshIO()
+{
+    meshPart = 0;
+}
+
+MeshIO::~MeshIO()
+{
+    if (meshPart != 0)
+    {
+        // XXX: traverse meshPart structure and delete everything
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+void MeshIO::load()
+{
+    cout << "Calling MeshIO::load()" << endl;
+
+    string mesh_loc, mesh_file, mesh_ext;
+    string coords_loc, coords_file, coords_ext;
+    string connect_loc, connect_file, connect_ext;
+
+    int nno, nsd;
+    double *coords = 0;
+
+    int nel, ndofs;
+    int *connect = 0;
+
+    nno = nsd = 0;
+    nel = ndofs = 0;
+
+    // XXX: use auto_ptr for the local readers, so we can throw exceptions
+    if (coords_path != "")
+    {
+        Reader *coords_reader;
+        parse_dataset_path(coords_path, coords_loc, coords_file, coords_ext);
+        new_reader(&coords_reader, coords_ext);
+        coords_reader->open(coords_file);
+        coords_reader->get_coordinates(coords_loc.c_str(), &coords, &nno, &nsd);
+        //coords_reader->close();
+    }
+
+    if (connect_path != "")
+    {
+        Reader *connect_reader;
+        parse_dataset_path(connect_path, connect_loc, connect_file, connect_ext);
+        new_reader(&connect_reader, connect_ext);
+        connect_reader->open(connect_file);
+        connect_reader->get_connectivity(connect_loc.c_str(), &connect, &nel, &ndofs);
+        //connect_reader->close();
+    }
+
+    if ((mesh_path != "") && ((coords == 0) || (connect == 0)))
+    {
+        Reader *mesh_reader;
+        parse_dataset_path(mesh_path, mesh_loc, mesh_file, mesh_ext);
+        new_reader(&mesh_reader, mesh_ext);
+        mesh_reader->open(mesh_file);
+        if (coords == 0)
+        {
+            if (mesh_reader->getType() == Reader::HDF_READER)
+            {
+                coords_loc = mesh_loc + "/coordinates";
+            }
+            mesh_reader->get_coordinates(coords_loc.c_str(), &coords, &nno, &nsd);
+        }
+        if (connect == 0)
+        {
+            if (mesh_reader->getType() == Reader::HDF_READER)
+            {
+                connect_loc = mesh_loc + "/connectivity";
+            }
+            mesh_reader->get_connectivity(connect_loc.c_str(), &connect, &nel, &ndofs);
+        }
+        //mesh_reader->close();
+    }
+
+    if ((coords != 0) && (connect != 0))
+    {
+        meshPart = new MeshPart();
+
+        meshPart->nno = nno;
+        meshPart->nsd = nsd;
+        meshPart->coords = coords;
+
+        meshPart->nel = nel;
+        meshPart->ndofs = ndofs;
+        meshPart->connect = connect;
+    }
+    else
+    {
+        if (coords == 0)
+        {
+            cerr << "MeshIO::load() error: Could not find mesh coordinates";
+            cerr << endl;
+        }
+        if (connect == 0)
+        {
+            cerr << "MeshIO::load() error: Could not find mesh connectivity";
+            cerr << endl;
+        }
+    }
+
+}
+
+// ---------------------------------------------------------------------------

Added: cs/benchmark/cigma/trunk/src/MeshIO.h
===================================================================
--- cs/benchmark/cigma/trunk/src/MeshIO.h	                        (rev 0)
+++ cs/benchmark/cigma/trunk/src/MeshIO.h	2008-02-13 09:51:17 UTC (rev 9296)
@@ -0,0 +1,34 @@
+#ifndef __MESH_IO_H__
+#define __MESH_IO_H__
+
+#include <string>
+#include "AnyOption.h"
+#include "Reader.h"
+#include "Writer.h"
+#include "MeshPart.h"
+
+class MeshIO
+{
+public:
+    cigma::Reader *reader;
+    cigma::Writer *writer;
+
+public:
+    std::string mesh_path;
+    std::string coords_path;
+    std::string connect_path;
+    cigma::MeshPart *meshPart;
+
+public:
+    MeshIO();
+    ~MeshIO();
+    void load();
+    void save();
+
+};
+
+
+void configure_mesh(AnyOption *opt, MeshIO *meshIO, const char *opt_prefix);
+
+
+#endif