OMEGA-CAP now uses LFC instead of LCL as the upper bound.

a-urq · Aug 18, 2023 · 2cf3749 · 2cf3749
1 parent 53fb6a5
commit 2cf3749
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/bin/com/ameliaWx/soundingViewer/SoundingFrame$SoundingGraphics.class b/bin/com/ameliaWx/soundingViewer/SoundingFrame$SoundingGraphics.class
diff --git a/bin/com/ameliaWx/soundingViewer/SoundingFrame$SoundingKeyListener.class b/bin/com/ameliaWx/soundingViewer/SoundingFrame$SoundingKeyListener.class
diff --git a/bin/com/ameliaWx/soundingViewer/SoundingFrame.class b/bin/com/ameliaWx/soundingViewer/SoundingFrame.class
diff --git a/src/com/ameliaWx/soundingViewer/SoundingFrame.java b/src/com/ameliaWx/soundingViewer/SoundingFrame.java
@@ -579,7 +579,7 @@ public SoundingFrame(String soundingSource, Sounding sounding0, DateTime time0,
 				omega0_3[i] = WeatherUtils.averageParameterOverLayer(activeSounding.getHeight(),
 						activeSounding.getWWind(), 0, 3000);
 				omegaCap[i] = WeatherUtils.averageParameterOverLayer(activeSounding.getHeight(),
-						activeSounding.getWWind(), 0, ml100Lcl[i]);
+						activeSounding.getWWind(), 0, ml100Lfc[i]);
 				omegaInflow[i] = WeatherUtils.averageParameterOverLayer(activeSounding.getHeight(),
 						activeSounding.getWWind(), inflowLayer[i][0], inflowLayer[i][1]);
 
@@ -1982,6 +1982,18 @@ private BufferedImage drawWinterReadouts(double scale) {
 //			System.out.println(brgn);
 //			System.out.println(bgRevised);
 //			System.out.println(bgRevExt);
+
+//			g.setColor(new Color(192, 192, 192));
+//			g.setFont(new Font(Font.MONOSPACED, Font.BOLD, (int) (9 * scale)));
+//			double surfacePressure = activeSounding.getPressureLevels()[activeSounding.getPressureLevels().length - 1];
+//			double surfaceHeight = activeSounding.getHeight()[activeSounding.getHeight().length - 1];
+//			double meltingEnergy = PtypeAlgorithms.meltingEnergy(activeSounding.getPressureLevels(),
+//					activeSounding.getTemperature(), activeSounding.getDewpoint(), activeSounding.getHeight(),
+//					surfacePressure, surfaceHeight);
+//			double refreezingEnergy = PtypeAlgorithms.refreezingEnergy(activeSounding.getPressureLevels(),
+//					activeSounding.getTemperature(), activeSounding.getDewpoint(), activeSounding.getHeight(),
+//					surfacePressure, surfaceHeight);
+//			g.drawString(String.format("%04.0fM/%04.0fF", meltingEnergy, refreezingEnergy), (int) (5 * scale), (int) (85 * scale));
 
 			return winterReadouts;
 		}