xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1

Browse source 
Former-commit-id: 67ec942e0c89cce314d9af5c8a1bf5392ce20e52
This commit is contained in:
Fay.Liang 2015-02-05 16:16:18 -05:00
commit d39f7915e7
6 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java
View file

@ -43,6 +43,7 @@ import com.raytheon.viz.mpe.util.ReadTemperatureStationList;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 31, 2009 snaples Initial creation
* Feb 5, 2015 17101 snaples Updated max_stations to use size of dqc.precip_stations.
*
* </pre>
*
@ -72,13 +73,9 @@ public class GroupEditCalls {
int pcpn_time = dqc.pcpn_time;
ReadPrecipStationList rp = new ReadPrecipStationList();
int max_stations = dqc.precip_stations.size();
ReadTemperatureStationList rt = new ReadTemperatureStationList();
int max_stations = rp.getNumPstations();
int max_tstations = rt.getNumTstations();
int max_tstations = dqc.temperature_stations.size();
public void apply_group()

6
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/BadValues.java
View file

@ -41,6 +41,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Station;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 9, 2009 snaples Initial creation
* Feb 5, 2015 17101 snaples Fixed issue with writing zero length bad values file.
*
* </pre>
*
@ -51,8 +52,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Station;
public class BadValues {
BufferedReader in = null;
DailyQcUtils dqc = DailyQcUtils.getInstance();
ReadPrecipStationList rp = new ReadPrecipStationList();
private int max_stations = rp.getNumPstations();
private int max_stations = dqc.precip_stations.size();
public void read_bad_values(String precd, int m) {
@ -194,7 +194,7 @@ public class BadValues {
// ier=sprintf(ibuf,"%s %s %d %f\n",bad_values[i].hb5,bad_values[i].parm,
// bad_values[i].quart,bad_values[i].fvalue);
ibuf = String.format("%s %s %d %f", bad_values[i].hb5,
ibuf = String.format("%s %s %d %4.2f", bad_values[i].hb5,
bad_values[i].parm, bad_values[i].quart,
bad_values[i].fvalue);
out.write(ibuf);

4
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBadSnotel.java
View file

@ -41,6 +41,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Station;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 11, 2009 snaples Initial creation
* Feb 5, 2015 17101 snaples Updated max_stations to use size of dqc.precip_stations.
*
* </pre>
*
@ -68,8 +69,7 @@ public class GetBadSnotel {
/* Retrieve the number of days to QC data for. */
num_qc_days = dqc.qcDays;
ReadPrecipStationList pl = new ReadPrecipStationList();
int max_stations = pl.getNumPstations();
int max_stations = dqc.precip_stations.size();
// Pdata[] pdata = DailyQcUtils.pdata;
for (j = 0; j < num_qc_days; j++) {

3
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/ReadPrecipStationList.java
View file

@ -73,8 +73,7 @@ public class ReadPrecipStationList {
e.printStackTrace();
}
ReadPrecipStationList.max_pstations = dqc.precip_stations
.size();
max_pstations = dqc.precip_stations.size();
return dqc.precip_stations;

3
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
View file

@ -23,7 +23,7 @@
</model>
<model>
<name>MPE-Local</name>
<name>MPE-Mosaic</name>
<center>9</center>
<subcenter>0</subcenter>
<grid>304</grid>
@ -50,7 +50,6 @@
</process>
</model>
<!-- END SUBCENTER 0 -->
<!-- SUBCENTER 105: San Juan PR WFO -->

9
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
View file

@ -91,6 +91,11 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* Jun 17, 2014 3296 randerso Cached PythonScript. Moved active table
* backup and purging to a separate thread.
* Added performance logging
* Feb 05, 2015 16942 ryu Fix update of records for sites other than
* the home site and its neighbors.
* Pass issuance site id to getActiveTable()
* in updateActiveTable() so records will
* be updated correctly.
*
* </pre>
*
@ -285,11 +290,13 @@ public class ActiveTable {
mode = ActiveTableMode.OPERATIONAL;
}
String issueSiteId = newRecords.get(0).getOfficeid();
IPerformanceStatusHandler perfStat = PerformanceStatus
.getHandler("ActiveTable");
ITimer timer = TimeUtil.getTimer();
timer.start();
List<ActiveTableRecord> activeTable = getActiveTable(siteId, mode);
List<ActiveTableRecord> activeTable = getActiveTable(issueSiteId, mode);
timer.stop();
perfStat.logDuration("getActiveTable", timer.getElapsedTime());