Skip to content

Commit 5a1296a

Browse files
committed
No YAML support for R3. Configuration file will remain a regular
text file for now.
1 parent 28af302 commit 5a1296a

File tree

2 files changed

+45
-3
lines changed

2 files changed

+45
-3
lines changed

tools/imagesets/imgset.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,17 +376,23 @@ def workflowtest(self, wfname, testname, dataname, pyname, suf="", description="
376376
# distinguish between the runconfig files for each individual workflow)
377377
if testname.startswith("end2end"):
378378
inputrunconfig = f"{testname}_{wfname}{suf}.yaml"
379+
elif testname.startswith("soilm"):
380+
# Executable-dependent. Currently works only for Disaggregation.
381+
inputrunconfig = f"{testname}{suf}.txt"
382+
shutil.copyfile(pjoin(runconfigdir, inputrunconfig),
383+
pjoin(testdir, f"runconfig_{wfname}{suf}.txt"))
379384
else:
380385
inputrunconfig = f"{testname}{suf}.yaml"
381-
shutil.copyfile(pjoin(runconfigdir, inputrunconfig),
382-
pjoin(testdir, f"runconfig_{wfname}{suf}.yaml"))
386+
shutil.copyfile(pjoin(runconfigdir, inputrunconfig),
387+
pjoin(testdir, f"runconfig_{wfname}{suf}.yaml"))
383388
log = pjoin(testdir, f"output_{wfname}{suf}", "stdouterr.log")
384389

385390
if not testname.startswith("soilm"):
386391
cmd = [f"time python3 -m {pyname} {arg} runconfig_{wfname}{suf}.yaml"]
387392
else:
388393
executable = pyname
389-
cmd = [f"time {executable} runconfig_{wfname}{suf}.yaml"]
394+
# Executable-dependent. Currently works only for Disaggregation.
395+
cmd = [f"time {executable} runconfig_{wfname}{suf}.txt"]
390396

391397
try:
392398
if not testname.startswith("soilm"):
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
--Folder path to NISAR GCOV data
2+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/NISAR_L2_PR_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004.h5
3+
--Folder path to ECMWF sol moisture
4+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ERA5_SD_TP_ST_SM.nc
5+
--Folder path and file to static ancillary data: EZlat200m
6+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lat200m.float32
7+
--Folder path and file to static ancillary data: EZlon200m
8+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lon200m.float32
9+
--Folder path and file to static ancillary data: EZlat1km
10+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lat01km.float32
11+
--Folder path and file to static ancillary data: EZlon1km
12+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lon01km.float32
13+
--Folder path and file to static ancillary data: EZlat3km
14+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lat03km.float32
15+
--Folder path and file to static ancillary data: EZlon3km
16+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lon03km.float32
17+
--Folder path and file to static ancillary data: EZlat9km
18+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lat09km.float32
19+
--Folder path and file to static ancillary data: EZlon9km
20+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/EASE2_lon09km.float32
21+
--Folder path and file to static ancillary data: Landcover1km
22+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/dominantIGBP_M01_B20120101_003.uint8
23+
--Folder path and file to static ancillary data: WaterFrac1km
24+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/waterfrac_M01_002.float32
25+
--Folder path and file to static ancillary data: WaterFrac3km
26+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/waterfrac_M03_002.float32
27+
--Folder path and file to static ancillary data: BD200m
28+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/BD05cmD_EASE2_200m.nc
29+
--Folder path and file to static ancillary data: Urban1km
30+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/UrbanFraction_M01_001.float32
31+
--Folder path and file to static ancillary data: dem1km slope
32+
input_L2_GCOV_001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004/ancillary/DEMSLPSTD_M01_002.float32
33+
--Log file name with path
34+
output_soilm/NISAR_SM_20200926_Disagg_ver1.log
35+
--Output HDF5 file name with path
36+
output_soilm/NISAR_SM_20200926_Disagg_ver1.h5

0 commit comments

Comments
 (0)