diff --git a/fix/upp/RRFS_CONUS_3km/ari100y_01h.grib2 b/fix/upp/RRFS_CONUS_3km/ari100y_01h.grib2 index 13bb306db..3f10351c8 120000 --- a/fix/upp/RRFS_CONUS_3km/ari100y_01h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari100y_01h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari100y_01h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari100y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari100y_03h.grib2 b/fix/upp/RRFS_CONUS_3km/ari100y_03h.grib2 index 9bfe3efbd..79a886929 120000 --- a/fix/upp/RRFS_CONUS_3km/ari100y_03h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari100y_03h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari100y_03h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari100y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari100y_06h.grib2 b/fix/upp/RRFS_CONUS_3km/ari100y_06h.grib2 index 2799fab79..62babaff3 120000 --- a/fix/upp/RRFS_CONUS_3km/ari100y_06h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari100y_06h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari100y_06h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari100y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari100y_12h.grib2 b/fix/upp/RRFS_CONUS_3km/ari100y_12h.grib2 index 748300090..133e0836f 120000 --- a/fix/upp/RRFS_CONUS_3km/ari100y_12h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari100y_12h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari100y_12h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari100y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari100y_24h.grib2 b/fix/upp/RRFS_CONUS_3km/ari100y_24h.grib2 index fbae6d688..d427e3f2c 120000 --- a/fix/upp/RRFS_CONUS_3km/ari100y_24h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari100y_24h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari100y_24h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari100y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari10y_01h.grib2 b/fix/upp/RRFS_CONUS_3km/ari10y_01h.grib2 index c0e28760c..ce1d1eee3 120000 --- a/fix/upp/RRFS_CONUS_3km/ari10y_01h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari10y_01h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari10y_01h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari10y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari10y_03h.grib2 b/fix/upp/RRFS_CONUS_3km/ari10y_03h.grib2 index b0289bea4..5312d3313 120000 --- a/fix/upp/RRFS_CONUS_3km/ari10y_03h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari10y_03h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari10y_03h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari10y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari10y_06h.grib2 b/fix/upp/RRFS_CONUS_3km/ari10y_06h.grib2 index 060261357..87290fede 120000 --- a/fix/upp/RRFS_CONUS_3km/ari10y_06h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari10y_06h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari10y_06h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari10y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari10y_12h.grib2 b/fix/upp/RRFS_CONUS_3km/ari10y_12h.grib2 index 7f6893a2e..eb5a53aba 120000 --- a/fix/upp/RRFS_CONUS_3km/ari10y_12h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari10y_12h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari10y_12h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari10y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari10y_24h.grib2 b/fix/upp/RRFS_CONUS_3km/ari10y_24h.grib2 index 03b7daad1..30436844e 120000 --- a/fix/upp/RRFS_CONUS_3km/ari10y_24h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari10y_24h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari10y_24h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari10y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari2y_01h.grib2 b/fix/upp/RRFS_CONUS_3km/ari2y_01h.grib2 index a30b91eac..7bbce48d2 120000 --- a/fix/upp/RRFS_CONUS_3km/ari2y_01h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari2y_01h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari2y_01h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari2y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari2y_03h.grib2 b/fix/upp/RRFS_CONUS_3km/ari2y_03h.grib2 index 38986f98c..d56e73f37 120000 --- a/fix/upp/RRFS_CONUS_3km/ari2y_03h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari2y_03h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari2y_03h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari2y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari2y_06h.grib2 b/fix/upp/RRFS_CONUS_3km/ari2y_06h.grib2 index a11fe4822..ebcb13ad4 120000 --- a/fix/upp/RRFS_CONUS_3km/ari2y_06h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari2y_06h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari2y_06h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari2y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari2y_12h.grib2 b/fix/upp/RRFS_CONUS_3km/ari2y_12h.grib2 index b8146241c..232f9a535 120000 --- a/fix/upp/RRFS_CONUS_3km/ari2y_12h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari2y_12h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari2y_12h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari2y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari2y_24h.grib2 b/fix/upp/RRFS_CONUS_3km/ari2y_24h.grib2 index 632b17583..6c44b12a3 120000 --- a/fix/upp/RRFS_CONUS_3km/ari2y_24h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari2y_24h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari2y_24h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari2y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari5y_01h.grib2 b/fix/upp/RRFS_CONUS_3km/ari5y_01h.grib2 index 5e3d8af18..43678ef5f 120000 --- a/fix/upp/RRFS_CONUS_3km/ari5y_01h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari5y_01h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari5y_01h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari5y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari5y_03h.grib2 b/fix/upp/RRFS_CONUS_3km/ari5y_03h.grib2 index cc5229821..6fb6b20af 120000 --- a/fix/upp/RRFS_CONUS_3km/ari5y_03h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari5y_03h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari5y_03h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari5y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari5y_06h.grib2 b/fix/upp/RRFS_CONUS_3km/ari5y_06h.grib2 index 44e8dd8a9..aa932695e 120000 --- a/fix/upp/RRFS_CONUS_3km/ari5y_06h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari5y_06h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari5y_06h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari5y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari5y_12h.grib2 b/fix/upp/RRFS_CONUS_3km/ari5y_12h.grib2 index f466fe148..cd905e0e1 120000 --- a/fix/upp/RRFS_CONUS_3km/ari5y_12h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari5y_12h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari5y_12h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari5y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km/ari5y_24h.grib2 b/fix/upp/RRFS_CONUS_3km/ari5y_24h.grib2 index 4ce28a5ee..35f30e90e 120000 --- a/fix/upp/RRFS_CONUS_3km/ari5y_24h.grib2 +++ b/fix/upp/RRFS_CONUS_3km/ari5y_24h.grib2 @@ -1 +1 @@ -../../.agent/upp/RRFS_CONUS_3km/ari5y_24h.grib2 \ No newline at end of file +../../.agent/upp/RRFS_CONUS_3km_C3359/ari5y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_01h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_01h.grib2 new file mode 120000 index 000000000..7a63e6b97 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_01h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari100y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_03h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_03h.grib2 new file mode 120000 index 000000000..3bbdc54b4 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_03h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari100y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_06h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_06h.grib2 new file mode 120000 index 000000000..1924e5d8b --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_06h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari100y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_12h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_12h.grib2 new file mode 120000 index 000000000..50575d85d --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_12h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari100y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_24h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_24h.grib2 new file mode 120000 index 000000000..43612f428 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari100y_24h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari100y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_01h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_01h.grib2 new file mode 120000 index 000000000..c1d610a48 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_01h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari10y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_03h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_03h.grib2 new file mode 120000 index 000000000..bc2408257 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_03h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari10y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_06h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_06h.grib2 new file mode 120000 index 000000000..24d5585f8 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_06h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari10y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_12h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_12h.grib2 new file mode 120000 index 000000000..b6c4cf8b0 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_12h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari10y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_24h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_24h.grib2 new file mode 120000 index 000000000..4e6456f83 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari10y_24h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari10y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_01h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_01h.grib2 new file mode 120000 index 000000000..882b7f9cc --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_01h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari2y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_03h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_03h.grib2 new file mode 120000 index 000000000..7d35a324a --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_03h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari2y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_06h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_06h.grib2 new file mode 120000 index 000000000..07d3c4876 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_06h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari2y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_12h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_12h.grib2 new file mode 120000 index 000000000..2ac491b60 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_12h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari2y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_24h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_24h.grib2 new file mode 120000 index 000000000..2e51e9341 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari2y_24h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari2y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_01h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_01h.grib2 new file mode 120000 index 000000000..aaa6cedb3 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_01h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari5y_01h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_03h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_03h.grib2 new file mode 120000 index 000000000..48e48d9d8 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_03h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari5y_03h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_06h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_06h.grib2 new file mode 120000 index 000000000..a6664ca40 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_06h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari5y_06h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_12h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_12h.grib2 new file mode 120000 index 000000000..34474260e --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_12h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari5y_12h.grib2 \ No newline at end of file diff --git a/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_24h.grib2 b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_24h.grib2 new file mode 120000 index 000000000..166eaa483 --- /dev/null +++ b/fix/upp/RRFS_CONUS_3km_HRRRIC/ari5y_24h.grib2 @@ -0,0 +1 @@ +../../.agent/upp/RRFS_CONUS_3km_HRRRIC/ari5y_24h.grib2 \ No newline at end of file diff --git a/fix/upp/postxconfig-NT-fv3lam_rrfs.txt b/fix/upp/postxconfig-NT-fv3lam_rrfs.txt index 443730cb2..728949b4a 100644 --- a/fix/upp/postxconfig-NT-fv3lam_rrfs.txt +++ b/fix/upp/postxconfig-NT-fv3lam_rrfs.txt @@ -1,7 +1,7 @@ 2 220 254 -BGDAWP +PRSLEV 32769 ncep_nco v2003 @@ -11,8 +11,8 @@ oper fcst fcst hour -noaa_fsl_boulder -hrrr +nws_ncep +rrfs complex_packing_spatial_diff 2nd_ord_sptdiff fltng_pnt @@ -9415,7 +9415,7 @@ surface ? ? ? -BGRD3D +NATLEV 32769 ncep_nco v2003 @@ -9425,8 +9425,8 @@ oper fcst fcst hour -noaa_fsl_boulder -hrrr +nws_ncep +rrfs complex_packing_spatial_diff 2nd_ord_sptdiff fltng_pnt diff --git a/fix/upp/testbed_fields_bgdawp.txt b/fix/upp/testbed_fields_bgdawp.txt index da5661cda..0eaf9caa5 100644 --- a/fix/upp/testbed_fields_bgdawp.txt +++ b/fix/upp/testbed_fields_bgdawp.txt @@ -1,48 +1,71 @@ MSLET:mean sea level: PRMSL:mean sea level: -APCP:surface: -PRATE:surface: -WEASD:surface: -SNOD:surface: REFC:entire atmosphere (considered as a single layer): -REFD:1000 m above ground: -REFD:4000 m above ground: -REFD:1 hybrid level: -REFD:2 hybrid level: REFD:263 K level: GUST:surface: -HGT:500 mb: -VVEL:500 mb: -UGRD:500 mb: -VGRD:500 mb: -VVEL:700 mb: -MAXUVV:100-1000 mb: -MAXDVV:100-1000 mb: +MAXUVV:100-1000 mb above ground: +MAXDVV:100-1000 mb above ground: +REFD:1000 m above ground: MAXREF:1000 m above ground: MAXREF:263 K level: MXUPHL:5000-2000 m above ground: +MNUPHL:5000-2000 m above ground: MXUPHL:3000-0 m above ground: +MNUPHL:3000-0 m above ground: +PRES:surface: +HGT:surface: TMP:2 m above ground: DPT:2 m above ground: RH:2 m above ground: -TMAX:2 m above ground: -MINRH:2 m above ground: UGRD:10 m above ground: VGRD:10 m above ground: -MAXUW:10 m above ground: -MAXVW:10 m above ground: -CSNOW:surface: -CICEP:surface: -CFRZR:surface: -CRAIN:surface: -CPOFP:surface: -PRES:surface: -HGT:surface: +WIND:10 m above ground: +APCP:surface: CAPE:surface: CIN:surface: +CAPE:180-0 mb above ground: +CIN:180-0 mb above ground: +CAPE:90-0 mb above ground: +CIN:90-0 mb above ground: +CAPE:255-0 mb above ground: +CIN:255-0 mb above ground: HLCY:3000-0 m above ground: HLCY:1000-0 m above ground: UPHL:5000-2000 m above ground: +RETOP:entire atmosphere (considered as a single layer): +HGT:300 mb: +UGRD:300 mb: +VGRD:300 mb: +TMP:300 mb: +HGT:500 mb: +UGRD:500 mb: +VGRD:500 mb: +TMP:500 mb: +HGT:700 mb: +UGRD:700 mb: +VGRD:700 mb: +TMP:700 mb: +HGT:850 mb: +UGRD:850 mb: +VGRD:850 mb: +TMP:850 mb: +SPFH:850 mb: +REFD:1 hybrid level: +REFD:2 hybrid level: +VVEL:500 mb: +PRATE:surface: +PWAT:entire atmosphere (considered as a single layer): +WEASD:surface: +SNOD:surface: +REFD:4000 m above ground: +VVEL:700 mb: +TMAX:2 m above ground: +MINRH:2 m above ground: +CSNOW:surface: +CICEP:surface: +CFRZR:surface: +CRAIN:surface: +CPOFP:surface: TMP:30-0 mb above ground: RH:30-0 mb above ground: DPT:30-0 mb above ground: @@ -50,29 +73,3 @@ UGRD:30-0 mb above ground: VGRD:30-0 mb above ground: VVEL:30-0 mb above ground: 4LFTX:180-0 mb above ground: -CAPE:180-0 mb above ground: -CIN:180-0 mb above ground: -CAPE:90-0 mb above ground: -CIN:90-0 mb above ground: -CAPE:255-0 mb above ground: -CIN:255-0 mb above ground: -HGT:local level type 215 0: -CEIL:no_level: -CEIL:cloud base: -VIS:surface: -parmcat=3 parm=197 -parmcat=16 parm=196 -parmcat=16 parm=195 -parmcat=2 parm=220 -parmcat=2 parm=221 -parmcat=16 parm=198 -parmcat=7 parm=199 -parmcat=1 parm=198 -parmcat=2 parm=222 -parmcat=2 parm=223 -parmcat=1 parm=195 -parmcat=1 parm=194 -parmcat=1 parm=193 -parmcat=1 parm=192 -parmcat=7 parm=197 -parmcat=7 parm=193 diff --git a/jobs/JREGIONAL_RUN_ANAL b/jobs/JREGIONAL_RUN_ANAL index 28ff02a68..f5fe5bb62 100755 --- a/jobs/JREGIONAL_RUN_ANAL +++ b/jobs/JREGIONAL_RUN_ANAL @@ -94,6 +94,20 @@ if [ ! -d "${SATBIAS_DIR}" ]; then mkdir_vrfy -p ${SATBIAS_DIR} fi +# +#----------------------------------------------------------------------- +# +# create COMOUT directory +# +#----------------------------------------------------------------------- + +if [ "${RUN_ENVIR}" = "nco" ]; then + COMOUT="${COMOUT_BASEDIR}/$RUN.$PDY/$cyc${SLASH_ENSMEM_SUBDIR}" + if [ ${CYCLE_TYPE} == "spinup" ]; then + COMOUT="${COMOUT_BASEDIR}/$RUN.$PDY/${cyc}_spinup${SLASH_ENSMEM_SUBDIR}" + fi + mkdir_vrfy -p "${COMOUT}" +fi # #----------------------------------------------------------------------- # @@ -110,6 +124,7 @@ $SCRIPTSDIR/exregional_run_analysis.sh \ analworkdir="${analworkdir}" \ observer_nwges_dir="${observer_nwges_dir}" \ slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" \ + comout="${COMOUT}" \ satbias_dir="${SATBIAS_DIR}" || \ print_err_msg_exit "\ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed." diff --git a/scripts/exregional_process_bufr.sh b/scripts/exregional_process_bufr.sh index 22474141b..93d60cb99 100755 --- a/scripts/exregional_process_bufr.sh +++ b/scripts/exregional_process_bufr.sh @@ -186,15 +186,8 @@ cp_vrfy $BUFR_TABLE prepobs_prep.bufrtable if [[ "${NET}" = "RTMA"* ]]; then SUBH=$(date +%M -d "${START_DATE}") obs_source="rtma_ru" - case $MACHINE in - "WCOSS_C" | "WCOSS" | "WCOSS_DELL_P3") - obsfileprefix=${obs_source} - obspath_tmp=${OBSPATH}/${obs_source}.${YYYYMMDD} - ;; - "JET" | "HERA") - obsfileprefix=${obs_source} - obspath_tmp=${OBSPATH}/${obs_source}.${YYYYMMDD} - esac + obsfileprefix=${obs_source} + obspath_tmp=${OBSPATH}/${obs_source}.${YYYYMMDD} else SUBH="" diff --git a/scripts/exregional_run_analysis.sh b/scripts/exregional_run_analysis.sh index 04c3ea43b..3c6277b47 100755 --- a/scripts/exregional_run_analysis.sh +++ b/scripts/exregional_run_analysis.sh @@ -55,7 +55,7 @@ specified cycle. # #----------------------------------------------------------------------- # -valid_args=( "cycle_dir" "cycle_type" "gsi_type" "mem_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" "satbias_dir" ) +valid_args=( "cycle_dir" "cycle_type" "gsi_type" "mem_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" "comout" "satbias_dir" ) process_args valid_args "$@" # #----------------------------------------------------------------------- @@ -368,19 +368,8 @@ sed -i "s/hh/${HH}/" coupler.res if [[ "${NET}" = "RTMA"* ]]; then SUBH=$(date +%M -d "${START_DATE}") obs_source="rtma_ru" - case $MACHINE in - "WCOSS_C" | "WCOSS" | "WCOSS_DELL_P3") - obsfileprefix=${obs_source} - obspath_tmp=${OBSPATH}/${obs_source}.${YYYYMMDD} - ;; - "JET" | "HERA") - obsfileprefix=${obs_source} - obspath_tmp=${OBSPATH}/${obs_source}.${YYYYMMDD} - ;; - *) - obsfileprefix=${obs_source} - obspath_tmp=${OBSPATH} - esac + obsfileprefix=${obs_source} + obspath_tmp=${OBSPATH}/${obs_source}.${YYYYMMDD} else SUBH="" @@ -962,6 +951,34 @@ Exiting script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" ========================================================================" # +#----------------------------------------------------------------------- +# +# Copy analysis results to com +# +#----------------------------------------------------------------------- +# +# +mynet=${NET} +if [ ${BKTYPE} -eq 1 ]; then # cold start, put analysis back to current INPUT + cp_vrfy ${analworkdir}/fv3_dynvars ${comout}/${mynet}.t${cyc}z.gfs_data.tile7.halo0.nc + cp_vrfy ${analworkdir}/fv3_sfcdata ${comout}/${mynet}.t${cyc}z.sfc_data.tile7.halo0.nc +else # cycling + + if [ "${IO_LAYOUT_Y}" == "1" ]; then + cp_vrfy ${analworkdir}/fv3_dynvars ${comout}/${mynet}.t${cyc}z.fv_core.res.tile1.nc + cp_vrfy ${analworkdir}/fv3_tracer ${comout}/${mynet}.t${cyc}z.fv_tracer.res.tile1.nc + cp_vrfy ${analworkdir}/fv3_sfcdata ${comout}/${mynet}.t${cyc}z.sfc_data.nc + else + for ii in ${list_iolayout} + do + iii=`printf %4.4i $ii` + cp_vrfy ${analworkdir}/fv3_dynvars.${iii} ${comout}/${mynet}.t${cyc}z.fv_core.res.tile1.nc.${iii} + cp_vrfy ${analworkdir}/fv3_tracer.${iii} ${comout}/${mynet}.t${cyc}z.fv_tracer.res.tile1.nc.${iii} + cp_vrfy ${analworkdir}/fv3_sfcdata.${iii} ${comout}/${mynet}.t${cyc}z.sfc_data.nc.${iii} + done + fi + +fi # #----------------------------------------------------------------------- # diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 0e4a28f52..d1927d0b8 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -106,8 +106,7 @@ case $MACHINE in "WCOSS_DELL_P3") ulimit -s unlimited ulimit -a - APRUN="mpirun" - OMP_NUM_THREADS=4 + APRUN="mpirun -l -np ${PE_MEMBER01}" OMP_STACKSIZE=2048m ;; diff --git a/scripts/exregional_run_post.sh b/scripts/exregional_run_post.sh index ad188175b..253f5eef7 100755 --- a/scripts/exregional_run_post.sh +++ b/scripts/exregional_run_post.sh @@ -311,14 +311,16 @@ fi cp_vrfy ${post_config_fp} ./postxconfig-NT.txt cp_vrfy ${post_params_fp} ./params_grib2_tbl_new cp_vrfy ${EXECDIR}/upp.x . -if [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km" ]; then +if [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km_HRRRIC" ]; then grid_specs_rrfs="lambert:-97.5:38.500000 237.826355:1746:3000 21.885885:1014:3000" +elif [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km" ]; then + grid_specs_rrfs="lambert:-97.5:38.500000 237.280700:1799:3000 21.138120:1057:3000" elif [ ${PREDEF_GRID_NAME} = "RRFS_NA_3km" ]; then grid_specs_rrfs="rot-ll:248.000000:-42.000000:0.000000 309.000000:4081:0.025000 -33.0000000:2641:0.025000" elif [ ${PREDEF_GRID_NAME} = "GSD_RAP13km" ]; then grid_specs_rrfs="rot-ll:254.000000:-36.000000:0.000000 304.174600:956:0.1169118 -48.5768500:831:0.1170527" fi -if [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km" ] || [ ${PREDEF_GRID_NAME} = "RRFS_NA_3km" ] || [ ${PREDEF_GRID_NAME} = "GSD_RAP13km" ]; then +if [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km_HRRRIC" ] || [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km" ] || [ ${PREDEF_GRID_NAME} = "RRFS_NA_3km" ] || [ ${PREDEF_GRID_NAME} = "GSD_RAP13km" ]; then if [ -f ${FFG_DIR}/latest.FFG ]; then cp_vrfy ${FFG_DIR}/latest.FFG . wgrib2 latest.FFG -match "0-12 hour" -end -new_grid_interpolation bilinear -new_grid_winds grid -new_grid ${grid_specs_rrfs} ffg_12h.grib2 @@ -381,10 +383,9 @@ fi bgdawp=${postprd_dir}/${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2 bgrd3d=${postprd_dir}/${NET}.t${cyc}z.bgrd3df${fhr}.${tmmark}.grib2 bgsfc=${postprd_dir}/${NET}.t${cyc}z.bgsfcf${fhr}.${tmmark}.grib2 -mv_vrfy BGDAWP.GrbF${post_fhr} ${bgdawp} -mv_vrfy BGRD3D.GrbF${post_fhr} ${bgrd3d} -# small subset of surface fields for testbed and internal use -#wgrib2 -match "APCP|parmcat=16 parm=196|PRATE" ${bgrd3d} -grib ${bgsfc} + +wgrib2 PRSLEV.GrbF${post_fhr} -set center 7 -grib ${bgdawp} +wgrib2 NATLEV.GrbF${post_fhr} -set center 7 -grib ${bgrd3d} # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_prepstart.sh b/scripts/exregional_run_prepstart.sh index 7b4ce03b5..f70eae0d2 100755 --- a/scripts/exregional_run_prepstart.sh +++ b/scripts/exregional_run_prepstart.sh @@ -156,6 +156,7 @@ YYYYMMDDm2=$(date +%Y%m%d -d "${START_DATE} 2 days ago") # Compute date & time components for the SST analysis time relative to current analysis time YYJJJ00000000=`date +"%y%j00000000" -d "${START_DATE} 1 day ago"` YYJJJ1200=`date +"%y%j1200" -d "${START_DATE} 1 day ago"` +YYJJJ2200000000=`date +"%y%j2200000000" -d "${START_DATE} 1 day ago"` # #----------------------------------------------------------------------- # @@ -361,15 +362,15 @@ if [ ${HH} -eq ${SNOWICE_update_hour} ] && [ ${cycle_type} == "prod" ] ; then echo "Update snow cover based on imssnow at ${SNOWICE_update_hour}z" if [ -r "${IMSSNOW_ROOT}/latest.SNOW_IMS" ]; then cp ${IMSSNOW_ROOT}/latest.SNOW_IMS . - elif [ -r "${IMSSNOW_ROOT}/${YYJJJ00000000}" ]; then - cp ${IMSSNOW_ROOT}/${YYJJJ00000000} latest.SNOW_IMS + elif [ -r "${IMSSNOW_ROOT}/${YYJJJ2200000000}" ]; then + cp ${IMSSNOW_ROOT}/${YYJJJ2200000000} latest.SNOW_IMS elif [ -r "${IMSSNOW_ROOT}/rap.${YYYYMMDD}/rap.t${HH}z.imssnow.grib2" ]; then cp ${IMSSNOW_ROOT}/rap.${YYYYMMDD}/rap.t${HH}z.imssnow.grib2 latest.SNOW_IMS elif [ -r "${IMSSNOW_ROOT}/rap.${YYYYMMDD}/rap_e.t${HH}z.imssnow.grib2" ]; then - cp ${IMSSNOW_ROOT}/rap.${YYYYMMDD}/rap_e.t${HH}z.imssnow.grib2 latest.SNOW_IMS + cp ${IMSSNOW_ROOT}/rap_e.${YYYYMMDD}/rap_e.t${HH}z.imssnow.grib2 latest.SNOW_IMS else echo "${IMSSNOW_ROOT} data does not exist!!" - echo "ERROR: No snow update at ${time_str}!!!!" + echo "ERROR: No snow update at ${HH}!!!!" fi if [ -r "latest.SNOW_IMS" ]; then ln_vrfy -sf ./latest.SNOW_IMS imssnow2 @@ -397,7 +398,7 @@ Please ensure that you've built this executable." fi cp_vrfy ${snowice_exec_fp} . - ${APRUN} ${snowice_exec_fn} ${IO_LAYOUT_Y} || \ + ${APRUN} ./${snowice_exec_fn} ${IO_LAYOUT_Y} || \ print_err_msg_exit "\ Call to executable (fvcom_exe) to modify sfc fields for FV3-LAM failed: snowice_exe = \"${snowice_exec_fp}\" @@ -431,7 +432,7 @@ if [ ${HH} -eq ${SST_update_hour} ] && [ ${cycle_type} == "prod" ] ; then cp ${SST_ROOT}/sst.$YYYYMMDDm1/rtgssthr_grb_0.083.grib2 latest.SST else echo "${SST_ROOT} data does not exist!!" - echo "ERROR: No SST update at ${time_str}!!!!" + echo "ERROR: No SST update at ${HH}!!!!" fi if [ -r "latest.SST" ]; then cp_vrfy ${FIXgsm}/RTG_SST_landmask.dat RTG_SST_landmask.dat @@ -827,7 +828,7 @@ Please ensure that you've built this executable." fi # - ${APRUN} ${fvcom_exec_fn} ${surface_file} fvcom.nc ${FVCOM_WCSTART} ${fvcom_time} ${IO_LAYOUT_Y} || \ + ${APRUN} ./${fvcom_exec_fn} ${surface_file} fvcom.nc ${FVCOM_WCSTART} ${fvcom_time} ${IO_LAYOUT_Y} || \ print_err_msg_exit "\ Call to executable (fvcom_exe) to modify sfc fields for FV3-LAM failed: fvcom_exe = \"${fvcom_exec_fn}\" diff --git a/scripts/exregional_run_wgrib2.sh b/scripts/exregional_run_wgrib2.sh index f7280c41f..a218eaec4 100755 --- a/scripts/exregional_run_wgrib2.sh +++ b/scripts/exregional_run_wgrib2.sh @@ -210,6 +210,8 @@ ln_vrfy -sf --relative ${comout}/${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2 $ ln_vrfy -sf --relative ${comout}/${NET}.t${cyc}z.bgrd3df${fhr}.${tmmark}.grib2 ${comout}/BGRD3D_${basetime}${post_fhr}00 ln_vrfy -sf --relative ${comout}/${NET}.t${cyc}z.bgsfcf${fhr}.${tmmark}.grib2 ${comout}/BGSFC_${basetime}${post_fhr}00 +ln_vrfy -sf --relative ${comout}/${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2 ${comout}/rrfs.t${cyc}z.prslev.f${fhr}.grib2 +ln_vrfy -sf --relative ${comout}/${NET}.t${cyc}z.bgrd3df${fhr}.${tmmark}.grib2 ${comout}/rrfs.t${cyc}z.natlev.f${fhr}.grib2 # Remap to additional output grids if requested if [ ${#ADDNL_OUTPUT_GRIDS[@]} -gt 0 ]; then @@ -264,6 +266,18 @@ if [ ${#ADDNL_OUTPUT_GRIDS[@]} -gt 0 ]; then mkdir -p ${comout}/${grid}_grid cp_vrfy ${bg_remap} ${comout}/${grid}_grid/${NET}.t${cyc}z.bg${leveltype}f${fhr}.${tmmark}.grib2 + if [ $leveltype = 'dawp' ]; then + ln_vrfy -fs --relative ${comout}/${grid}_grid/${NET}.t${cyc}z.bg${leveltype}f${fhr}.${tmmark}.grib2 ${comout}/rrfs.t${cyc}z.prslev.f${fhr}.conus_3km.grib2 + fi + + if [ $leveltype = 'rd3d' ]; then + ln_vrfy -fs --relative ${comout}/${grid}_grid/${NET}.t${cyc}z.bg${leveltype}f${fhr}.${tmmark}.grib2 ${comout}/rrfs.t${cyc}z.natlev.f${fhr}.conus_3km.grib2 + fi + + if [ $leveltype = 'sfc' ]; then + ln_vrfy -fs --relative ${comout}/${grid}_grid/${NET}.t${cyc}z.bg${leveltype}f${fhr}.${tmmark}.grib2 ${comout}/rrfs.t${cyc}z.testbed.f${fhr}.conus_3km.grib2 + fi + # Link output for transfer from Jet to web ln_vrfy -fs --relative ${comout}/${grid}_grid/${NET}.t${cyc}z.bg${leveltype}f${fhr}.${tmmark}.grib2 ${comout}/${grid}_grid/BG${leveltype^^}_${basetime}${post_fhr}00 done diff --git a/ush/set_rrfs_config.sh b/ush/set_rrfs_config.sh index 0d227482e..b2d4e6118 100644 --- a/ush/set_rrfs_config.sh +++ b/ush/set_rrfs_config.sh @@ -60,6 +60,7 @@ if [[ $DO_RETRO == "TRUE" ]] ; then SFCOBS_USELIST="/mnt/lfs4/BMC/wrfruc/Ruifang.Li/data/mesonet_uselists" SST_ROOT="/mnt/lfs4/BMC/wrfruc/Ruifang.Li/data/highres_sst" GVF_ROOT="/mnt/lfs4/BMC/wrfruc/Ruifang.Li/data/gvf/grib2" + IMSSNOW_ROOT="/mnt/lfs4/BMC/wrfruc/Ruifang.Li/data/snow/ims96/grib2" fi if [[ $MACHINE == "hera" ]] ; then @@ -94,6 +95,7 @@ if [[ $DO_RETRO == "TRUE" ]] ; then SFCOBS_USELIST="/scratch2/BMC/zrtrr/rli/data/mesonet_uselists" SST_ROOT="/scratch2/BMC/zrtrr/rli/data/highres_sst" GVF_ROOT="/scratch2/BMC/zrtrr/rli/data/gvf/grib2" + IMSSNOW_ROOT="/scratch2/BMC/zrtrr/rli/data/snow/ims96/grib2" fi if [[ $MACHINE == "orion" ]] ; then EXTRN_MDL_SOURCE_BASEDIR_ICS=/work/noaa/wrfruc/mhu/rrfs/data/gfs