separed solvers, mended errors in N-S right hand sides (12123fd1) · Commits · TNL / tnl-dev

src/Examples/flows/CMakeLists.txt

+83 −8

Original line number	Diff line number	Diff line
		#navier-stokes
		#navier-stokes-Lax-Friedrichs

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokes.cpp
		navierStokes.cu )
		navierStokesLaxFriedrichs.cpp
		navierStokesLaxFriedrichs.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes navierStokes.cu)
		target_link_libraries (tnl-navier-stokes ${CUSPARSE_LIBRARY} )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-Lax-Friedrichs navierStokesLaxFriedrichs.cu)
		target_link_libraries (tnl-navier-stokes-Lax-Friedrichs ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes navierStokes.cpp)
		ADD_EXECUTABLE(tnl-navier-stokes-Lax-Friedrichs navierStokesLaxFriedrichs.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes
		INSTALL( TARGETS tnl-navier-stokes-Lax-Friedrichs
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes
		INSTALL( FILES run-navier-stokes-Lax-Friedrichs
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

		#navier-stokes-Steger-Warming

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesStegerWarming.cpp
		navierStokesStegerWarming.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-Steger-Warming navierStokesStegerWarming.cu)
		target_link_libraries (tnl-navier-stokes-Steger-Warming ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-Steger-Warming navierStokesStegerWarming.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-Steger-Warming
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-Steger-Warming
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

		#navier-stokes-Van-Leer

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesVanLeer.cpp
		navierStokesVanLeer.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-Van-Leer navierStokesVanLeer.cu)
		target_link_libraries (tnl-navier-stokes-Van-Leer ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-Van-Leer navierStokesVanLeer.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-Van-Leer
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-Van-Leer
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

		#navier-stokes-AUSM-plus

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesAUSMPlus.cpp
		navierStokesAUSMPlus.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-AUSM-plus navierStokesAUSMPlus.cu)
		target_link_libraries (tnl-navier-stokes-AUSM-plus ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-AUSM-plus navierStokesAUSMPlus.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-AUSM-plus
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-AUSM-plus
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

src/Examples/flows/CMakeLists_separate.txt

0 → 100644

+101 −0

Original line number	Diff line number	Diff line
		#navier-stokes-Lax-Friedrichs

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesLaxFriedrichs.cpp
		navierStokesLaxFriedrichs.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-Lax-Friedrichs navierStokesLaxFriedrichs.cu)
		target_link_libraries (tnl-navier-stokes-Lax-Friedrichs ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-Lax-Friedrichs navierStokesLaxFriedrichs.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-Lax-Friedrichs
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-Lax-Friedrichs
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

		#navier-stokes-Steger-Warming

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesStegerWarming.cpp
		navierStokesStegerWarming.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-Steger-Warming navierStokesStegerWarming.cu)
		target_link_libraries (tnl-navier-stokes-Steger-Warming ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-Steger-Warming navierStokesStegerWarming.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-Steger-Warming
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-Steger-Warming
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

		#navier-stokes-Van-Leer

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesVanLeer.cpp
		navierStokesVanLeer.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-Van-Leer navierStokesVanLeer.cu)
		target_link_libraries (tnl-navier-stokes-Van-Leer ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-Van-Leer navierStokesVanLeer.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-Van-Leer
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-Van-Leer
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

		#navier-stokes-AUSM-plus

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokesAUSMPlus.cpp
		navierStokesAUSMPlus.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes-AUSM-plus navierStokesAUSMPlus.cu)
		target_link_libraries (tnl-navier-stokes-AUSM-plus ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes-AUSM-plus navierStokesAUSMPlus.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes-AUSM-plus
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes-AUSM-plus
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

src/Examples/flows/CMakeLists_together.txt

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		#navier-stokes

		set( tnl_flow_HEADERS
		CompressibleConservativeVariables.h )

		set( tnl_flow_SOURCES
		navierStokes.cpp
		navierStokes.cu )

		IF( BUILD_CUDA )
		CUDA_ADD_EXECUTABLE(tnl-navier-stokes navierStokes.cu)
		target_link_libraries (tnl-navier-stokes ${CUSPARSE_LIBRARY} )
		ELSE( BUILD_CUDA )
		ADD_EXECUTABLE(tnl-navier-stokes navierStokes.cpp)
		ENDIF( BUILD_CUDA )


		INSTALL( TARGETS tnl-navier-stokes
		RUNTIME DESTINATION bin
		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

		INSTALL( FILES run-navier-stokes
		${tnl_flow_SOURCES}
		DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/flow )

src/Examples/flows/DifferentialOperators/Navier-Stokes/Steger-Warming/StegerWarmingContinuity.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -357,12 +357,12 @@ class StegerWarmingContinuity< Meshes::Grid< 3, MeshReal, Device, MeshIndex >, O
		- this->negativeDensityFlux( u[ center ], velocity_x_center, pressure_center )
		+ this->negativeDensityFlux( u[ east ], velocity_x_east , pressure_east )
		)
		-hyInverse * (
		/* -hyInverse * (
		this->positiveDensityFlux( u[ center ], velocity_y_center, pressure_center )
		- this->positiveDensityFlux( u[ south ], velocity_y_south , pressure_south )
		- this->negativeDensityFlux( u[ center ], velocity_y_center, pressure_center )
		+ this->negativeDensityFlux( u[ north ], velocity_y_north , pressure_north )
		)
		)*/
		-hzInverse * (
		this->positiveDensityFlux( u[ center ], velocity_z_center, pressure_center )
		- this->positiveDensityFlux( u[ down ], velocity_z_down , pressure_down )

src/Examples/flows/DifferentialOperators/Navier-Stokes/Steger-Warming/StegerWarmingMomentumZ.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,7 @@ class StegerWarmingMomentumZ< Meshes::Grid< 3,MeshReal, Device, MeshIndex >, Ope
		const RealType& velocity_z_up = this->velocity.template getData< TNL::Devices::Host >()[ 2 ].template getData< DeviceType >()[ up ];
		const RealType& velocity_z_down = this->velocity.template getData< TNL::Devices::Host >()[ 2 ].template getData< DeviceType >()[ down ];

		return -hxInverse * (
		return 0-hxInverse * (
		this->positiveOtherMomentumFlux( density_center, velocity_z_center, velocity_x_center, pressure_center )
		- this->positiveOtherMomentumFlux( density_west , velocity_z_west , velocity_x_west , pressure_west )
		- this->negativeOtherMomentumFlux( density_center, velocity_z_center, velocity_x_center, pressure_center )