diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge0ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge0ftCumul_PHISH.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
new file mode 100644
index 0000000000..af2a380f9c
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
@@ -0,0 +1,26 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="PSurge0ftIncr_PHISH" name="PHISH probability &gt; 0 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge0ft6hr"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge10ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge10ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge11ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge11ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge12ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge12ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge13ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge13ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge14ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge14ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge15ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge15ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge16ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge16ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge17ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge17ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge18ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge18ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge19ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge19ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge1ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge1ftCumul_PHISH.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
new file mode 100644
index 0000000000..8a9cb5f291
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
@@ -0,0 +1,26 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="PSurge1ftIncr_PHISH" name="PHISH probability &gt; 1 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge1ft6hr"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge20ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge20ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge21ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge21ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge21ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge21ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge22ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge22ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge22ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge22ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge23ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge23ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge23ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge23ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge24ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge24ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge24ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge24ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge25ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge25ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge25ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge25ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_wTide.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
new file mode 100644
index 0000000000..13692e3e58
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
@@ -0,0 +1,26 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="PSurge2ftIncr_PHISH" name="PHISH probability &gt; 2 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge2ft6hr"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_wTide.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
new file mode 100644
index 0000000000..8e5bff1990
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
@@ -0,0 +1,26 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="PSurge3ftIncr_PHISH" name="PHISH probability &gt; 3 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge3ft6hr"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge8ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge8ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge9ftIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/PSurge9ftIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge10pctIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge10pctIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge20pctIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge20pctIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge30pctIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge30pctIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge40pctIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge40pctIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_wTide.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_wTide.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_wTide.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_wTide.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctIncr_PHISH.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge50pctIncr_PHISH.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctIncr_PHISH.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/Surge50pctIncr_PHISH.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG518E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG518E2.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG518E2.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG518E2.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG549E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG549E2.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG549E2.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG549E2.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG579E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG579E2.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG579E2.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG579E2.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
new file mode 100644
index 0000000000..21785cf76c
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-122E2" name="Probabilistic Storm Surge probability &gt; 4 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge4ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
new file mode 100644
index 0000000000..55ea7ac6d3
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-152E2" name="Probabilistic Storm Surge probability &gt; 5 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge5ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
new file mode 100644
index 0000000000..84cf2312af
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-183E2" name="Probabilistic Storm Surge probability &gt; 6 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge6ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
new file mode 100644
index 0000000000..4839af8d71
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-20" name="Probabilistic Storm Surge height w/20% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge20pctCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
new file mode 100644
index 0000000000..85d69ee4ba
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-213E2" name="Probabilistic Storm Surge probability &gt; 7 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge7ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
new file mode 100644
index 0000000000..e553203d07
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-244E2" name="Probabilistic Storm Surge probability &gt; 8 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge8ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
new file mode 100644
index 0000000000..2be63eb473
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-274E2" name="Probabilistic Storm Surge probability &gt; 9 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge9ftCumul"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
new file mode 100644
index 0000000000..588c0723c0
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-30" name="Probabilistic Storm Surge height w/30% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge30pctCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
new file mode 100644
index 0000000000..ecb48bde77
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-305E2" name="Probabilistic Storm Surge probability &gt; 10 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge10ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
new file mode 100644
index 0000000000..bde5cbc26f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-335E2" name="Probabilistic Storm Surge probability &gt; 11 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge11ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
new file mode 100644
index 0000000000..584f54884b
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-366E2" name="Probabilistic Storm Surge probability &gt; 12 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge12ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
new file mode 100644
index 0000000000..8ffd7ac784
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-396E2" name="Probabilistic Storm Surge probability &gt; 13 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge13ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
new file mode 100644
index 0000000000..554beb1664
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-40" name="Probabilistic Storm Surge height w/40% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge40pctCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
new file mode 100644
index 0000000000..8b07179eb7
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-427E2" name="Probabilistic Storm Surge probability &gt; 14 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge14ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
new file mode 100644
index 0000000000..8e6824bb77
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-457E2" name="Probabilistic Storm Surge probability &gt; 15 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge15ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
new file mode 100644
index 0000000000..845bb9936a
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-488E2" name="Probabilistic Storm Surge probability &gt; 16 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge16ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
new file mode 100644
index 0000000000..1ce6cd577b
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-50" name="Probabilistic Storm Surge height w/50% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge50pctCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
new file mode 100644
index 0000000000..fdd5525e31
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-610E2" name="Probabilistic Storm Surge probability &gt; 20 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge20ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
new file mode 100644
index 0000000000..df6ee3c805
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-61E2" name="Probabilistic Storm Surge probability &gt; 2 feet" unit="%">  
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge2ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
new file mode 100644
index 0000000000..bf3796a85d
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-640E2" name="Probabilistic Storm Surge probability &gt; 21 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge21ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
new file mode 100644
index 0000000000..72850f953a
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-671E2" name="Probabilistic Storm Surge probability &gt; 22 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge22ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
new file mode 100644
index 0000000000..82ad3eee39
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-701E2" name="Probabilistic Storm Surge probability &gt; 23 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge23ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
new file mode 100644
index 0000000000..366a1a280f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-732E2" name="Probabilistic Storm Surge probability &gt; 24 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge24ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
new file mode 100644
index 0000000000..44e784d8ed
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-762E2" name="Probabilistic Storm Surge probability &gt; 25 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge25ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
new file mode 100644
index 0000000000..55c3b99f29
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
@@ -0,0 +1,28 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TPCSG-91E2" name="Probabilistic Storm Surge probability &gt; 3 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge3ftCumul"/>
+    </Method>
+</DerivedParameter>
\ No newline at end of file