Merge pull request #400 from srcarter3/unidata_18.2.1-osx

Unidata 18.2.1 osx
This commit is contained in:
tiffanycmeyer13 2021-12-27 14:20:21 -06:00 committed by GitHub
commit 71dd8c080b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 104 additions and 11 deletions

View file

@ -54,6 +54,58 @@
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="true">
<resourceType>PLAN_VIEW</resourceType>
<perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="false"/>
<capabilities>
<capability xsi:type="colorableCapability" colorAsString="white"/>
<capability xsi:type="outlineCapability" outlineWidth="4" outlineOn="true" lineStyle="SOLID"/>
</capabilities>
</loadProperties>
<properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="UNKNOWN">
<pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
</properties>
<resourceData xsi:type="wwaResourceData" name="Convective Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
<metadataMap>
<mapping key="phensig">
<constraint constraintType="IN" constraintValue="TO.W,SV.W,EW.W,TO.A,SV.A"/>
</mapping>
<mapping key="pluginName">
<constraint constraintType="EQUALS" constraintValue="warning"/>
</mapping>
<mapping key="act">
<constraint constraintType="IN" constraintValue="NEW,CON,CAN,EXP"/>
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="true">
<resourceType>PLAN_VIEW</resourceType>
<perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="false"/>
<capabilities>
<capability xsi:type="colorableCapability" colorAsString="white"/>
<capability xsi:type="outlineCapability" outlineWidth="4" outlineOn="true" lineStyle="SOLID"/>
</capabilities>
</loadProperties>
<properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="UNKNOWN">
<pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
</properties>
<resourceData xsi:type="wwaResourceData" name="Winter Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
<metadataMap>
<mapping key="phensig">
<constraint constraintType="IN" constraintValue="WS.A,WS.W,WW.Y"/>
</mapping>
<mapping key="pluginName">
<constraint constraintType="EQUALS" constraintValue="warning"/>
</mapping>
<mapping key="act">
<constraint constraintType="IN" constraintValue="NEW,CON,CAN,EXP"/>
</mapping>
</metadataMap>
</resourceData>
</resource>
<resource>
<loadProperties loadWithoutData="true">
@ -105,6 +157,7 @@
</metadataMap>
</resourceData>
</resource>
<timeMatcher xsi:type="d2DTimeMatcher" forecastFilter="0" deltaFilter="0" loadMode="VALID_TIME_SEQ"/>
</descriptor>
</displays>

View file

@ -0,0 +1,37 @@
<bundle>
<displayList>
<displays xsi:type="d2DMapRenderableDisplay"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties loadWithoutData="true">
<capabilities>
<capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
outlineWidth="4" />
<capability xsi:type="colorableCapability" colorAsString="#ffffff" />
</capabilities>
</loadProperties>
<properties isSystemResource="false" isBlinking="false"
isMapLayer="false" isHoverOn="false"
isVisible="true" />
<resourceData xsi:type="wwaResourceData"
isUpdatingOnMetadataOnly="false"
retrieveData="false"
isRequeryNecessaryOnTimeMatch="true" name="Winter Watches, Warnings, Advisories">
<metadataMap>
<mapping key="act">
<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="WS.A,WS.W,WW.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
</descriptor>
</displays>
</displayList>
</bundle>

View file

@ -27,6 +27,9 @@
</contribute>
<contribute xsi:type="bundleItem" file="bundles/MarineWWA.xml"
menuText="Marine Watches, Warnings, Advisories" id="marineWarnings">
</contribute>
<contribute xsi:type="bundleItem" file="bundles/WinterWWA.xml"
menuText="Winter Watches, Warnings, Advisories" id="winterWarnings">
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SPS.xml"
menuText="SPS / Sig Wx Advisories" id="SPS">

View file

