Merge branch 'master' of https://github.com/su2code/SU2_EDU

Francisco Palacios · Francisco Palacios · commit 2a42d64ebecd · 2014-11-08T20:41:43.000-08:00
diff --git a/SU2_EDU.xcodeproj/project.xcworkspace/xcshareddata/SU2_EDU.xccheckout b/SU2_EDU.xcodeproj/project.xcworkspace/xcshareddata/SU2_EDU.xccheckout
@@ -6,47 +6,31 @@
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>6D5D11E8-6E33-4789-8BF8-C17C56384A83</string>
-	<key>IDESourceControlProjectName</key>
-	<string>SU2_EDU</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>6548554E-BB85-4761-B037-2133F1DD5C23</key>
+		<key>8ED49EFD43ED82F1325A556C62D1386A078F1F30</key>
 		<string>https://github.com/su2code/SU2_EDU.git</string>
-		<key>BBE8543F-7310-4BF1-8900-530E7F1B2E85</key>
-		<string>https://github.com/su2code/SU2.git</string>
 	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>SU2_EDU.xcodeproj/project.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>6548554E-BB85-4761-B037-2133F1DD5C23</key>
-		<string>../..</string>
-		<key>BBE8543F-7310-4BF1-8900-530E7F1B2E85</key>
-		<string>../../../SU2/trunk</string>
+		<key>8ED49EFD43ED82F1325A556C62D1386A078F1F30</key>
+		<string>SU2_edu/</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>https://github.com/su2code/SU2_EDU.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>6548554E-BB85-4761-B037-2133F1DD5C23</string>
+	<string>8ED49EFD43ED82F1325A556C62D1386A078F1F30</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>6548554E-BB85-4761-B037-2133F1DD5C23</string>
+			<string>8ED49EFD43ED82F1325A556C62D1386A078F1F30</string>
 			<key>IDESourceControlWCCName</key>
-			<string>SU2_EDU</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>BBE8543F-7310-4BF1-8900-530E7F1B2E85</string>
-			<key>IDESourceControlWCCName</key>
-			<string>trunk</string>
+			<string>SU2_edu</string>
 		</dict>
 	</array>
 </dict>
diff --git a/SU2_EDU.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_EDU.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/bin/ConfigFile_RANS.cfg b/bin/ConfigFile_RANS.cfg
@@ -17,24 +17,24 @@ PHYSICAL_PROBLEM= NAVIER_STOKES
 % Specify turbulence model (NONE, SA, SST)
 KIND_TURB_MODEL= SA
 
-% -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%
+% -------------------- COMPRESSIBLE FREE-STREAM definition --------------------%
 %
 % Mach number (non-dimensional)
-MACH_NUMBER= 0.2
+MACH_NUMBER= 0.7
 %
 % Reynolds number (non-dimensional)
-REYNOLDS_NUMBER= 5.0E6
+REYNOLDS_NUMBER= 1.0E6
 %
 % Angle of attack (in degrees)
-AoA= 5.0
+AoA= 3.0
 %
 % Free-stream temperature (in degrees Kelvin)
 FREESTREAM_TEMPERATURE= 288.150
 
 % ------------------------ NUMERICAL METHOD DEFINITION ------------------------%
 %
 % Courant-Friedrichs-Lewy condition (reduce this number if the code diverges)
-CFL_NUMBER= 10.0
+CFL_NUMBER= 5.0
 %
 % Convective numerical method (JST, ROE)
 CONV_NUM_METHOD_FLOW= ROE
diff --git a/src/SU2_EDU.cpp b/src/SU2_EDU.cpp
@@ -134,6 +134,12 @@ int main(int argc, char *argv[]) {
   
   cout << endl <<"------------------------- Solver Preprocessing --------------------------" << endl;
   
+  /*--- Computation of wall distances for turbulence modeling ---*/
+  
+  if (config_container->GetKind_Solver() == RANS) {
+    geometry_container[MESH_0]->ComputeWall_Distance(config_container);
+  }
+  
   /*--- Definition of the solver class: solver_container[#MG_GRIDS][#EQ_SYSTEMS].
    The solver classes are specific to a particular set of governing equations,
    and they contain the subroutines with instructions for computing each spatial
diff --git a/src/config_structure.cpp b/src/config_structure.cpp
@@ -1736,7 +1736,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     nMG_PreSmooth = nMultiLevel+1;
     MG_PreSmooth = new unsigned short[nMG_PreSmooth];
     for (unsigned int i = 0; i < nMG_PreSmooth; i++)
-      MG_PreSmooth[i] = i+1;
+      MG_PreSmooth[i] = 1;
   }
   
   if ((nMG_PostSmooth != nMultiLevel+1) && (nMG_PostSmooth != 0)) {

Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,24 @@ PHYSICAL_PROBLEM= NAVIER_STOKES`
`17`	`17`	`% Specify turbulence model (NONE, SA, SST)`
`18`	`18`	`KIND_TURB_MODEL= SA`
`19`	`19`
`20`		`-% -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------%`
	`20`	`+% -------------------- COMPRESSIBLE FREE-STREAM definition --------------------%`
`21`	`21`	`%`
`22`	`22`	`% Mach number (non-dimensional)`
`23`		`-MACH_NUMBER= 0.2`
	`23`	`+MACH_NUMBER= 0.7`
`24`	`24`	`%`
`25`	`25`	`% Reynolds number (non-dimensional)`
`26`		`-REYNOLDS_NUMBER= 5.0E6`
	`26`	`+REYNOLDS_NUMBER= 1.0E6`
`27`	`27`	`%`
`28`	`28`	`% Angle of attack (in degrees)`
`29`		`-AoA= 5.0`
	`29`	`+AoA= 3.0`
`30`	`30`	`%`
`31`	`31`	`% Free-stream temperature (in degrees Kelvin)`
`32`	`32`	`FREESTREAM_TEMPERATURE= 288.150`
`33`	`33`
`34`	`34`	`% ------------------------ NUMERICAL METHOD DEFINITION ------------------------%`
`35`	`35`	`%`
`36`	`36`	`% Courant-Friedrichs-Lewy condition (reduce this number if the code diverges)`
`37`		`-CFL_NUMBER= 10.0`
	`37`	`+CFL_NUMBER= 5.0`
`38`	`38`	`%`
`39`	`39`	`% Convective numerical method (JST, ROE)`
`40`	`40`	`CONV_NUM_METHOD_FLOW= ROE`
Original file line number	Diff line number	Diff line change
`@@ -1736,7 +1736,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_`
`1736`	`1736`	`nMG_PreSmooth = nMultiLevel+1;`
`1737`	`1737`	`MG_PreSmooth = new unsigned short[nMG_PreSmooth];`
`1738`	`1738`	`for (unsigned int i = 0; i < nMG_PreSmooth; i++)`
`1739`		`- MG_PreSmooth[i] = i+1;`
	`1739`	`+ MG_PreSmooth[i] = 1;`
`1740`	`1740`	`}`
`1741`	`1741`
`1742`	`1742`	`if ((nMG_PostSmooth != nMultiLevel+1) && (nMG_PostSmooth != 0)) {`