downscaling config updated for actual preprocessed data

NCAR · Nov 13, 2024 · c5f2108 · c5f2108
1 parent a6bcbc7
commit c5f2108
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/config/downscaling.yml b/config/downscaling.yml
@@ -59,20 +59,20 @@ forecast_len: &forelen 1
 # rewrite their outputs alphabetize variables.
 
 data:
-    rootpath: &default /glade/derecho/scratch/mcginnis/conus404
+    history_len:  *histlen
+    forecast_len: *forelen
+
+    rootpath: &default /glade/derecho/scratch/mcginnis/credit
     datasets:
 
         ## extracted from 'wrfconstants_usgs404.nc'
 
-        ## Note that these should be PRE-NORMALIZED to mean 0, stdev 1
-        ## (or to [0,1] range)
-
         static:
             rootpath: *default
-            glob: 'conus404.static.nc'
+            glob: 'conus404/INVARIANT/conus404.static.nc'
             label: hires
             dim: static
-            normalize: True   # scale min,max == [-1,1] iff dim = static
+            normalize: True   # scale min,max == [0,1] iff dim = static
             boundary:
               - COSALPHA  # local cosine of map rotation
               - E         # coriolis cosine latitude term
@@ -93,7 +93,7 @@ data:
 
         solar:
             rootpath: *default
-            glob: 'solar/tisr.*.nc'
+            glob: 'solar/tisr.20km.*.nc'
             label: lores
             dim: 2D
             boundary:
@@ -104,12 +104,20 @@ data:
         ## data is interpolated to pressure levels and global 0.25 degree grid
         ## hourly, 1979-2023
 
-        era5:
+        era5_3d:
             rootpath: *default
-            glob: 'era5/*nc'  ## FILL IN
+            glob: 'era5/3d/*/era5.*.nc'
             label: lores
             dim: 3D
-            boundary: [Q, T, U, V, Z]   # 3D humidity, temp, winds, geopotential
+            boundary: [T, U, V, Z, R]   # 3D temp, winds, geopotential, humidity
+
+        era5_2d:
+            rootpath: *default
+            glob: 'era5/2d/*/era5.*.nc'
+            label: lores
+            dim: 2D
+            boundary: [SP, MSL, VAR_2T, TCWV, VAR_10U, VAR_10V]
+	    # 2D surface pressures, temp, total column water vapor, winds
 
 
         ## CONUS404 data on native grid, 1979-10 to 2022-09
@@ -122,7 +130,7 @@ data:
 
         conus404_3D:
             rootpath: *default
-            glob: 'data/*/conus404.3d.*.nc'
+            glob: 'conus404/wy*/*/conus404.3d.*.nc'
             label: hires
             dim: 3D
             prognostic:
@@ -136,10 +144,10 @@ data:
 
         conus404_2D:
             rootpath: *default
-            glob: 'data/*/conus404.2d.*.nc'
+            glob: 'conus404/wy*/*/conus404.2d.*.nc'
             label: hires
             dim: 2D
-            boundary: [COSZEN]  #
+            boundary: [COSZEN]  # cosine of solar zenith angle
             prognostic:
               - PSFC   # surface pressure
               - Q2     # water vapor mixing ratio at 2 meters
@@ -148,13 +156,12 @@ data:
               - U10    # u-wind at 10 meters
               - V10    # v-wind at 10 meters
             diagnostic:
-              - PREC_ACC_NC # total precip (mm) over previous timestep
+              - PREC_ACC_NC # total precip (mm) over previous (1-hr) timestep
+	      - SWDNB       # shortwave downwelling at bottom (instantaneous)
               - totalVap    # column-integrated water vapor content 
             unused:
               - SNOW       # snow water equivalent
 
-    history_len:  *histlen
-    forecast_len: *forelen