Merge branch 'diffusion' of ssh://geraldine.fjfi.cvut.cz:2222/local/projects/tnl/tnl into diffusion (2bb638c3) · Commits · TNL / tnl-dev

.cproject

+15 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,11 @@
		<folderInfo id="cdt.managedbuild.toolchain.gnu.base.2134791445.1799170915" name="/" resourcePath="">
		<toolChain id="cdt.managedbuild.toolchain.gnu.base.1762402759" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
		<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.840154721" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
		<builder id="cdt.managedbuild.target.gnu.builder.base.573876641" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
		<builder id="cdt.managedbuild.target.gnu.builder.base.573876641" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base">
		<outputEntries>
		<entry flags="VALUE_WORKSPACE_PATH\|RESOLVED" kind="outputPath" name=""/>
		</outputEntries>
		</builder>
		<tool id="cdt.managedbuild.tool.gnu.archiver.base.958650307" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
		<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1237330740" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
		<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1856262209" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
		@@ -38,6 +42,9 @@
		</tool>
		</toolChain>
		</folderInfo>
		<sourceEntries>
		<entry excluding="tnlLinearDiffusionTest.cu" flags="VALUE_WORKSPACE_PATH\|RESOLVED" kind="sourcePath" name=""/>
		</sourceEntries>
		</configuration>
		</storageModule>
		<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
		@@ -46,8 +53,14 @@
		<storageModule moduleId="cdtBuildSystem" version="4.0.0">
		<project id="tnl.null.219466708" name="tnl"/>
		</storageModule>
		<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
		<storageModule moduleId="scannerConfiguration">
		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2134791445;cdt.managedbuild.toolchain.gnu.base.2134791445.1799170915;cdt.managedbuild.tool.gnu.c.compiler.base.315517693;cdt.managedbuild.tool.gnu.c.compiler.input.950045328">
		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
		</scannerConfigBuildInfo>
		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2134791445;cdt.managedbuild.toolchain.gnu.base.2134791445.1799170915;cdt.managedbuild.tool.gnu.cpp.compiler.base.1237330740;cdt.managedbuild.tool.gnu.cpp.compiler.input.1856262209">
		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
		</scannerConfigBuildInfo>
		</storageModule>
		<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
		</cproject>

CMakeLists.txt

+12 −18

Original line number	Diff line number	Diff line
		@@ -32,17 +32,10 @@ if( WITH_TEMPLATE_EXPLICIT_INSTANTIATION STREQUAL "yes" )
		AddCompilerFlag( "-DTEMPLATE_EXPLICIT_INSTANTIATION " )
		endif()

		if( WITH_CUDA STREQUAL "yes" )
		AddCompilerFlag( "-DHAVE_NOT_CXX11 -U_GLIBCXX_ATOMIC_BUILTINS -U_GLIBCXX_USE_INT128" )
		set( CUDA_LINKER_OPTIONS "-arch sm_20 -shared" )
		else()
		AddCompilerFlag( "-std=gnu++0x" )
		endif()

		#####
		# Check for CUDA
		#
		if( NOT WITH_CUDA STREQUAL "no" )
		if( WITH_CUDA STREQUAL "yes" )
		find_package( CUDA )
		if( CUDA_FOUND )
		set( BUILD_CUDA TRUE)
		@@ -50,14 +43,11 @@ if( NOT WITH_CUDA STREQUAL "no" )
		set(BUILD_SHARED_LIBS ON)
		set(CUDA_SEPARABLE_COMPILATION ON)
		set(CUSPARSE_LIBRARY /usr/local/cuda/lib64/libcusparse.so) # TODO: fix this

		set( CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-DHAVE_CUDA)

		#set( CUDA_ADD_EXECUTABLE_OPTIONS -gencode arch=compute_20,code=sm_20 -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=\"sm_35,compute_35\" )
		#set( CUDA_ADD_LIBRARY_OPTIONS -gencode arch=compute_20,code=sm_20 -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=\"sm_35,compute_35\" -shared )
		AddCompilerFlag( "-DHAVE_NOT_CXX11 -U_GLIBCXX_ATOMIC_BUILTINS -U_GLIBCXX_USE_INT128" )
		set( CUDA_ADD_EXECUTABLE_OPTIONS -gencode arch=compute_20,code=sm_20 -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35 )
		set( CUDA_ADD_LIBRARY_OPTIONS -gencode arch=compute_20,code=sm_20 -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,code=sm_35 -shared )

		set( CUDA_LINKER_OPTIONS "-arch sm_20 -shared" )
		####
		# Check for CUSP
		#
		@@ -91,8 +81,12 @@ if( NOT WITH_CUDA STREQUAL "no" )
		endif()
		endif( NOT WITH_CUSPARSE STREQUAL "no" )

		else( CUDA_FOUND )
		AddCompilerFlag( "-std=gnu++0x" )
		endif( CUDA_FOUND )
		endif( NOT WITH_CUDA STREQUAL "no" )
		else( WITH_CUDA STREQUAL "yes" )
		AddCompilerFlag( "-std=gnu++0x" )
		endif( WITH_CUDA STREQUAL "yes" )

		####
		# Check for OpenMP

