New Makefile because of removed boost. SMI demo removed.

demo/Makefile

@@ -11,41 +11,33 @@ USE_MKL = 0                 # 1 if AMDiS was compiled with Intel MKL library, 0
 USE_BOOST = 0               # 1 if AMDiS was compiled with Boost support, 0 otherwise
 USE_SERVER =                # mars, deimos or themisto. If no special server blank
 USE_COMPILER = gcc          # gcc  or icc
-USE_SMI = 0
 USE_MPCCI = 0
 DEBUG = 0
 
 AMDIS_DIR = ../AMDiS
 MPI_DIR =                   # on mars, deimos or themisto, leave this field blank
-BOOST_DIR =                 # if compiled with boost support, define here the boost directory
-SMI_DIR = 
 MPCCI_DIR = 
 
 
 
-
-
 # ============================================================================
 #                 !!! Do not edit after this line !!!
 # ============================================================================
 
 
 
-
-
 PARMETIS_DIR = $(AMDIS_DIR)/lib/ParMetis-3.1
 
 # ============================================================================
 # ===== includes pathes ======================================================
 # ============================================================================
 
-AMDIS_INCLUDE = -I$(AMDIS_DIR)/src -I$(AMDIS_DIR)/compositeFEM/src -I$(AMDIS_DIR)/lib/boost_1_34_1 -I$(AMDIS_DIR)/lib/mtl4
-SMI_INCLUDE = -I$(SMI_DIR)/smi 
+AMDIS_INCLUDE = -I$(AMDIS_DIR)/src -I$(AMDIS_DIR)/compositeFEM/src -I$(AMDIS_DIR)/lib/mtl4
 MPCCI_INCLUDE = -I$(MPCCI_DIR)/include
 PARMETIS_INCLUDE = -I$(PARMETIS_DIR)
 PARALLEL_INCLUDE = -I$(AMDIS_DIR)/src/parallel
 
-INCLUDES = -I. $(AMDIS_INCLUDE) $(SMI_INCLUDE) $(MPCCI_INCLUDE) -I$(SMI_DIR)/etc/commoncpp/include $(PARALLEL_INCLUDE)
+INCLUDES = -I. $(AMDIS_INCLUDE) $(MPCCI_INCLUDE) $(PARALLEL_INCLUDE)
 
 # ============================================================================
 # ===== libraries ============================================================
@@ -70,11 +62,11 @@ else
 	endif
 endif
 
-SMI_LIB = -L$(SMI_DIR)/lib -lsmi
 MPCCI_LIB = -L$(MPCCI_DIR)/lib/linux-x86-glibc22 -lmpcci
 PARMETIS_LIB = -L$(PARMETIS_DIR) -lparmetis -lmetis
 
 LIBS = $(AMDIS_LIB) $(PNG_LIB)
+LIBS += -lboost_iostreams -lboost_filesystem
 
 ifeq ($(strip $(USE_UMFPACK)), 1)
 	LIBS += $(UMFPACK_LIB)
@@ -90,18 +82,10 @@ ifeq ($(strip $(USE_MKL)), 1)
 	LIBS += -lmkl -lmkl_solver -lguide -lpthread
 endif
 
-ifeq ($(strip $(USE_SMI)), 1)
-	LIBS += $(SMI_LIB) 
-endif
-
 ifeq ($(strip $(USE_MPCCI)), 1)
 	LIBS += $(MPCCI_LIB) 
 endif
 
-ifeq ($(strip $(USE_BOOST)), 1)
-	LIBS += -L$(BOOST_DIR)/lib -lboost_iostreams
-endif
-
 
 # ============================================================================
 # ===== parallel or sequential ? =============================================
@@ -274,13 +258,6 @@ STOKESNONLIN_OFILES = stokesnonlin.o
 stokesnonlin: $(STOKESNONLIN_OFILES)
 	$(LINK) $(CPPFLAGS) $(LDFLAGS) -o stokesnonlin $(STOKESNONLIN_OFILES)  $(LIBS)
 
-# ===== smitest ============================================================
-
-SMITEST_OFILES = smitest.o
-
-smitest: $(SMITEST_OFILES)
-	$(LINK) $(CPPFLAGS) $(LDFLAGS) -o smitest $(INCLUDES) $(SMITEST_OFILES) $(SMI_LIB)
-
 # ===== mpccitest ============================================================
 
 MPCCITEST_OFILES = mpccitest.o SMIAdapter.o MpCCIAdapter.o

demo/init/smi.dat.2d

-dimension of world:             2
-
-elliptMesh->macro file name:    ./macro/smi.macro.2d
-elliptMesh->global refinements: 0
-
-ellipt->mesh:                   elliptMesh
-ellipt->dim:                    2
-ellipt->polynomial degree:      1
-
-ellipt->solver:                 cg
-ellipt->solver->max iteration:  1000
-ellipt->solver->tolerance:      1.e-8
-ellipt->solver->info:           2
-ellipt->solver->left precon:    diag
-ellipt->solver->right precon:   no
-
-ellipt->estimator:              residual
-ellipt->estimator->error norm:  1   % 1: H1_NORM, 2: L2_NORM
-ellipt->estimator->C0:          0.1 % constant of element residual
-ellipt->estimator->C1:          0.1 % constant of jump residual
-
-ellipt->marker->strategy:       2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
-ellipt->marker->MSGamma:        0.5
-
-ellipt->adapt->tolerance:       1e-2
-ellipt->adapt->max iteration:   6
-ellipt->adapt->refine bisections:  2
-
-ellipt->output->filename:       ellipt
-ellipt->output->ParaView format: 1
-
-ellipt->output->append index:   0
-ellipt->output->index length:   6
-ellipt->output->index decimals: 3
-
-WAIT:                           0
-

demo/macro/smi.macro.2d

-DIM: 2
-DIM_OF_WORLD: 2
-
-number of elements: 4  
-number of vertices: 5  
-
-element vertices:
-0 1 4 
-1 2 4  
-2 3 4 
-3 0 4 
-
-element boundaries:
-0 0 1 
-0 0 1
-0 0 1 
-0 0 1 
-
-vertex coordinates:
- 0.0 0.0  
- 1.0 0.0
- 1.0 1.0
- 0.0 1.0
- 0.5 0.5
-
-element neighbours:
-1 3 -1 
-2 0 -1 
-3 1 -1 
-0 2 -1
-
-element region:
-1
-1
-1
-1
\ No newline at end of file

demo/src/smitest.cc

-#include <cc++/socket.h>
-#include <cstdlib>
-#include "smi.h"
-
-using namespace ost;
-using namespace std;
-
-int main(int argc, char* argv[])
-{
-  SMI_Connect_to_server("10.1.13.3", 5432);
-
-  int applicationID = SMI_Add_application(-1, 0);
-
-  std::cout << applicationID << std::endl;
-
-  int numMeshes;
-  int *meshIDs;
-
-  SMI_Get_all_mesh_ids(applicationID, &numMeshes, &meshIDs);
-
-  std::cout << numMeshes << std::endl;
-  for (int i = 0; i < numMeshes; i++)
-    std::cout << meshIDs[i] << " ";
-  std::cout << std::endl;
-
-  SMI_Begin_read_transaction(applicationID, 1);
-  SMI_Remove_application(applicationID);
-  SMI_Disconnect();
-}
-
-