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

[luis at geodynamics.org]

Author: luis
Date: 2007-12-19 12:08:05 -0800 (Wed, 19 Dec 2007)
New Revision: 8957

Modified:
   cs/benchmark/cigma/trunk/src/Command.h
   cs/benchmark/cigma/trunk/src/DofHandler.h
   cs/benchmark/cigma/trunk/src/EvalCmd.cpp
   cs/benchmark/cigma/trunk/src/ExtractCmd.cpp
   cs/benchmark/cigma/trunk/src/ExtractCmd.h
   cs/benchmark/cigma/trunk/src/HelpCmd.h
Log:
Syncing minor changes (needed for git-svn rebase)

Modified: cs/benchmark/cigma/trunk/src/Command.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Command.h	2007-12-19 20:07:55 UTC (rev 8956)
+++ cs/benchmark/cigma/trunk/src/Command.h	2007-12-19 20:08:05 UTC (rev 8957)
@@ -5,6 +5,7 @@
 
 #include "AnyOption.h"
 
+
 namespace cigma
 {
     class Command;

Modified: cs/benchmark/cigma/trunk/src/DofHandler.h
===================================================================
--- cs/benchmark/cigma/trunk/src/DofHandler.h	2007-12-19 20:07:55 UTC (rev 8956)
+++ cs/benchmark/cigma/trunk/src/DofHandler.h	2007-12-19 20:08:05 UTC (rev 8957)
@@ -1,6 +1,8 @@
 #ifndef __DOF_HANDLER_H__
 #define __DOF_HANDLER_H__
 
+#include "MeshPart.h"
+
 namespace cigma
 {
     class DofHandler;
@@ -13,11 +15,6 @@
 class cigma::DofHandler
 {
 public:
-    int nno;
-    int ndim;
-    double *dofs;
-
-public:
     DofHandler();
     ~DofHandler();
 
@@ -27,6 +24,12 @@
 public:
     void set_data(double *dofs, int nno, int ndim);
     void get_data(int num, int *nodes, double *d);
+
+public:
+    int nno;
+    int ndim;
+    double *dofs;
+    MeshPart *meshPart;
 };
 
 

Modified: cs/benchmark/cigma/trunk/src/EvalCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/EvalCmd.cpp	2007-12-19 20:07:55 UTC (rev 8956)
+++ cs/benchmark/cigma/trunk/src/EvalCmd.cpp	2007-12-19 20:08:05 UTC (rev 8957)
@@ -24,6 +24,10 @@
     opt->addUsage("Usage:");
     opt->addUsage("");
     opt->addUsage("   cigma eval [args ...]");
+    opt->addUsage("");
+    opt->addUsage("");
+    opt->addUsage("");
+    opt->addUsage("");
 
     /* setup flags and options */
     opt->setFlag("help", 'h');

Modified: cs/benchmark/cigma/trunk/src/ExtractCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/ExtractCmd.cpp	2007-12-19 20:07:55 UTC (rev 8956)
+++ cs/benchmark/cigma/trunk/src/ExtractCmd.cpp	2007-12-19 20:08:05 UTC (rev 8957)
@@ -25,6 +25,9 @@
     opt->addUsage("Usage:");
     opt->addUsage("");
     opt->addUsage("   cigma extract [args ...]");
+    opt->addUsage("");
+    opt->addUsage("");
+    opt->addUsage("");
 
     /* setup flags and options */
     opt->setFlag("help", 'h');

Modified: cs/benchmark/cigma/trunk/src/ExtractCmd.h
===================================================================
--- cs/benchmark/cigma/trunk/src/ExtractCmd.h	2007-12-19 20:07:55 UTC (rev 8956)
+++ cs/benchmark/cigma/trunk/src/ExtractCmd.h	2007-12-19 20:08:05 UTC (rev 8957)
@@ -2,7 +2,7 @@
 #define __EXTRACT_CMD_H__
 
 #include "Command.h"
-#include "QuadratureRule.h"
+#include "Quadrature.h"
 #include "MeshPart.h"
 
 
@@ -29,7 +29,7 @@
 
 public:
     MeshPart *meshPart;
-    QuadratureRule *quadrature;
+    Quadrature *quadrature;
 };
 
 #endif

Modified: cs/benchmark/cigma/trunk/src/HelpCmd.h
===================================================================
--- cs/benchmark/cigma/trunk/src/HelpCmd.h	2007-12-19 20:07:55 UTC (rev 8956)
+++ cs/benchmark/cigma/trunk/src/HelpCmd.h	2007-12-19 20:08:05 UTC (rev 8957)
@@ -1,10 +1,12 @@
 #ifndef __HELP_CMD_H__
 #define __HELP_CMD_H__
 
+#include <vector>
+
 #include "Command.h"
 #include "CommandSet.h"
-#include <vector>
 
+
 namespace cigma
 {
     class HelpCmd;