Diffusion ConSol 319a1e34da67

ConSol into 2DHybrid
319a1e34da67
Actions

Authored by moenkeberg on Mar 12 2020, 15:50.

Description

Merge branch '2DHybrid' of https://c4science.ch/source/ConSol into 2DHybrid

Details

Committed

moenkeberg

Mar 12 2020, 15:50

Pushed

moenkeberg

Mar 23 2020, 10:19

Parents

R3721:15aac89441bb: new git ignore file
R3721:64e0a15269e5: fix cweno method

Branches

Unknown

Tags

Unknown

Event Timeline

moenkeberg committed R3721:319a1e34da67: Merge branch '2DHybrid' of https://c4science.ch/source/ConSol into 2DHybrid (authored by moenkeberg).Mar 12 2020, 15:50

Merged Changes

	Commit			Author	Details	Committed
	64e0a15269e5			moenkeberg	fix cweno method	Mar 4 2020

Changes (40)

		Path
M		.gitignore
M		ConSol/ConSol/Reconstr/InterpolationBase/Multiquadratics_2D_CWENO.cpp
A	(dir)	ConSol/Examples/HybridTest/Airfoil/Results/
P		ConSol/Examples/HybridTest/Airfoil/Results/NACA0012.geo Copied from ConSol/Examples/HybridTest/Airfoil/NACA0012.geo
P		ConSol/Examples/HybridTest/Airfoil/Results/paramAF.in Copied from ConSol/Examples/HybridTest/Airfoil/paramAF.in
A	(dir)	ConSol/Examples/HybridTest/AxisymmNozzle/MRWENOc/
P		ConSol/Examples/HybridTest/AxisymmNozzle/MRWENOc/nozzle1_b_test2_ref.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_b_test2_ref.geo
A	(dir)	ConSol/Examples/HybridTest/AxisymmNozzle/Results/
P		ConSol/Examples/HybridTest/AxisymmNozzle/Results/nozzle1_bref3.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3.geo
P		ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_new.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
P		ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test0.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
A		ConSol/Examples/HybridTest/AxisymmNozzle/pts.geo
A	(dir)	ConSol/Examples/HybridTest/DMR/CWENO/
P		ConSol/Examples/HybridTest/DMR/CWENO/DoubleMachReflection_std.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo
P		ConSol/Examples/HybridTest/DMR/DoubleMachReflection_hybrid.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection.geo
A	(dir)	ConSol/Examples/HybridTest/DMR/MR_WENO/
P		ConSol/Examples/HybridTest/DMR/MR_WENO/DoubleMachReflection_std.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo
A	(dir)	ConSol/Examples/HybridTest/DMR/unstructuredRes/
P		ConSol/Examples/HybridTest/DMR/unstructuredRes/DMR_41140_front2D.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection4.geo
P		ConSol/Examples/HybridTest/DMR/unstructuredRes/DMR_5486.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection3.geo
P		ConSol/Examples/HybridTest/DMR/unstructuredRes/DMR_5486_otf3.in Copied from ConSol/Examples/HybridTest/DMR/paramDMR.in
P		ConSol/Examples/HybridTest/DMR/unstructuredRes/DMR_9380_auto_otf3.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection_std.geo
A	(dir)	ConSol/Examples/HybridTest/Nozzle/40PlugNozzle/
P		ConSol/Examples/HybridTest/Nozzle/40PlugNozzle/nozzle1_bref.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref.geo
A	(dir)	ConSol/Examples/HybridTest/Nozzle/Results/
P		ConSol/Examples/HybridTest/Nozzle/Results/nozzle1_b_test2_ref_tot.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_b_test2_ref_tot.geo
P		ConSol/Examples/HybridTest/Nozzle/nozzle1_bref3_test.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3.geo
P		ConSol/Examples/HybridTest/Nozzle/nozzle1_bref3_test0.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
P		ConSol/Examples/HybridTest/Nozzle/nozzle1_bref_test.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
P		ConSol/Examples/HybridTest/Nozzle/nozzle1_bref_test_ref.geo Copied from ConSol/Examples/HybridTest/AxisymmNozzle/nozzle1_bref3_test.geo
A		ConSol/Examples/HybridTest/Nozzle/pts.geo
A		ConSol/Examples/HybridTest/Nozzle_QUAD_test/nozzle_test.geo
A		ConSol/Examples/HybridTest/Nozzle_QUAD_test/nozzle_test2.geo
A		ConSol/Examples/HybridTest/Nozzle_QUAD_test/nozzle_test3.geo
A	(dir)	ConSol/Examples/HybridTest/ShockVortex/CWENO/
P		ConSol/Examples/HybridTest/ShockVortex/CWENO/shockVortex3.geo Copied from ConSol/Examples/HybridTest/ShockVortex/shockVortex3.geo
P		ConSol/Examples/HybridTest/ShockVortex/shockVortex3QUADb.geo Copied from ConSol/Examples/HybridTest/ShockVortex/shockVortex3QUAD.geo
A		ConSol/Examples/HybridTest/ShockVortex/shockVortex4QUAD.geo
P		ConSol/Examples/HybridTest/burgers/BaseTriple2QUADtest.geo Copied from ConSol/Examples/HybridTest/burgers/BaseTriple2QUAD.geo
P		ConSol/Examples/euler/DoubleMachReflection/article/DMR_41140_front2D.geo Copied from ConSol/Examples/HybridTest/DMR/DoubleMachReflection4.geo