From 6294cbaf45d82115f562da3d62b430e7a76933bf Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 22 Dec 2021 14:22:55 -0500 Subject: [PATCH 1/2] Changed the launcher name from lowercase cave to uppercase CAVE --- cave/com.raytheon.viz.product.awips/developer.product | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.product.awips/developer.product b/cave/com.raytheon.viz.product.awips/developer.product index cf45925ee9..f60a43eb38 100644 --- a/cave/com.raytheon.viz.product.awips/developer.product +++ b/cave/com.raytheon.viz.product.awips/developer.product @@ -52,7 +52,7 @@ startupProgressRect="3,234,413,13" startupMessageRect="7,252,445,20" startupForegroundColor="000000" /> - + From e2820cfeed372049f9786fe861119cd7eb38a43d Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 22 Dec 2021 14:26:47 -0500 Subject: [PATCH 2/2] Grib changes: -Changed some of the default values for grids so it will process MRMS better/faster (ingestGrib.sh) -Changed the storing of CONUS MRMS to be concatenated instead of individual files to process faster (pqact.conf and pqact.mrms) --- .../esb/etc/ingestGrib.sh | 18 +++++++++--------- .../Installer.ldm/patch/etc/pqact.conf | 2 +- .../Installer.ldm/patch/etc/pqact.mrms | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/esb/etc/ingestGrib.sh b/edexOsgi/com.raytheon.uf.edex.plugin.grid/esb/etc/ingestGrib.sh index 7a889698bf..f63781ec5b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/esb/etc/ingestGrib.sh +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/esb/etc/ingestGrib.sh @@ -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 diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf index 54d846d469..99ef750351 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf @@ -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 diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms index 081bf11c70..85131d2f02 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.mrms @@ -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