DEM updatge

CMakeLists.txt

@@ -1,4 +1,5 @@
 if (LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT)
+	
 	include_directories(${CMAKE_INSTALL_PREFIX}/include)
 
 	include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/include" )
@@ -12,6 +13,13 @@ if (LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT)
 	if (LEMMA_BUILD_EXAMPLES)
 		add_subdirectory(examples)
 	endif()
+	
+	if (LEMMA_ENABLE_TESTING)
+		add_subdirectory(testing)
+	endif()
+
+	install ( TARGETS dem4core DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+
 else()
 	message( STATUS "DEM requires Lemma to be build with VTK" )
 endif()

include/DEMParticle.h

@@ -43,6 +43,17 @@ namespace Lemma {
          */
         static std::shared_ptr< DEMParticle > NewSP();
 
+        /**
+         *  Uses YAML to serialize this object.
+         *  @return a YAML::Node
+         */
+        YAML::Node Serialize() const;
+
+        /**
+         *   Constructs an object from a YAML::Node.
+         */
+        static std::shared_ptr< DEMParticle > DeSerialize(const YAML::Node& node);
+
         // ====================  OPERATORS     =======================
 
         // ====================  OPERATIONS    =======================
@@ -59,17 +70,6 @@ namespace Lemma {
             return this->CName;
         }
 
-        /**
-         *  Uses YAML to serialize this object.
-         *  @return a YAML::Node
-         */
-        YAML::Node Serialize() const;
-
-        /**
-         *   Constructs an object from a YAML::Node.
-         */
-        static std::shared_ptr< DEMParticle > DeSerialize(const YAML::Node& node);
-
         protected:
 
         // ====================  LIFECYCLE     =======================
@@ -99,3 +99,5 @@ namespace Lemma {
 
 #endif   // ----- #ifndef DEMPARTICLE_INC  -----
 
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp: */

testing/CMakeLists.txt

@@ -0,0 +1,3 @@
+
+CXXTEST_ADD_TEST(unittestDEM_GetNameCheck GetNameCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/GetNameCheck.h)
+target_link_libraries(unittestDEM_GetNameCheck "lemmacore" "dem4core")

testing/GetNameCheck.h

@@ -0,0 +1,37 @@
+/* This file is part of Lemma, a geophysical modelling and inversion API.
+ * More information is available at http://lemmasoftware.org
+ */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * @file
+ * @date      06/23/2016 01:26:46 PM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2016, University of Utah
+ * @copyright Copyright (c) 2016, Lemma Software, LLC
+ */
+
+#include <cxxtest/TestSuite.h>
+#include <LemmaCore>
+#include <DEM4Core>
+
+using namespace Lemma;
+
+class MyTestSuite : public CxxTest::TestSuite
+{
+    public:
+
+    void testDEMParticle( void )
+    {
+        auto Obj = DEMParticle::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("DEMParticle") );
+    }
+
+};
+