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

Merge branch 'diffusion'

parents 37d48f5e 4103cfe9

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

TODO

+16 −0
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: doladit vse s CUDA

TODO: doplnit mesh travelsals pro jine mesh entity nez cell

TODO: implementace maticovych resicu

      * Gaussova eliminace

      * SOR metoda

      * Jacobiho metoda

      * TFQMR metoda

      * IDR metody 





TODO: implementovat tridu tnlFileName pro generovani jmen souboru

examples/heat-equation/tnl-heat-equation.cpp

+7 −2
Original line number Diff line number Diff line
@@ -32,8 +32,13 @@ class heatEquationConfig 
   public:

      static void configSetup( tnlConfigDescription& config )

      {

         //config.addDelimiter( "Heat equation settings:" );

      }

         config.addDelimiter( "Heat equation settings:" );

         config.addEntry< tnlString >( "boundary-conditions-type", "Choose the boundary conditions type.", "dirichlet");

            config.addEntryEnum< tnlString >( "dirichlet" );

            config.addEntryEnum< tnlString >( "neumann" );

         config.addEntry< tnlString >( "boundary-conditions", "File with the values of the boundary conditions.", "boundary.tnl" );

         config.addEntry< tnlString >( "initial-condition", "File with the initial condition.", "initial.tnl");

      };

};



template< typename Real,

install

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=no

WITH_CUDA=yes

TEMPLATE_EXPLICIT_INSTANTIATION=yes

#VERBOSE="VERBOSE=1"

src/core/tnlAssert.h

+13 −9
Original line number Diff line number Diff line
@@ -33,11 +33,10 @@ using namespace std; 
#define tnlAssert( ___tnl__assert_condition, ___tnl__assert_command )                                    \

   if( ! ( ___tnl__assert_condition ) )                                                                  \

   {                                                                                                     \

   cerr << "Assertion '" << __STRING( ___tnl__assert_condition ) << "' failed !!!" << endl  \

             << "File: " << __FILE__ << endl                                                \

             << "Line: " << __LINE__ << endl                                                \

             << "Diagnostics: ";                                                            \

        ___tnl__assert_command;                                                             \

   printf( "Assertion '%s' failed !!! \n File: %s \n Line: %d \n Diagnostics: Not supported with CUDA.", \

           __STRING( ___tnl__assert_condition ),                                                         \

           __FILE__,                                                                                     \

           __LINE__ );                                                                                   \

        abort();                                                                                         \

   }

#else
@@ -61,6 +60,7 @@ using namespace std; 
 * Static assert

 */



#ifndef HAVE_CUDA // TODO: fix this when nvcc can compile it

// static_assert() available for g++ 4.3 or newer with -std=c++0x or -std=gnu++0x

#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)

#define CXX0X_STATIC_ASSERT_AVAILABLE
@@ -87,4 +87,8 @@ template<int x> struct static_assert_test{}; 


#endif // defined(CXX0X_STATIC_ASSERT_AVAILABLE)



#else

#define tnlStaticAssert(expression, msg)

#endif // ifndef HAVE_CUDA



#endif /* TNLASSERT_H_ */