TODO

+3 −10

Original line number	Diff line number	Diff line
		TODO: test aproximace pro implicitni schemata
		TODO: pokusit se napsat test explicitni aproximace podobne jako implicinit bez specializace pro grid
		TODO: doladit semi-implicitni resic
		TODO: opravit argumenty metod v heat equation - nekde se nepredavaji dofy a pomocne dofy
		TODO: doresit okrajove podminky v heat equation - nacitani ze souboru
		=> soucasne Dir. a Neum. okrajove podminky prejmenovat asi tnlAnalytic... a zavest nove tnlDirichlet... a tnlNeumann...
		ktere budou mit sve hodnoty ulozene ve vektoru
		TODO: neumanovy okrajove podminky
		TODO: napsat FunctionDiscretizer pro jednotne rozhrani RightHandSide

		TODO: doladit vse s CUDA
		TODO: doplnit mesh travelsals pro jine mesh entity nez cell
		TODO: implementovat tnlProblem
		TODO: implementace maticovych resicu
		* Gaussova eliminace
		* SOR metoda
		@@ -23,7 +18,5 @@ TODO: metodu pro tnlString pro nahrazeni napr. podretezce XXXXX indexem 00001 tj

		TODO: vyjimky

		TODO: implementovat maticovy format COO - mimo jine by se dal vyuzit k rychlejsimu parsovani mtx souboru

		TODO: prubezne ukladani vysledku behem vypoctu

		No newline at end of file

examples/heat-equation/CMakeLists.txt

+10 −5

Original line number	Diff line number	Diff line
		set( tnl_heat_equation_SOURCES
		tnlHeatEquationEocRhs.h
		tnlRightHandSide_impl.h
		tnlRightHandSide.h
		tnl-heat-equation.cpp
		tnl-heat-equation-eoc.cpp
		heatEquationSolver_impl.h
		heatEquationSolver.h
		heatEquationEocSolver.h
		heatEquationEocSolver_impl.h
		tnlHeatEquationEocRhs.h )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-heat-equation${debugExt} tnl-heat-equation.cu)
		CUDA_ADD_EXECUTABLE(tnl-heat-equation-eoc-test${debugExt} tnl-heat-equation-eoc.cu)
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-heat-equation${debugExt} tnl-heat-equation.cpp)
		target_link_libraries (tnl-heat-equation${debugExt} tnl${debugExt}-${tnlVersion} )

		ADD_EXECUTABLE(tnl-heat-equation-eoc-test${debugExt} tnl-heat-equation-eoc.cpp)
		ENDIF( BUILD_CUDA )

		target_link_libraries (tnl-heat-equation${debugExt} tnl${debugExt}-${tnlVersion} )
		target_link_libraries (tnl-heat-equation-eoc-test${debugExt} tnl${debugExt}-${tnlVersion} )

		INSTALL( TARGETS tnl-heat-equation${debugExt}

examples/heat-equation/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -27,11 +27,9 @@ dist: $(DIST)

		install: $(TARGET)
		cp $(TARGET) $(INSTALL_DIR)/bin
		cp $(CONFIG_FILE) $(INSTALL_DIR)/share/tnl-0.1/examples/heat-equation

		uninstall: $(TARGET)
		rm -f $(INSTALL_DIR)/bin/$(TARGET)
		rm -f $(CONFIG_FILE) $(INSTALL_DIR)/share/tnl-0.1/examples/heat-equation

		$(TARGET): $(OBJECTS)
		$(CXX) -o $(TARGET) $(OBJECTS) $(LD_FLAGS)