Skip to content

Commit 1b51167

Browse files
grantbustergrantbuster
authored
Merge pull request #4 from NREL/gb/v3.2.0
Gb/v3.2.0
2 parents 988ac8f + 8e25aea commit 1b51167

File tree

5 files changed

+6
-30
lines changed

5 files changed

+6
-30
lines changed

‎config/pipeline_mlclouds/config_conus_west_nsrdb.json

-12
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,42 @@
1616
],
1717
"factory_kwargs": {
1818
"cld_opd_dcomp": {
19-
"adjust_coords": true,
2019
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
2120
},
2221
"cld_press_acha": {
23-
"adjust_coords": true,
2422
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
2523
},
2624
"cld_reff_dcomp": {
27-
"adjust_coords": true,
2825
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
2926
},
3027
"cloud_fraction": {
31-
"adjust_coords": true,
3228
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
3329
},
3430
"cloud_probability": {
35-
"adjust_coords": true,
3631
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
3732
},
3833
"cloud_type": {
39-
"adjust_coords": true,
4034
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
4135
},
4236
"refl_0_65um_nom": {
43-
"adjust_coords": true,
4437
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
4538
},
4639
"refl_0_65um_nom_stddev_3x3": {
47-
"adjust_coords": true,
4840
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
4941
},
5042
"refl_3_75um_nom": {
51-
"adjust_coords": true,
5243
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
5344
},
5445
"surface_albedo": {
5546
"source_dir": "/projects/pxs/ancillary/albedo/nsrdb_2019/"
5647
},
5748
"temp_11_0um_nom": {
58-
"adjust_coords": true,
5949
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
6050
},
6151
"temp_11_0um_nom_stddev_3x3": {
62-
"adjust_coords": true,
6352
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
6453
},
6554
"temp_3_75um_nom": {
66-
"adjust_coords": true,
6755
"source_dir": "/projects/pxs/uwisc/2019_west/clavrx_OR_ABI-L1b-RadC-*.nc"
6856
}
6957
},

‎config/pipeline_mlclouds/config_east_nsrdb.json

-12
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,42 @@
1717
],
1818
"factory_kwargs": {
1919
"cld_opd_dcomp": {
20-
"adjust_coords": true,
2120
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
2221
},
2322
"cld_press_acha": {
24-
"adjust_coords": true,
2523
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
2624
},
2725
"cld_reff_dcomp": {
28-
"adjust_coords": true,
2926
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
3027
},
3128
"cloud_fraction": {
32-
"adjust_coords": true,
3329
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
3430
},
3531
"cloud_probability": {
36-
"adjust_coords": true,
3732
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
3833
},
3934
"cloud_type": {
40-
"adjust_coords": true,
4135
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
4236
},
4337
"refl_0_65um_nom": {
44-
"adjust_coords": true,
4538
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
4639
},
4740
"refl_0_65um_nom_stddev_3x3": {
48-
"adjust_coords": true,
4941
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
5042
},
5143
"refl_3_75um_nom": {
52-
"adjust_coords": true,
5344
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
5445
},
5546
"surface_albedo": {
5647
"source_dir": "/projects/pxs/ancillary/albedo/nsrdb_2019/"
5748
},
5849
"temp_11_0um_nom": {
59-
"adjust_coords": true,
6050
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
6151
},
6252
"temp_11_0um_nom_stddev_3x3": {
63-
"adjust_coords": true,
6453
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
6554
},
6655
"temp_3_75um_nom": {
67-
"adjust_coords": true,
6856
"source_dir": "/projects/pxs/uwisc/2019_east/clavrx_OR_ABI-L1b-RadF-*.nc"
6957
}
7058
},

‎nsrdb/data_model/clouds.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class CloudVarSingleH5(CloudVarSingle):
227227

228228
def __init__(self, fpath, pre_proc_flag=True, index=None,
229229
dsets=('cloud_type', 'cld_opd_dcomp', 'cld_reff_dcomp',
230-
'cld_press_acha'), adjust_coords=False):
230+
'cld_press_acha'), adjust_coords=True):
231231
"""
232232
Parameters
233233
----------
@@ -260,7 +260,7 @@ def dsets(self):
260260

261261
@classmethod
262262
def _parse_grid(cls, fpath, dsets=('latitude_pc', 'longitude_pc'),
263-
adjust_coords=False):
263+
adjust_coords=True):
264264
"""Extract the cloud data grid for the current timestep.
265265
266266
Parameters
@@ -478,7 +478,7 @@ class CloudVarSingleNC(CloudVarSingle):
478478

479479
def __init__(self, fpath, pre_proc_flag=True, index=None,
480480
dsets=('cloud_type', 'cld_opd_dcomp', 'cld_reff_dcomp',
481-
'cld_press_acha'), adjust_coords=False):
481+
'cld_press_acha'), adjust_coords=True):
482482
"""
483483
Parameters
484484
----------
@@ -510,7 +510,7 @@ def dsets(self):
510510

511511
@classmethod
512512
def _parse_grid(cls, fpath, dsets=('latitude_pc', 'longitude_pc'),
513-
adjust_coords=False):
513+
adjust_coords=True):
514514
"""Extract the cloud data grid for the current timestep.
515515
516516
Parameters
@@ -719,7 +719,7 @@ class CloudVar(AncillaryVarHandler):
719719

720720
def __init__(self, name, var_meta, date, source_dir=None, freq=None,
721721
dsets=('cloud_type', 'cld_opd_dcomp', 'cld_reff_dcomp',
722-
'cld_press_acha'), adjust_coords=False):
722+
'cld_press_acha'), adjust_coords=True):
723723
"""
724724
Parameters
725725
----------

‎nsrdb/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
nsrdb version number
33
"""
44

5-
__version__ = "3.1.1"
5+
__version__ = "3.2.0"

‎nsrdb_version.docx

278 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)