diff --git a/bin/com/ameliaWx/radarView/RadarView$1.class b/bin/com/ameliaWx/radarView/RadarView$1.class index 525879d..677c70a 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$1.class and b/bin/com/ameliaWx/radarView/RadarView$1.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$2.class b/bin/com/ameliaWx/radarView/RadarView$2.class index c506677..0f1662a 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$2.class and b/bin/com/ameliaWx/radarView/RadarView$2.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$3.class b/bin/com/ameliaWx/radarView/RadarView$3.class index 23da574..6dbdc88 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$3.class and b/bin/com/ameliaWx/radarView/RadarView$3.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$4.class b/bin/com/ameliaWx/radarView/RadarView$4.class index 1736fe1..f688ee1 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$4.class and b/bin/com/ameliaWx/radarView/RadarView$4.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$AnimateThread$1.class b/bin/com/ameliaWx/radarView/RadarView$AnimateThread$1.class index 65087e3..7b35c85 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$AnimateThread$1.class and b/bin/com/ameliaWx/radarView/RadarView$AnimateThread$1.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$AnimateThread.class b/bin/com/ameliaWx/radarView/RadarView$AnimateThread.class index 058343b..43f76dd 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$AnimateThread.class and b/bin/com/ameliaWx/radarView/RadarView$AnimateThread.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread$1.class b/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread$1.class index f1d5a84..2554cea 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread$1.class and b/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread$1.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread.class b/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread.class index d20ff53..d44fd31 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread.class and b/bin/com/ameliaWx/radarView/RadarView$CheckOnlineThread.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVGraphics.class b/bin/com/ameliaWx/radarView/RadarView$RVGraphics.class index a5e59c5..fa7238b 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVGraphics.class and b/bin/com/ameliaWx/radarView/RadarView$RVGraphics.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$1.class b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$1.class index f3ca260..0d1315c 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$1.class and b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$1.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$2.class b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$2.class index cfad55f..db82bfd 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$2.class and b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$2.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$3.class b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$3.class index 9345049..b9494f7 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$3.class and b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener$3.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener.class b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener.class index 0c0adf2..ad49e3f 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVKeyListener.class and b/bin/com/ameliaWx/radarView/RadarView$RVKeyListener.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$1.class b/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$1.class index 86a3792..f649f51 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$1.class and b/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$1.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$2.class b/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$2.class index 592ea6a..695c2ec 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$2.class and b/bin/com/ameliaWx/radarView/RadarView$RVMouseListener$2.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVMouseListener.class b/bin/com/ameliaWx/radarView/RadarView$RVMouseListener.class index d48652a..1871a2f 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVMouseListener.class and b/bin/com/ameliaWx/radarView/RadarView$RVMouseListener.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVMouseMotionListener.class b/bin/com/ameliaWx/radarView/RadarView$RVMouseMotionListener.class index 75d6998..1395596 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVMouseMotionListener.class and b/bin/com/ameliaWx/radarView/RadarView$RVMouseMotionListener.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RVMouseWheelListener.class b/bin/com/ameliaWx/radarView/RadarView$RVMouseWheelListener.class index 80ed33d..bbaabf8 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RVMouseWheelListener.class and b/bin/com/ameliaWx/radarView/RadarView$RVMouseWheelListener.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$1.class b/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$1.class index 6bf9476..7928052 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$1.class and b/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$1.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$RefreshWorkerThread.class b/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$RefreshWorkerThread.class index 8e51148..556dec4 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$RefreshWorkerThread.class and b/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread$RefreshWorkerThread.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread.class b/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread.class index fa8412c..a8c91f8 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread.class and b/bin/com/ameliaWx/radarView/RadarView$RefreshTimerThread.class differ diff --git a/bin/com/ameliaWx/radarView/RadarView.class b/bin/com/ameliaWx/radarView/RadarView.class index 4fa26d5..e1d243c 100644 Binary files a/bin/com/ameliaWx/radarView/RadarView.class and b/bin/com/ameliaWx/radarView/RadarView.class differ diff --git a/bin/com/ameliaWx/radarView/nwpModel/RapInterpModel.class b/bin/com/ameliaWx/radarView/nwpModel/RapInterpModel.class index 1cd1253..963e1e4 100644 Binary files a/bin/com/ameliaWx/radarView/nwpModel/RapInterpModel.class and b/bin/com/ameliaWx/radarView/nwpModel/RapInterpModel.class differ diff --git a/src/com/ameliaWx/radarView/RadarView.java b/src/com/ameliaWx/radarView/RadarView.java index 255461e..4d3dd0e 100644 --- a/src/com/ameliaWx/radarView/RadarView.java +++ b/src/com/ameliaWx/radarView/RadarView.java @@ -55,6 +55,7 @@ import com.ameliaWx.radarView.nwpModel.LambertConformalProjection; import com.ameliaWx.radarView.nwpModel.NwpField; +import com.ameliaWx.radarView.nwpModel.PtypeAlgorithm; import com.ameliaWx.radarView.nwpModel.RapInterpModel; import com.ameliaWx.radarView.nwpModel.RapModel; import com.ameliaWx.radarView.srtm.SrtmModel2; @@ -1471,6 +1472,24 @@ public void run() { g.repaint(); + break; + case KeyEvent.VK_P: + DateTime scanTime = radarData[chosenTimestep].getScanTime(); + double westLon = centralLon - ((g.getWidth() - 200) / 2) / pixelsPerDegree; + double eastLon = centralLon + ((g.getWidth() - 200) / 2) / pixelsPerDegree; + double northLat = centralLat + ((g.getHeight()) / 2) / pixelsPerDegree; + double southLat = centralLat - ((g.getHeight()) / 2) / pixelsPerDegree; + + double lon = linScale(0, g.getWidth() - 200, westLon, eastLon, mx); + double lat = linScale(0, g.getHeight(), northLat, southLat, my); + + double srtmElev = srtm.getElevation(lat, lon); + + if(scanTime.isAfter(time1)) { + modelI1.getPrecipitationType(scanTime, lat, lon, PtypeAlgorithm.BOURGOUIN_REVISED_EXTENDED, true, srtmElev, true); + } else { + modelI0.getPrecipitationType(scanTime, lat, lon, PtypeAlgorithm.BOURGOUIN_REVISED_EXTENDED, true, srtmElev, true); + } break; case KeyEvent.VK_R: if (e.isControlDown()) { diff --git a/src/com/ameliaWx/radarView/nwpModel/RapInterpModel.java b/src/com/ameliaWx/radarView/nwpModel/RapInterpModel.java index a085420..c524dd9 100644 --- a/src/com/ameliaWx/radarView/nwpModel/RapInterpModel.java +++ b/src/com/ameliaWx/radarView/nwpModel/RapInterpModel.java @@ -87,6 +87,11 @@ public int getPrecipitationType(DateTime time, double latitude, double longitude // rewrite to use getDataForPtypesAsArray public int getPrecipitationType(DateTime time, double latitude, double longitude, PtypeAlgorithm algo, boolean dynamicInitLayer, double srtmElev) { + return getPrecipitationType(time, latitude, longitude, algo, dynamicInitLayer, srtmElev, false); + } + + public int getPrecipitationType(DateTime time, double latitude, double longitude, PtypeAlgorithm algo, + boolean dynamicInitLayer, double srtmElev, boolean debug) { // HashMap tmpProfile = getData(time, latitude, longitude); if (model1.getData(0, latitude, longitude, NwpField.TMP_2M) != -1024.0) { float timeNormalized = getTimeInterpWeight(time); @@ -149,6 +154,8 @@ public int getPrecipitationType(DateTime time, double latitude, double longitude // System.out.println(hgtSurface/100 + " m"); // System.out.println(tmpSurface/100 + " K"); // System.out.print("pre\t"); + + if(debug) System.out.println("ptype debug on"); PrecipitationType ptype = PrecipitationType.RAIN; switch (algo) { @@ -160,7 +167,7 @@ public int getPrecipitationType(DateTime time, double latitude, double longitude break; case BOURGOUIN_REVISED_EXTENDED: ptype = PtypeAlgorithms.bourgouinRevisedExtendedMethod(pressureLevels, tmpIsobaric, dptIsobaric, - hgtIsobaric, presSurface, hgtSurface, tmpSurface, dynamicInitLayer); + hgtIsobaric, presSurface, hgtSurface, tmpSurface, dynamicInitLayer, debug); break; case URQUHART_EXPERIMENTAL: break;