remove Model class, no longer needed (#1)

UMD-AOSC · Aug 27, 2020 · ba29591 · ba29591
1 parent b5828d9
commit ba29591
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 178 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,10 +30,15 @@ before_install:
 
 script:
 - |
-  # build/test code
-  docker exec jcsda_container bash \
-   -c 'cd /jcsda/build && ecbuild /jcsda/src/bundle && cd oisst && make -j 4'
+  # build code
+  docker exec jcsda_container -it bash \
+   -c 'cd /jcsda/build && ecbuild /jcsda/src/bundle && cd oisst && make -j 4; exit $?' \
+   || travis_terminate 1
+
+- |
+  # test code
   docker exec jcsda_container bash \
-   -c 'cd /jcsda/build/oisst && ctest'
+   -c 'cd /jcsda/build/oisst && ctest --output-on-failure' \
+   || travis_terminate 1
   
 after_success: 
diff --git a/src/oisst/CMakeLists.txt b/src/oisst/CMakeLists.txt
@@ -28,6 +28,5 @@ add_subdirectory(Covariance)
 add_subdirectory(Geometry)
 add_subdirectory(GetValues)
 add_subdirectory(Increment)
-add_subdirectory(Model)
 add_subdirectory(ModelAux)
 add_subdirectory(State)
diff --git a/src/oisst/Model/CMakeLists.txt b/src/oisst/Model/CMakeLists.txt
diff --git a/src/oisst/Model/Model.cc b/src/oisst/Model/Model.cc
diff --git a/src/oisst/Model/Model.h b/src/oisst/Model/Model.h
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -43,12 +43,6 @@ endforeach()
 #    ARGS    testinput/increment.yml
 #    LIBS    oisst )
 
-# ecbuild_add_test(
-#   TARGET  test_oisst_model
-#   SOURCES executables/TestModel.cc
-#   ARGS    testinput/model.yml
-#   LIBS    oisst )
-
 #  ecbuild_add_test(
 #    TARGET  test_oisst_modelauxcontrol
 #    SOURCES executables/TestModelAuxControl.cc

diff --git a/test/executables/TestModel.cc b/test/executables/TestModel.cc
diff --git a/test/testinput/model.yml b/test/testinput/model.yml