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

Merge "VLab Issue #15736 - DCS 18497; fixes #15736" into ohd_16.2.2

Browse source 
Former-commit-id: 10d1daeb3f6e9ea5ac79e6460913de579ec79a5e
This commit is contained in:
Paul Tilles 2016-03-01 15:51:55 +00:00 • committed by Gerrit Code Review
commit 1324621070
2 changed files with 635 additions and 475 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
deltaScripts/16.2.2/DCS18497/ModifyTable.sql Executable file
View file

@ -0,0 +1,17 @@
-- Change name of column "ml_overide_flag" to "melt_layer_src"
ALTER TABLE DSAAdapt RENAME COLUMN ml_overide_flag TO melt_layer_src;
-- Add new columns for Build 17 parameters
ALTER TABLE DSAAdapt ADD COLUMN min_early_term_angle float4;
ALTER TABLE DSAAdapt ADD COLUMN max_volume_per_hour float4;
ALTER TABLE DSAAdapt ADD COLUMN dry_snow_mult float4;
ALTER TABLE DSAAdapt ADD COLUMN rkdp_use_thresh float4;
ALTER TABLE DSAAdapt ADD COLUMN bias_applied_flag varchar(3);
ALTER TABLE DSAAdapt ADD COLUMN met_sig_proc_flag varchar(3);
ALTER TABLE DSAAdapt ADD COLUMN met_sig_thresh float4;
ALTER TABLE DSAAdapt ADD COLUMN cappi_proc_flag varchar(3);
ALTER TABLE DSAAdapt ADD COLUMN cappi_thresh float4;
ALTER TABLE DSAAdapt ADD COLUMN cappi_height float4;

215
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/DSAAdapt.java
View file