@ -7,19 +7,19 @@
# the data flow of other datatypes.
##
numCores=`grep -c ^processor /proc/cpuinfo` # e.g. = 48
let "GRIB_DECODE_THREADS = numCores / 4" # = 12
let "GRIB_SPLIT_THREADS = GRIB_DECODE_THREADS / 2" # = 6
numCores=`grep -c ^processor /proc/cpuinfo` # e.g. = 44
let "GRIB_DECODE_THREADS = numCores / 3" # = 14
let "GRIB_SPLIT_THREADS = GRIB_DECODE_THREADS / 2" # = 7
if [ $GRIB_DECODE_THREADS -lt 4 ]; then
GRIB_DECODE_THREADS=4
fi
if [ $GRIB_SPLIT_THREADS -lt 2 ]; then
GRIB_SPLIT_THREADS=2
fi
let "MAX_MEM = GRIB_DECODE_THREADS * 400" # = 12 * 400 = 4800MB
let "GRIB_MAX_GRID_POINTS = GRIB_DECODE_THREADS * 25000000" # = 12 * 25,000,000 = 300,000,000
let "GRID_PERSIST_THREADS = GRIB_DECODE_THREADS / 2" # = 6
let "GRID_MAX_PERSIST_MEMORY_IN_MB = GRID_PERSIST_THREADS * 50" # = 6 * 50 = 300
let "MAX_MEM = GRIB_DECODE_THREADS * 800" # = 14 * 800 = 11200MB (11.2GB)
let "GRIB_MAX_GRID_POINTS = GRIB_DECODE_THREADS * 100000000" # = 14 * 100,000,000 = 1,400,000,000
let "GRID_PERSIST_THREADS = GRIB_DECODE_THREADS / 2" # = 7
let "GRID_MAX_PERSIST_MEMORY_IN_MB = GRID_PERSIST_THREADS * 100" # = 7 * 100 = 700
let "METADATA_POOL_MAX = GRIB_DECODE_THREADS * 2" # = 24
export INIT_MEM=128 # MB
@ -33,7 +33,7 @@ export GRID_MAX_PERSIST_MEMORY_IN_MB
export METADATA_POOL_MAX
# Minimum coverage of a defined subgrid for the grid to be accepted
export SUB_GRID_COVERAGE_PERCENT=20
export GRID_MAX_GRIDS_PER_PERSIST=100
export GRID_MAX_MEMORY_IN_MB_PER_PERSIST=10
export GRID_MAX_GRIDS_PER_PERSIST=500
export GRID_MAX_MEMORY_IN_MB_PER_PERSIST=40
export EDEX_DEBUG_PORT=5007

View file

@ -305,7 +305,7 @@ UNIWISC ^pnga2area Q. (.*) (.*) (SP_COMP) (.*)um (.*) (........) (....)
#/data/ldm/pub/native/radar/MRMS/Model/CONUS/MRMS_BrightBandTopHeight_00.00_20210430-184000.grib2
#CONUS Domain
FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/CONUS/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2
FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/CONUS/MRMS\1\2-\3\4\5.grib2
FILE -close /awips2/data_store/grid/\2/\3/MRMS/CONUS/staging/MRMS-concat-%Y%m%d_%H%M.grib2
#Alaska Domain
FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/ALASKA/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2
FILE -close /awips2/data_store/grid/\2/\3/MRMS/ALASKA/staging/MRMS-concat-%Y%m%d_%H%M.grib2

View file

@ -6,7 +6,7 @@
#/data/ldm/pub/native/radar/MRMS/Model/CONUS/MRMS_BrightBandTopHeight_00.00_20210430-184000.grib2
#CONUS Domain
FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/CONUS/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2
FILE -edex -close /awips2/data_store/grid/\2/\3/MRMS/CONUS/MRMS\1\2-\3\4\5.grib2
FILE -close /awips2/data_store/grid/\2/\3/MRMS/CONUS/staging/MRMS-concat-%Y%m%d_%H%M.grib2
#Alaska Domain
FNEXRAD ^/data/ldm/pub/native/radar/MRMS/.*/ALASKA/MRMS(.*)([0-9]{8})-([0-9]{2})([0-9]{4}).grib2
FILE -close /awips2/data_store/grid/\2/\3/MRMS/ALASKA/staging/MRMS-concat-%Y%m%d_%H%M.grib2