diff --git a/TTS.xcodeproj/project.pbxproj b/TTS.xcodeproj/project.pbxproj index 9e4f685..bb3159f 100644 --- a/TTS.xcodeproj/project.pbxproj +++ b/TTS.xcodeproj/project.pbxproj @@ -1334,6 +1334,7 @@ DEBUG, TTS_REMAP, TTS_OUTPUT, + TTS_REZONE, ); GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; diff --git a/TTS.xcodeproj/project.xcworkspace/xcuserdata/dongli.xcuserdatad/UserInterfaceState.xcuserstate b/TTS.xcodeproj/project.xcworkspace/xcuserdata/dongli.xcuserdatad/UserInterfaceState.xcuserstate index 27a187b..22dc801 100644 Binary files a/TTS.xcodeproj/project.xcworkspace/xcuserdata/dongli.xcuserdatad/UserInterfaceState.xcuserstate and b/TTS.xcodeproj/project.xcworkspace/xcuserdata/dongli.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TTS.xcodeproj/xcuserdata/dongli.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/TTS.xcodeproj/xcuserdata/dongli.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index 423a4fe..590f3e3 100644 --- a/TTS.xcodeproj/xcuserdata/dongli.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/TTS.xcodeproj/xcuserdata/dongli.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -332,7 +332,7 @@ continueAfterRunningActions = "No" symbolName = "List<EdgePointer>::remove(EdgePointer*)" urlString = "file://localhost/List.cpp" - timestampString = "356848590.291712" + timestampString = "357019252.625249" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "238" @@ -344,7 +344,7 @@ continueAfterRunningActions = "No" symbolName = "List<Edge>::remove(Edge*)" urlString = "file://localhost/List.cpp" - timestampString = "356848590.292197" + timestampString = "357019252.625495" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "238" @@ -356,7 +356,7 @@ continueAfterRunningActions = "No" symbolName = "List<Vertex>::remove(Vertex*)" urlString = "file://localhost/List.cpp" - timestampString = "356848590.292665" + timestampString = "357019252.625713" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "238" @@ -680,18 +680,5 @@ landmarkName = "DebugTools::dump_watched_polygon()" landmarkType = "5"> - - diff --git a/Tools/show_density.ncl b/Tools/show_density.ncl index 94978a1..34a3ca9 100644 --- a/Tools/show_density.ncl +++ b/Tools/show_density.ncl @@ -14,6 +14,9 @@ begin file_name_pattern = get_answer() file_names = systemfunc("ls "+file_name_pattern) + notice("Input test case:") + test_case = get_answer() + ; -------------------------------------------------------------------------- ; get tracer density variable names f = addfile(file_names(0), "r") @@ -58,9 +61,13 @@ begin file_names(l))+"_"+projection+"_"+density_name+"_density") ;gsn_define_colormap(wks, "wh-bl-gr-ye-re") - ;gsn_define_colormap(wks, "BlueYellowRed") + if (test_case .eq. "gamil") then + gsn_define_colormap(wks, "BlueYellowRed") + end if ;gsn_define_colormap(wks, "WhBlGrYeRe") - gsn_define_colormap(wks, "WhBlReWh") + if (test_case .eq. "mv") then + gsn_define_colormap(wks, "WhBlReWh") + end if f = addfile(file_names(l), "r") @@ -76,15 +83,22 @@ begin ;res@cnFillMode = "RasterFill" ; for GAMIL test - ;ranges = fspan(1.0e0, 2.0e+3, 21) - ;set_contour_range(res, ranges, "%5.2g") - ;res@lbLabelAngleF = 45.0 - ;res@pmLabelBarOrthogonalPosF = 0.15 + if (test_case .eq. "gamil") then + ranges = fspan(1.0e0, 2.0e+3, 21) + set_contour_range(res, ranges, "%5.2g") + res@lbLabelAngleF = 45.0 + res@pmLabelBarOrthogonalPosF = 0.15 + end if ; for deformation flow test ;set_contour_range(res, (/0.0,1.1,0.1/), "%4.2f") - set_contour_range(res, (/0.5,1.5,0.05/), "%4.2f") + ; for moving vortices test + if (test_case .eq. "mv") then + set_contour_range(res, (/0.5,1.5,0.05/), "%4.2f") + end if + + ; for solid rotation test ;set_contour_range(res, 0.0, 1000.0, 100.0, "%8.2f") ;res@gsnRightString = "min: "+sprintf("%4.2f", min(f->$density_name$))+", "+ \