@ -1,4 +1,3 @@
package com.raytheon.uf.common.dataplugin.shef.tables;
import javax.persistence.AttributeOverride;
@ -8,13 +7,15 @@ import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "dsaadapt")
@javax.xml.bind.annotation.XmlRootElement
@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.NONE)
@com.raytheon.uf.common.serialization.annotations.DynamicSerialize
public class DSAAdapt extends com.raytheon.uf.common.dataplugin.persist.PersistableDataObject implements java.io.Serializable, com.raytheon.uf.common.serialization.ISerializableObject
{
@Entity
@Table(name = "dsaadapt")
@javax.xml.bind.annotation.XmlRootElement
@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.NONE)
@com.raytheon.uf.common.serialization.annotations.DynamicSerialize
public class DSAAdapt extends
com.raytheon.uf.common.dataplugin.persist.PersistableDataObject
implements java.io.Serializable,
com.raytheon.uf.common.serialization.ISerializableObject {
private static final long serialVersionUID = 1L;
@ -32,7 +33,7 @@ import javax.persistence.Table;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private String ml_overide_flag;
private String melt_layer_src;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
@ -158,35 +159,76 @@ import javax.persistence.Table;
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float longst_lag;
// * new for Build 17 *
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float min_early_term_angle;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float max_volume_per_hour;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float dry_snow_mult;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float rkdp_use_thresh;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private String bias_applied_flag;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private String met_sig_proc_flag;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float met_sig_thresh;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private String cappi_proc_flag;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float cappi_thresh;
@javax.xml.bind.annotation.XmlElement
@com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement
private Float cappi_height;
public DSAAdapt() {
}
public DSAAdapt(DSAAdaptId id)
{
public DSAAdapt(DSAAdaptId id) {
this.id = id;
}
public DSAAdapt(DSAAdaptId id,
short num_of_adap, float default_ml_depth, String ml_overide_flag,
float kdp_mult, float kdp_power, float z_r_mult, float z_r_power,
float zdr_z_mult, float zdr_z_power, float zdr_zdr_power,
float min_corr_precip, float min_corr_kdp,
float refl_max, float kdp_max_beam_blk,
float max_usability_blk, float kdp_min_usage_rate,
float ws_mult, float gr_mult,
float rh_mult, float ds_mult, float ic_mult,
public DSAAdapt(DSAAdaptId id, short num_of_adap, float default_ml_depth,
String melt_layer_src, float kdp_mult, float kdp_power,
float z_r_mult, float z_r_power, float zdr_z_mult,
float zdr_z_power, float zdr_zdr_power, float min_corr_precip,
float min_corr_kdp, float refl_max, float kdp_max_beam_blk,
float max_usability_blk, float kdp_min_usage_rate, float ws_mult,
float gr_mult, float rh_mult, float ds_mult, float ic_mult,
float grid_is_full, float paif_rate, float paif_area,
float rain_time_thresh,
float num_zones, float max_precip_rate, float restart_time,
float max_interp_time, float max_hourly_acc, float time_bias,
float num_grpairs, float reset_bias, float longst_lag
)
float rain_time_thresh, float num_zones, float max_precip_rate,
float restart_time, float max_interp_time, float max_hourly_acc,
float time_bias, float num_grpairs, float reset_bias,
float longst_lag, float min_early_term_angle,
float max_volume_per_hour, float dry_snow_mult,
float rkdp_use_thresh, String bias_applied_flag,
String met_sig_proc_flag, float met_sig_thresh,
String cappi_proc_flag, float cappi_thresh, float cappi_height)
{
this.id = id;
this.num_of_adap = num_of_adap;
this.default_ml_depth = default_ml_depth;
this.ml_overide_flag = ml_overide_flag;
this.melt_layer_src = melt_layer_src;
this.kdp_mult = kdp_mult;
this.kdp_power = kdp_power;
this.z_r_mult = z_r_mult;
@ -208,7 +250,7 @@ import javax.persistence.Table;
this.grid_is_full = grid_is_full;
this.paif_rate = paif_rate;
this.paif_area = paif_area;
this.rain_time_thresh =rain_time_thresh;
this.rain_time_thresh = rain_time_thresh;
this.num_zones = num_zones;
this.max_precip_rate = max_precip_rate;
this.restart_time = restart_time;
@ -218,10 +260,23 @@ import javax.persistence.Table;
this.num_grpairs = num_grpairs;
this.reset_bias = reset_bias;
this.longst_lag = longst_lag;
// * new for Build 17 *
this.min_early_term_angle = min_early_term_angle;
this.max_volume_per_hour = max_volume_per_hour;
this.dry_snow_mult = dry_snow_mult;
this.rkdp_use_thresh = rkdp_use_thresh;
this.bias_applied_flag = bias_applied_flag;
this.met_sig_proc_flag = met_sig_proc_flag;
this.met_sig_thresh = met_sig_thresh;
this.cappi_proc_flag = cappi_proc_flag;
this.cappi_thresh = cappi_thresh;
this.cappi_height = cappi_height;
}
@EmbeddedId
@AttributeOverrides( {
@AttributeOverrides({
@AttributeOverride(name = "radid", column = @Column(name = "radid", nullable = false, length = 3)),
@AttributeOverride(name = "obstime", column = @Column(name = "obstime", nullable = false, length = 29)) })
public DSAAdaptId getId() {
@ -250,13 +305,13 @@ import javax.persistence.Table;
this.default_ml_depth = default_ml_depth;
}
@Column(name = "ml_overide_flag")
public String getMlOverideFlag() {
return this.ml_overide_flag;
@Column(name = "melt_layer_src")
public String getMeltLayerSrc() {
return this.melt_layer_src;
}
public void setMlOverideFlag(String ml_overide_flag) {
this.ml_overide_flag = ml_overide_flag;
public void setMeltLayerSrc(String melt_layer_src) {
this.melt_layer_src = melt_layer_src;
}
@Column(name = "kdp_mult")
@ -421,7 +476,6 @@ import javax.persistence.Table;
this.ic_mult = ic_mult;
}
@Column(name = "grid_is_full")
public Float getGridIsFull() {
return this.grid_is_full;
@ -485,7 +539,6 @@ import javax.persistence.Table;
this.restart_time = restart_time;
}
@Column(name = "max_interp_time")
public Float getMaxInterpTime() {
return this.max_interp_time;
@ -513,7 +566,6 @@ import javax.persistence.Table;
this.time_bias = time_bias;
}
@Column(name = "num_grpairs")
public Float getNumGrPairs() {
return this.num_grpairs;
@ -541,4 +593,95 @@ import javax.persistence.Table;
this.longst_lag = longst_lag;
}
// * new for Build 17 *
@Column(name = "min_early_term_angle")
public Float getMinEarlyTermAngle() {
return this.min_early_term_angle;
}
public void setMinEarlyTermAngle(Float min_early_term_angle) {
this.min_early_term_angle = min_early_term_angle;
}
@Column(name = "max_volume_per_hour")
public Float getMaxVolumePerHour() {
return this.max_volume_per_hour;
}
public void setMaxVolumePerHour(Float max_volume_per_hour) {
this.max_volume_per_hour = max_volume_per_hour;
}
@Column(name = "dry_snow_mult")
public Float getDrySnowMult() {
return this.dry_snow_mult;
}
public void setDrySnowMult(Float dry_snow_mult) {
this.dry_snow_mult = dry_snow_mult;
}
@Column(name = "rkdp_use_thresh")
public Float getRkdpUseThresh() {
return this.rkdp_use_thresh;
}
public void setRkdpUseThresh(Float rkdp_use_thresh) {
this.rkdp_use_thresh = rkdp_use_thresh;
}
@Column(name = "bias_applied_flag")
public String getBiasAppliedFlag() {
return this.bias_applied_flag;
}
public void setBiasAppliedFlag(String bias_applied_flag) {
this.bias_applied_flag = bias_applied_flag;
}
@Column(name = "met_sig_proc_flag")
public String getMetSigProcFlag() {
return this.met_sig_proc_flag;
}
public void setMetSigProcFlag(String met_sig_proc_flag) {
this.met_sig_proc_flag = met_sig_proc_flag;
}
@Column(name = "met_sig_thresh")
public Float getMetSigThresh() {
return this.met_sig_thresh;
}
public void setMetSigThresh(Float met_sig_thresh) {
this.met_sig_thresh = met_sig_thresh;
}
@Column(name = "cappi_proc_flag")
public String getCappiProcFlag() {
return this.cappi_proc_flag;
}
public void setCappiProcFlag(String cappi_proc_flag) {
this.cappi_proc_flag = cappi_proc_flag;
}
@Column(name = "cappi_thresh")
public Float getCappiThresh() {
return this.cappi_thresh;
}
public void setCappiThresh(Float cappi_thresh) {
this.cappi_thresh = cappi_thresh;
}
@Column(name = "cappi_height")
public Float getCappiHeight() {
return this.cappi_height;
}
public void setCappiHeight(Float cappi_height) {
this.cappi_height = cappi_height;
}
}