Merge pull request #132 from haileyajohnson/data-dir

replace hardcoded data paths with data_dir
Unidata · Sep 14, 2023 · 68b39e6 · 68b39e6
2 parents 5539048 + 0a2751b
commit 68b39e6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/awsL2/pqacts/util/hhmmssRadarII.pl b/awsL2/pqacts/util/hhmmssRadarII.pl
@@ -19,7 +19,7 @@
 # 
 #
 # defaults
-#	datadir = "/data/ldm/pub/native/radar/level2";
+#	datadir = "${DATA_DIR}/native/radar/level2";
 #	log = "/data/ldm/logs/radar";
 #	actual log name makeRadarII.log.yyyymmdd";
 # 
@@ -43,7 +43,7 @@
 }
 
 if( ! $datadir ) {
-	$datadir = "/data/ldm/pub/native/radar/level2";
+	$datadir = "${DATA_DIR}/native/radar/level2";
 }
 if( ! $log ) {
 	$log = "/data/ldm/logs/radar/makeRadarII.log";

diff --git a/idd/pqacts/pqact.forecastProdsAndAna b/idd/pqacts/pqact.forecastProdsAndAna
@@ -59,7 +59,7 @@ NGRID	^[LM].G... KWBR ([0-3][0-9])([0-2][0-9])([0-6][0-9])
 #
 FNEXRAD	MRMS/(.*)/(.*)/MRMS_.*_(........)-(...)....grib2
 	FILE
-	/data/ldm/pub/native/grid/NCEP/MRMS/\2/\1/MRMS_\2_\1_\3_\40.grib2
+	${DATA_DIR}/native/grid/NCEP/MRMS/\2/\1/MRMS_\2_\1_\3_\40.grib2
 
 # ---------------------------------
 # - NCEP National Blend of Models -

diff --git a/idd/pqacts/util/hhmmssRadarII.pl b/idd/pqacts/util/hhmmssRadarII.pl
@@ -19,7 +19,7 @@
 # 
 #
 # defaults
-#	datadir = "/data/ldm/pub/native/radar/level2";
+#	datadir = "${DATA_DIR}/native/radar/level2";
 #	log = "/data/ldm/logs/radar";
 #	actual log name makeRadarII.log.yyyymmdd";
 # 
@@ -43,7 +43,7 @@
 }
 
 if( ! $datadir ) {
-	$datadir = "/data/ldm/pub/native/radar/level2";
+	$datadir = "${DATA_DIR}/native/radar/level2";
 }
 if( ! $log ) {
 	$log = "/data/ldm/logs/radar/makeRadarII.log";

diff --git a/threddsDev/testDatasets.xml b/threddsDev/testDatasets.xml
@@ -59,7 +59,7 @@ for a particular purpose.</documentation>
         <dimension name="t" orgName="timeAgg" />
         <variable name="t" orgName="timeAgg" />
         <aggregation dimName="timeAgg" type="joinNew" recheckEvery="1 min">
-          <scan location="/data/ldm/pub/native/satellite/GOES/GOES16/Products/CloudTopHeight/CONUS/"
+          <scan location="${DATA_DIR}/native/satellite/GOES/GOES16/Products/CloudTopHeight/CONUS/"
                 suffix='.nc'
                 dateFormatMark="OR_ABI-L2-ACHAC-M3_G16_s20180011937199_e#yyyyDDDHHmmssS"
                 subdirs="true"/>
@@ -77,7 +77,7 @@ for a particular purpose.</documentation>
         <dimension name="t" orgName="timeAgg" />
         <variable name="t" orgName="timeAgg" />
         <aggregation dimName="timeAgg" type="joinNew" recheckEvery="1 min">
-          <scan location="/data/ldm/pub/native/satellite/GOES/GOES16/Products/LandSurfaceTemperature/CONUS/"
+          <scan location="${DATA_DIR}/native/satellite/GOES/GOES16/Products/LandSurfaceTemperature/CONUS/"
                 suffix='.nc'
                 dateFormatMark="OR_ABI-L2-LSTC-M3_G16_s20180090947215_e#yyyyDDDHHmmssS"
                 subdirs="true"/>
@@ -96,7 +96,7 @@ ellite/goes16/agg/conus/tpw">
         <dimension name="t" orgName="timeAgg" />
         <variable name="t" orgName="timeAgg" />
         <aggregation dimName="timeAgg" type="joinNew" recheckEvery="1 min">
-          <scan location="/data/ldm/pub/native/satellite/GOES/GOES16/Products/TotalPrecipitableWater/CONUS/"
+          <scan location="${DATA_DIR}/native/satellite/GOES/GOES16/Products/TotalPrecipitableWater/CONUS/"
                 suffix='.nc'
                 dateFormatMark="OR_ABI-L2-TPWC-M3_G16_s20173610002256_e#yyyyDDDHHmmssS"
                 subdirs="true"/>
@@ -115,7 +115,7 @@ ellite/goes16/agg/conus/tpw">
       <metadata inherited="true">
         <dataType>Point</dataType>
       </metadata>
-      <collection spec="/data/ldm/pub/native/satellite/GOES/GOES16/Products/DerivedWindMotion/CONUS/Channel14/**/.*nc$"
+      <collection spec="${DATA_DIR}/native/satellite/GOES/GOES16/Products/DerivedWindMotion/CONUS/Channel14/**/.*nc$"
                   dateFormatMark="OR_ABI-L2-DMWC-M3C14_G16_s20180181857193_e#yyyyDDDHHmmssS" />
       <protoDataset choice="Penultimate" />
       <pointConfig datasetTypes="cdmrFeature Files"/>