Commit e8e4ae6e authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'master' into dicom 

Conflicts:
	build
	src/core/CMakeLists.txt
parents a102fe33 35fafc0a

.cproject

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

	<storageModule moduleId="org.eclipse.cdt.core.settings">

		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.2134791445">

			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.2134791445" moduleId="org.eclipse.cdt.core.settings" name="Default">

				<externalSettings/>

				<extensions>

					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>

				</extensions>

			</storageModule>

			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

				<configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.2134791445" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">

					<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">

								<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"/>

							</tool>

							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.315517693" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">

								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.950045328" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>

							</tool>

							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1786292703" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>

							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1133414639" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">

								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.692614544" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">

									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

									<additionalInput kind="additionalinput" paths="$(LIBS)"/>

								</inputType>

							</tool>

							<tool id="cdt.managedbuild.tool.gnu.assembler.base.336757143" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">

								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1329383797" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>

							</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"/>

		</cconfiguration>

	</storageModule>

	<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>

</cproject>

CMakeLists.txt

+16 −2
Original line number Diff line number Diff line 
###############################################################################

#                      Cmake project script for TNL

#                             -------------------

#    begin               : Dec 8, 2010

#    copyright           : (C) 2010 by Tomas Oberhuber et al.

#    email               : tomas.oberhuber@fjfi.cvut.cz

#

###############################################################################

#

# Authors:

# Tomas Oberhuber

# Vladimir Klement

# Jakub Klinkovsky



cmake_minimum_required( VERSION 2.8.10 )



project( tnl )
@@ -130,11 +144,11 @@ if( WITH_CUDA STREQUAL "yes" ) 
        endif( NOT WITH_CUSPARSE STREQUAL "no" )

   

    else( CUDA_FOUND )

      AddCompilerFlag( "-std=gnu++0x" )         

      AddCompilerFlag( "-std=c++11" )         

    endif( CUDA_FOUND )

else( WITH_CUDA STREQUAL "yes" )

   #AddCompilerFlag( "-std=gnu++0x -ftree-vectorizer-verbose=1" )       

   AddCompilerFlag( "-std=gnu++0x" )       

   AddCompilerFlag( "-std=c++11" )       

endif( WITH_CUDA STREQUAL "yes" )    



####

TODO

+7 −1
Original line number Diff line number Diff line 
TODO: Mesh

 * vsechny traits zkusit presunout do jednotneho MeshTraits, tj. temer MeshConfigTraits ale pojmenovat jako MeshTraits

 * omezit tnlDimesnionsTag - asi to ale nepujde

   - ale pozor na konstrukce jako BaseType::superentityIdsArray< SuperDimensionTag >( DimensionsTag ); ( v tnlMesh.h)

 * prejmenovat Tagy v topologies na Topology zrejme

 * zrusit tnlStorageTraits



TODO: v tnlMeshResolver se provadi preklad pro vsechny mozne sablonove parametry => prorezat



TODO: napsat FunctionDiscretizer pro jednotne rozhrani RightHandSide



TODO: doplnit mesh travelsals pro jine mesh entity nez cell

TODO: implementace maticovych resicu

      * Gaussova eliminace

      * SOR metoda

build

+28 −27
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ CMAKE_ONLY="no" 
HELP="no"

VERBOSE=""

ROOT_DIR="."

DCMTK_DIR="/usr/include/dcmtk"

BUILD_JOBS=`grep -c processor /proc/cpuinfo`



for option in "$@"
@@ -29,7 +30,7 @@ do 
        --with-cuda=*                    ) WITH_CUDA="${option#*=}" ;;

        --with-cublas=*                  ) WITH_CUBLAS="${option#*=}" ;;

        --with-cuda-arch=*               ) WITH_CUDA_ARCH="${option#*=}";;

        --with-templates-instantiation ) WITH_TEMPLATE_INSTANTIATION="${option#*=}" ;;

        --with-templates-instantiation=* ) WITH_TEMPLATE_INSTANTIATION="${option#*=}" ;;

        --instantiate-long-int=*         ) INSTANTIATE_LONG_INT="${option#*=}" ;;

        --instantiate-int=*              ) INSTANTIATE_INT="${option#*=}" ;;

        --instantiate-long-double=*      ) INSTANTIATE_LONG_DOUBLE="${option#*=}" ;;

examples/heat-equation/tnl-heat-equation-eoc.h

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include <problems/tnlHeatEquationEocRhs.h>

#include <problems/tnlHeatEquationEocProblem.h>



//typedef tnlDefaultBuildConfigTag BuildConfig;

//typedef tnlDefaultBuildMeshConfig BuildConfig;

typedef tnlFastBuildConfig BuildConfig;



template< typename ConfigTag >

template< typename MeshConfig >

class heatEquationEocConfig

{

   public:
@@ -47,7 +47,7 @@ template< typename Real, 
          typename Device,

          typename Index,

          typename MeshType,

          typename ConfigTag,

          typename MeshConfig,

          typename SolverStarter >

class heatEquationSetter

{