Merge pull request #583 from tiffanycmeyer13/unidata_20.3.2
Brought over changes MJ had made for GFE to work with Thin Client
This commit is contained in:
srcarter3
GitHub
commit
8e7bcc5491
2 changed files with 78 additions and 86 deletions
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
package com.raytheon.viz.gfe.core.internal;
|
||||
|
||||
import java.io.File;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -169,6 +170,8 @@ import com.raytheon.viz.gfe.types.MutableInteger;
|
|||
* Jan 04, 2018 7178 randerso Removed deallocateUnusedGrids. Code cleanup
|
||||
* Jan 24, 2018 7153 randerso Changes to allow new GFE config file to be
|
||||
* selected when perspective is re-opened.
|
||||
* Feb 01, 2019 ---- mjames Use only BASE level for now/dev.
|
||||
* Feb 04, 2019 ---- mjames Force sync of python files required by GFE perspective.
|
||||
* Feb 28, 2018 7116 randerso Force time range to be recalculated when
|
||||
* simulated time is changed.
|
||||
* Dec 11, 2018 7692 dgilling Add additional debug logging to track VCParm
|
||||
|
|
@ -2898,24 +2901,48 @@ public class ParmManager
|
|||
private List<VCModule> initVirtualCalcParmDefinitions() {
|
||||
// retrieve the inventory from the ifpServer
|
||||
IPathManager pathMgr = PathManagerFactory.getPathManager();
|
||||
LocalizationContext[] contexts = new LocalizationContext[] {
|
||||
pathMgr.getContext(LocalizationType.COMMON_STATIC,
|
||||
LocalizationLevel.BASE),
|
||||
pathMgr.getContext(LocalizationType.COMMON_STATIC,
|
||||
LocalizationLevel.SITE),
|
||||
pathMgr.getContext(LocalizationType.COMMON_STATIC,
|
||||
LocalizationLevel.USER) };
|
||||
|
||||
Map<String, LocalizationFile> modMap = new HashMap<>();
|
||||
for (LocalizationContext context : contexts) {
|
||||
|
||||
LocalizationContext context = pathMgr.getContext(
|
||||
LocalizationType.COMMON_STATIC,
|
||||
LocalizationLevel.BASE);
|
||||
|
||||
// vcmodule files
|
||||
LocalizationFile[] files = pathMgr.listFiles(context,
|
||||
FileUtil.join("gfe", "vcmodule"), new String[] { "py" },
|
||||
"gfe/vcmodule", new String[] { "py" },
|
||||
false, true);
|
||||
for (LocalizationFile lf : files) {
|
||||
String modName = LocalizationUtil.extractName(lf.getPath())
|
||||
.replace(".py", "");
|
||||
modMap.put(modName, lf);
|
||||
}
|
||||
|
||||
String[] syncPaths = {
|
||||
"python",
|
||||
"python/time",
|
||||
"python/dataaccess",
|
||||
"gfe/vcmodule",
|
||||
"gfe/vcmodule/utility",
|
||||
"gfe/python",
|
||||
"gfe/textproducts/templates/product",
|
||||
"gfe/textproducts/templates",
|
||||
"gfe/textproducts",
|
||||
"vtec"
|
||||
};
|
||||
|
||||
for (String path : syncPaths){
|
||||
LocalizationFile[] baseGfeFiles = pathMgr.listFiles(context,
|
||||
path, new String[] {"py" },
|
||||
false, true);
|
||||
for (LocalizationFile lf : baseGfeFiles) {
|
||||
try {
|
||||
File pyFile = lf.getFile(true);
|
||||
} catch (LocalizationException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<VCModule> definitions = new ArrayList<>(modMap.size());
|
||||
|
|
|
|||
|
|
@ -1,36 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<!--
|
||||
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
|
||||
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
|
||||
|
||||
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
|
||||
This_software_product_contains_export-restricted_data_whose
|
||||
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
|
||||
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
|
||||
an_export_license_or_other_authorization.
|
||||
|
||||
Contractor_Name:________Raytheon_Company
|
||||
Contractor_Address:_____6825_Pine_Street,_Suite_340
|
||||
________________________Mail_Stop_B8
|
||||
________________________Omaha,_NE_68106
|
||||
________________________402.291.0100
|
||||
|
||||
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
|
||||
further_licensing_information.
|
||||
-->
|
||||
|
||||
<!--
|
||||
This is an incremental override file, indicating that the files at
|
||||
different localization levels will be combined. Since all the files in
|
||||
the directory are read, for most custom additions a unique file should
|
||||
be added to the directory instead of overriding a specific file.
|
||||
-->
|
||||
<aliasList caseSensitive="true" namespace="gfeParamInfo">
|
||||
<alias base="MOSGuide-HI">mosGuideNDFD</alias>
|
||||
<alias base="GFS217">gfs20km</alias>
|
||||
<alias base="GFS215">gfs20km</alias>
|
||||
<alias base="AK-GFS22">gfs20km</alias>
|
||||
<alias base="GFS20">gfs20km</alias>
|
||||
<alias base="GFS20-PAC">gfs20km</alias>
|
||||
<alias base="GFS20-PRICO">gfs20km</alias>
|
||||
<alias base="PR-GFS">gfs20km</alias>
|
||||
<alias base="estofsAK">ESTOFS</alias>
|
||||
<alias base="estofsEP">ESTOFS</alias>
|
||||
<alias base="estofsHI">ESTOFS</alias>
|
||||
|
|
@ -39,6 +11,7 @@
|
|||
<alias base="GLERL">glerl</alias>
|
||||
<alias base="GLWN">GRLKwave</alias>
|
||||
<alias base="MPE-Local">localMPE</alias>
|
||||
<alias base="MPE-Mosaic">mosaicMPE</alias>
|
||||
<alias base="HPE">localHPE</alias>
|
||||
<alias base="HRRR">HRRR</alias>
|
||||
<alias base="HWRF">HWRF</alias>
|
||||
|
|
@ -72,16 +45,15 @@
|
|||
<alias base="MRF26">mrf202</alias>
|
||||
<alias base="GFS201">gfs201</alias>
|
||||
<alias base="mrfNH">mrf201</alias>
|
||||
<alias base="GFS213">gfs213</alias>
|
||||
<alias base="GFS95">gfs95</alias>
|
||||
<alias base="AVN211">avn211</alias>
|
||||
<alias base="mesoEta212">mesoEta212</alias>
|
||||
<alias base="mesoEta215">mesoEta215</alias>
|
||||
<alias base="ETA212">eta212</alias>
|
||||
<alias base="NAM20">NAM20</alias>
|
||||
<alias base="NAM40">eta212</alias>
|
||||
<alias base="AVN203">avn203</alias>
|
||||
<alias base="MRF203">mrf203</alias>
|
||||
<alias base="MRF204">mrf204</alias>
|
||||
<alias base="MRF205">mrf205</alias>
|
||||
<alias base="ETA207">eta207</alias>
|
||||
<alias base="AK-NAM95">eta207</alias>
|
||||
<alias base="AVN-NorthernHemisphere">avnNH</alias>
|
||||
<alias base="AVN37">avnNH</alias>
|
||||
<alias base="AVN38">avnNH</alias>
|
||||
|
|
@ -91,7 +63,7 @@
|
|||
<alias base="AVN42">avnNH</alias>
|
||||
<alias base="AVN43">avnNH</alias>
|
||||
<alias base="AVN44">avnNH</alias>
|
||||
<alias base="GWW233">gww233</alias>
|
||||
<alias base="WaveWatch">gww233</alias>
|
||||
<alias base="GWW21">gww233</alias>
|
||||
<alias base="GWW22">gww233</alias>
|
||||
<alias base="GWW23">gww233</alias>
|
||||
|
|
@ -100,31 +72,25 @@
|
|||
<alias base="SeaIce220">seaIce219</alias>
|
||||
<alias base="SeaIce173">seaIce219</alias>
|
||||
<alias base="SeaIce235">seaIce219</alias>
|
||||
<alias base="RUC236">ruc236</alias>
|
||||
<alias base="RAP40">rap40</alias>
|
||||
<alias base="AVN225">avn225</alias>
|
||||
<alias base="AKWAVE239">akWave239</alias>
|
||||
<alias base="WNAWAVE238">wnaWave238</alias>
|
||||
<alias base="mesoEta216">mesoEta216</alias>
|
||||
<alias base="ETA218">eta218</alias>
|
||||
<alias base="ETA242">eta242</alias>
|
||||
<alias base="AK-NAM11">eta242</alias>
|
||||
<alias base="ENPWAVE253">enpWave253</alias>
|
||||
<alias base="HurWind226">TPCtcm226</alias>
|
||||
<alias base="HurWind175">TPCtcm175</alias>
|
||||
<alias base="HurWind250">TPCtcm250</alias>
|
||||
<alias base="HurWind175">TCPtcm175</alias>
|
||||
<alias base="HurWind250">TPCtpm250</alias>
|
||||
<alias base="NICICE">nic218</alias>
|
||||
<alias base="AK-NICICE">nic242</alias>
|
||||
<alias base="DGEX185">dgex185</alias>
|
||||
<alias base="DGEX186">dgex186</alias>
|
||||
<alias base="GFS212">gfs212</alias>
|
||||
<alias base="GFS40">gfs212</alias>
|
||||
<alias base="GFS160">gfs160</alias>
|
||||
<alias base="GFS254">gfs254</alias>
|
||||
<alias base="GFS161">gfs161</alias>
|
||||
<alias base="GFS199">gfs161</alias>
|
||||
<alias base="RUC130">ruc130</alias>
|
||||
<alias base="RAP13">ruc130</alias>
|
||||
<alias base="RTMA25">rtmaNDFD</alias>
|
||||
<alias base="URMA25">urmaNDFD</alias>
|
||||
<alias base="URMA25-EP">urmaNDFD</alias>
|
||||
<alias base="URMA25-SJU">urmaNDFD</alias>
|
||||
<!-- <alias base="URMA25">urmaNDFD</alias> -->
|
||||
<alias base="namdng25">NamDNG</alias>
|
||||
<alias base="GlobalWave">GlobalWave</alias>
|
||||
<alias base="AKwave10">AKwave10</alias>
|
||||
|
|
@ -137,22 +103,22 @@
|
|||
<alias base="AK-NamDNG3">NamDNG</alias>
|
||||
<alias base="HI-NamDNG5">NamDNG</alias>
|
||||
<alias base="PR-NamDNG5">NamDNG</alias>
|
||||
<alias base="HiResW-ARW-East">HiResW</alias>
|
||||
<alias base="HiResW-ARW-West">HiResW</alias>
|
||||
<alias base="HiResW-ARW-AK">HiResW</alias>
|
||||
<alias base="HiResW-ARW-SJU">HiResW</alias>
|
||||
<alias base="HiResW-ARW-HI">HiResW</alias>
|
||||
<alias base="HiResW-ARW-GU">HiResW</alias>
|
||||
<alias base="HiResW-NMM-East">HiResW</alias>
|
||||
<alias base="HiResW-NMM-West">HiResW</alias>
|
||||
<alias base="HiResW-NMM-AK">HiResW</alias>
|
||||
<alias base="HiResW-NMM-SJU">HiResW</alias>
|
||||
<alias base="HiResW-NMM-HI">HiResW</alias>
|
||||
<alias base="HiResW-NMM-GU">HiResW</alias>
|
||||
<alias base="HiResW-ARW-East">HiResW-arwEast</alias>
|
||||
<alias base="HiResW-ARW-West">HiResW-arwWest</alias>
|
||||
<alias base="HiResW-ARW-AK">HiResW-arwAK</alias>
|
||||
<alias base="HiResW-ARW-SJU">HiResW-arwSJU</alias>
|
||||
<alias base="HiResW-ARW-HI">HiResW-arwHI</alias>
|
||||
<alias base="HiResW-ARW-GU">HiResW-arwGU</alias>
|
||||
<alias base="HiResW-NMM-East">HiResW-nmmEast</alias>
|
||||
<alias base="HiResW-NMM-West">HiResW-nmmWest</alias>
|
||||
<alias base="HiResW-NMM-AK">HiResW-nmmAK</alias>
|
||||
<alias base="HiResW-NMM-SJU">HiResW-nmmSJU</alias>
|
||||
<alias base="HiResW-NMM-HI">HiResW-nmmHI</alias>
|
||||
<alias base="HiResW-NMM-GU">HiResW-nmmGU</alias>
|
||||
<alias base="GRLKwave">GRLKwave</alias>
|
||||
<alias base="MSAS">msas</alias>
|
||||
<alias base="GFSSouthernHemisphere">gfs201</alias>
|
||||
<alias base="mesoEta237">eta218</alias>
|
||||
<alias base="PR-NAM">NAM12</alias>
|
||||
<alias base="ENSEMBLE">ensembleNH</alias>
|
||||
<alias base="ENSEMBLE37">ensembleNH</alias>
|
||||
<alias base="ENSEMBLE38">ensembleNH</alias>
|
||||
|
|
@ -165,7 +131,7 @@
|
|||
<alias base="SREF212">sref212</alias>
|
||||
<alias base="SREF216">sref216</alias>
|
||||
<alias base="SREF243">sref243</alias>
|
||||
<alias base="RTGSST">rtgsst235</alias>
|
||||
<alias base="RTGSST">RTGSST235</alias>
|
||||
<alias base="GFSGuide">gfsGuide232</alias>
|
||||
<alias base="AK-RTMA3">OCONUSrtmaNDFD</alias>
|
||||
<alias base="HI-RTMA">OCONUSrtmaNDFD</alias>
|
||||
|
|
@ -174,7 +140,7 @@
|
|||
<alias base="RTGSSTHR">rtgssthr173</alias>
|
||||
<alias base="RFCqpf">qpf218</alias>
|
||||
<alias base="HPCqpf">hpc_qpf218</alias>
|
||||
<alias base="HPCGuide">hpcGuideNDFD</alias>
|
||||
<!-- <alias base="HPCGuide">hpcGuideNDFD</alias> -->
|
||||
<alias base="HPCGuide-AK">hpcGuideNDFD</alias>
|
||||
<alias base="HPCqpfNDFD">HPCqpfNDFD</alias>
|
||||
<alias base="OPCWave180">opcWave180</alias>
|
||||
|
|
@ -188,16 +154,14 @@
|
|||
<alias base="TPCWindProb">tpcWind231</alias>
|
||||
<alias base="TPCWindProb_Prelim">tpcWind231</alias>
|
||||
<alias base="OPCWave182">opcWave182</alias>
|
||||
<alias base="MOSGuide">mosGuideNDFD</alias>
|
||||
<alias base="MOSGuide-AK">mosGuideNDFD_AK</alias>
|
||||
<alias base="GFSLAMPGrid">lampNDFD</alias>
|
||||
<alias base="TPCSurgeProb">TPCSurgeProb</alias>
|
||||
<alias base="TPCSurgeProb197">TPCSurgeProb</alias>
|
||||
<alias base="TPCSurgeProb-AK">TPCSurgeProb</alias>
|
||||
<alias base="TPCSurgeProbLoRes">TPCSurgeProb</alias>
|
||||
<alias base="P-ETSS">P-ETSS</alias>
|
||||
<!-- <alias base="P-ETSS">P-ETSS</alias>
|
||||
<alias base="P-ETSS-LoRes">P-ETSS</alias>
|
||||
<alias base="P-ETSS-AK">P-ETSS</alias>
|
||||
<alias base="P-ETSS-AK">P-ETSS</alias>-->
|
||||
<alias base="ecmwf">ecmwf</alias>
|
||||
<alias base="ECMWFHiRes">ecmwf</alias>
|
||||
<alias base="ECMWF-HiRes">ecmwf</alias>
|
||||
|
|
@ -216,6 +180,7 @@
|
|||
<alias base="ECMF12">ecmfNH</alias>
|
||||
<alias base="ECMF-MODEL0">ecmfNH</alias>
|
||||
<alias base="LAPS">laps</alias>
|
||||
<alias base="PHISH">PHISH</alias>
|
||||
<alias base="RTOFS-Atlantic">rtofsAtlantic</alias>
|
||||
<alias base="RTOFS-GulfMexico">rtofsAtlantic</alias>
|
||||
<alias base="RTOFS-GulfStream">rtofsAtlantic</alias>
|
||||
|
|
@ -241,9 +206,9 @@
|
|||
<alias base="NAHwave15">NAHwave15</alias>
|
||||
<alias base="NAHwave10">NAHwave10</alias>
|
||||
<alias base="NAHwave4">NAHwave4</alias>
|
||||
<alias base="ETSS">ETSS</alias>
|
||||
<!-- <alias base="ETSS">ETSS</alias>
|
||||
<alias base="ETSS-AK">ETSS</alias>
|
||||
<alias base="ETSS-HiRes">ETSS</alias>
|
||||
<alias base="ETSS-HiRes">ETSS</alias> -->
|
||||
<alias base="nwpsCG1CAR">nwpsCG1</alias>
|
||||
<alias base="nwpsCG1GYX">nwpsCG1</alias>
|
||||
<alias base="nwpsCG1BOX">nwpsCG1</alias>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue