From e7bb4bd5696073df494a415e4ab41ba5a7a1ae0b Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:12:22 -0800 Subject: [PATCH 01/26] table 1.0 --- tests/test_all_key_tables.F90 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 58ea9c3..ff98f71 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -107,8 +107,16 @@ program test_all_tables if (val1 .ne. 27) stop 2 call get_g2_versionno('v112021', val1, ierr) if (val1 .ne. 28) stop 2 - call get_g2_versionno('preoper', val1, ierr) + call get_g2_versionno('v112021', val1, ierr) if (val1 .ne. 29) stop 2 + call get_g2_versionno('v052022', val1, ierr) + if (val1 .ne. 30) stop 2 + call get_g2_versionno('v112022', val1, ierr) + if (val1 .ne. 31) stop 2 + call get_g2_versionno('v062023', val1, ierr) + if (val1 .ne. 32) stop 2 + call get_g2_versionno('preoper', val1, ierr) + if (val1 .ne. 33) stop 2 call get_g2_versionno('xxx', val1, ierr) if (ierr .ne. 9) stop 2 From 638909d5cc5b1143a1a5bcad17735e36daa4cdd5 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:12:31 -0800 Subject: [PATCH 02/26] Update grib2_all_tables_module.F90 --- src/grib2_all_tables_module.F90 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index a6a78e9..31ae105 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -142,7 +142,11 @@ module grib2_all_tables_module data table1_0(27) /version_no('v112020',26)/ data table1_0(28) /version_no('v052021',27)/ data table1_0(29) /version_no('v112021',28)/ - data table1_0(30) /version_no('preoper',29)/ + data table1_0(30) /version_no('v052022',29)/ + data table1_0(30) /version_no('v112022',30)/ + data table1_0(30) /version_no('v062023',31)/ + data table1_0(30) /version_no('v112023',32)/ + data table1_0(30) /version_no('preoper',33)/ ! ! type local_table_vers_no From 2bd0f7e9e97418ccd740bc31f426f44b91b0fe06 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:16:18 -0800 Subject: [PATCH 03/26] fix indices --- src/grib2_all_tables_module.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 31ae105..b3ebeb1 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -143,10 +143,10 @@ module grib2_all_tables_module data table1_0(28) /version_no('v052021',27)/ data table1_0(29) /version_no('v112021',28)/ data table1_0(30) /version_no('v052022',29)/ - data table1_0(30) /version_no('v112022',30)/ - data table1_0(30) /version_no('v062023',31)/ - data table1_0(30) /version_no('v112023',32)/ - data table1_0(30) /version_no('preoper',33)/ + data table1_0(31) /version_no('v112022',30)/ + data table1_0(32) /version_no('v062023',31)/ + data table1_0(33) /version_no('v112023',32)/ + data table1_0(34) /version_no('preoper',33)/ ! ! type local_table_vers_no From 7cab57606334227698874a3c620c5796153622af Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:33:07 -0800 Subject: [PATCH 04/26] debug --- tests/test_all_key_tables.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index ff98f71..0e36ccb 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -107,14 +107,14 @@ program test_all_tables if (val1 .ne. 27) stop 2 call get_g2_versionno('v112021', val1, ierr) if (val1 .ne. 28) stop 2 - call get_g2_versionno('v112021', val1, ierr) - if (val1 .ne. 29) stop 2 call get_g2_versionno('v052022', val1, ierr) + if (val1 .ne. 29) stop 2 + call get_g2_versionno('v112022', val1, ierr) if (val1 .ne. 30) stop 2 + call get_g2_versionno('v062023', val1, ierr) + if (val1 .ne. 31) stop 2 call get_g2_versionno('v112022', val1, ierr) if (val1 .ne. 31) stop 2 - call get_g2_versionno('v062023', val1, ierr) - if (val1 .ne. 32) stop 2 call get_g2_versionno('preoper', val1, ierr) if (val1 .ne. 33) stop 2 call get_g2_versionno('xxx', val1, ierr) From 3b0a5dea001ed2e50165abdaeb572db1b7d97313 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:35:09 -0800 Subject: [PATCH 05/26] Update test_all_key_tables.F90 --- tests/test_all_key_tables.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 0e36ccb..6b8205c 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -114,7 +114,7 @@ program test_all_tables call get_g2_versionno('v062023', val1, ierr) if (val1 .ne. 31) stop 2 call get_g2_versionno('v112022', val1, ierr) - if (val1 .ne. 31) stop 2 + if (val1 .ne. 32) stop 2 call get_g2_versionno('preoper', val1, ierr) if (val1 .ne. 33) stop 2 call get_g2_versionno('xxx', val1, ierr) From f313e63cd1ead3c344b84f57cacee3d78847d458 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:37:22 -0800 Subject: [PATCH 06/26] Update test_all_key_tables.F90 --- tests/test_all_key_tables.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 6b8205c..6ba46c9 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -113,7 +113,7 @@ program test_all_tables if (val1 .ne. 30) stop 2 call get_g2_versionno('v062023', val1, ierr) if (val1 .ne. 31) stop 2 - call get_g2_versionno('v112022', val1, ierr) + call get_g2_versionno('v112023', val1, ierr) if (val1 .ne. 32) stop 2 call get_g2_versionno('preoper', val1, ierr) if (val1 .ne. 33) stop 2 From 5eebba4bb091ba9036464082c2785d6a5864d8ee Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:09:42 -0800 Subject: [PATCH 07/26] table 1.2 --- src/grib2_all_tables_module.F90 | 2 ++ tests/test_all_key_tables.F90 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index b3ebeb1..ebb88c2 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -180,6 +180,8 @@ module grib2_all_tables_module data table1_2(2) /sigreftime('fcst',1)/ data table1_2(3) /sigreftime('vfcst',2)/ data table1_2(4) /sigreftime('obstime',3)/ + data table1_2(4) /sigreftime('local',4)/ + data table1_2(4) /sigreftime('sim_start',5)/ data table1_2(5) /sigreftime('missing',255)/ ! ! diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 6ba46c9..c4c4329 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -147,6 +147,10 @@ program test_all_tables if (val1 .ne. 2) stop 4 call get_g2_sigreftime('obstime', val1, ierr) if (val1 .ne. 3) stop 4 + call get_g2_sigreftime('local', val1, ierr) + if (val1 .ne. 4) stop 4 + call get_g2_sigreftime('sim_start', val1, ierr) + if (val1 .ne. 5) stop 4 call get_g2_sigreftime('missing', val1, ierr) if (val1 .ne. 255) stop 4 call get_g2_sigreftime('xxxx', val1, ierr) From 7e416e06542e20227cb3d5a56e82bf5b7f76e4d4 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:10:47 -0800 Subject: [PATCH 08/26] Update grib2_all_tables_module.F90 --- src/grib2_all_tables_module.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index ebb88c2..9017e07 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -180,9 +180,9 @@ module grib2_all_tables_module data table1_2(2) /sigreftime('fcst',1)/ data table1_2(3) /sigreftime('vfcst',2)/ data table1_2(4) /sigreftime('obstime',3)/ - data table1_2(4) /sigreftime('local',4)/ - data table1_2(4) /sigreftime('sim_start',5)/ - data table1_2(5) /sigreftime('missing',255)/ + data table1_2(5) /sigreftime('local',4)/ + data table1_2(6) /sigreftime('sim_start',5)/ + data table1_2(7) /sigreftime('missing',255)/ ! ! type prod_status From 59acfa12a7c2940c9ab6f84e4268a515f43ca422 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:18:55 -0800 Subject: [PATCH 09/26] table 1.3 --- src/grib2_all_tables_module.F90 | 4 ++++ tests/test_all_key_tables.F90 | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 9017e07..f9bea38 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -206,6 +206,10 @@ module grib2_all_tables_module data table1_3(9) /prod_status('s2s_test',7)/ data table1_3(10) /prod_status('unens_rreanl',8)/ data table1_3(11) /prod_status('unens_rreanl_test',9)/ + data table1_3(12) /prod_status('copernic_rreanl',10)/ + data table1_3(13) /prod_status('copernic_rreanl_test',11)/ + data table1_3(14) /prod_status('dest_earth',12)/ + data table1_3(15) /prod_status('dest_earth_test',13)/ ! ! type type_of_data diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index c4c4329..f1d5d06 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -179,6 +179,14 @@ program test_all_tables if (val1 .ne. 8) stop 5 call get_g2_prodstatus('unens_rreanl_test', val1, ierr) if (val1 .ne. 9) stop 5 + call get_g2_prodstatus('copernic_rreanl', val1, ierr) + if (val1 .ne. 10) stop 5 + call get_g2_prodstatus('copernic_rreanl_test', val1, ierr) + if (val1 .ne. 11) stop 5 + call get_g2_prodstatus('dest_earth', val1, ierr) + if (val1 .ne. 12) stop 5 + call get_g2_prodstatus('dest_earth_test', val1, ierr) + if (val1 .ne. 13) stop 5 call get_g2_prodstatus('xxxx', val1, ierr) if (ierr .ne. 9) stop 5 From 79f84180213c2974e851e8ec7876de18785bb10a Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:28:10 -0800 Subject: [PATCH 10/26] add some update comments --- src/grib2_all_tables_module.F90 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index f9bea38..c110900 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -142,6 +142,9 @@ module grib2_all_tables_module data table1_0(27) /version_no('v112020',26)/ data table1_0(28) /version_no('v052021',27)/ data table1_0(29) /version_no('v112021',28)/ + ! + ! Added Version Number (12/20/2024) + ! data table1_0(30) /version_no('v052022',29)/ data table1_0(31) /version_no('v112022',30)/ data table1_0(32) /version_no('v062023',31)/ @@ -180,9 +183,12 @@ module grib2_all_tables_module data table1_2(2) /sigreftime('fcst',1)/ data table1_2(3) /sigreftime('vfcst',2)/ data table1_2(4) /sigreftime('obstime',3)/ - data table1_2(5) /sigreftime('local',4)/ - data table1_2(6) /sigreftime('sim_start',5)/ - data table1_2(7) /sigreftime('missing',255)/ + data table1_2(5) /sigreftime('missing',255)/ + ! + ! Added Significance of Ref Time (12/20/2024) + ! + data table1_2(6) /sigreftime('local',4)/ + data table1_2(7) /sigreftime('sim_start',5)/ ! ! type prod_status @@ -206,6 +212,9 @@ module grib2_all_tables_module data table1_3(9) /prod_status('s2s_test',7)/ data table1_3(10) /prod_status('unens_rreanl',8)/ data table1_3(11) /prod_status('unens_rreanl_test',9)/ + ! + ! Added Production Status (12/20/2024) + ! data table1_3(12) /prod_status('copernic_rreanl',10)/ data table1_3(13) /prod_status('copernic_rreanl_test',11)/ data table1_3(14) /prod_status('dest_earth',12)/ From e98d402884e25ac0d38a13ed06aab67446951867 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:33:19 -0800 Subject: [PATCH 11/26] table 4.3 --- src/grib2_all_tables_module.F90 | 6 ++++++ tests/test_all_key_tables.F90 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index c110900..b415314 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -289,6 +289,12 @@ module grib2_all_tables_module ! data table4_3(29) /type_of_gen_proc('local_prob_match_mean',200)/ ! + ! Added Generating Process (12/20/2024) + ! + data table4_3(30) /type_of_gen_proc('first_guess',19)/ + data table4_3(31) /type_of_gen_proc('anal_inc',20)/ + data table4_3(32) /type_of_gen_proc('init_inc',21)/ + ! ! type unit_of_time_range character(len=30) :: unitoftimerangekey diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index f1d5d06..e4dbe0b 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -276,6 +276,12 @@ program test_all_tables if (val1 .ne. 199) stop 7 call get_g2_typeofgenproc('local_prob_match_mean', val1, ierr) if (val1 .ne. 200) stop 7 + call get_g2_typeofgenproc('first_guess', val1, ierr) + if (val1 .ne. 19) stop 7 + call get_g2_typeofgenproc('anal_inc', val1, ierr) + if (val1 .ne. 20) stop 7 + call get_g2_typeofgenproc('init_inc', val1, ierr) + if (val1 .ne. 21) stop 7 call get_g2_typeofgenproc('xxxx', val1, ierr) if (ierr .ne. 9) stop 7 From 2fb6120efd273063edcf999eec11c7e500be728b Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:53:30 -0800 Subject: [PATCH 12/26] table 4.5 17-19 --- src/grib2_all_tables_module.F90 | 6 ++++++ tests/test_all_key_tables.F90 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index b415314..0260346 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -439,6 +439,12 @@ module grib2_all_tables_module data table4_5(105) /fixed_surface_types('eff_layer_bottom_level',217)/ data table4_5(106) /fixed_surface_types('eff_layer',218)/ ! + ! Added fixed surface levels (12/20/2024) + ! + data table4_5(106) /fixed_surface_types('dep_level_unstable_parcel_air',17)/ + data table4_5(106) /fixed_surface_types('dep_level_mixed_parcel_air',18)/ + data table4_5(106) /fixed_surface_types('lowest_cloud_cover',19)/ + ! ! type type_of_ens_fcst character(len=50) :: typeofensfcstkey diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index e4dbe0b..b49bc23 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -526,6 +526,12 @@ program test_all_tables if (val1 .ne. 217) stop 9 call get_g2_fixedsurfacetypes('eff_layer', val1, ierr) if (val1 .ne. 218) stop 9 + call get_g2_fixedsurfacetypes('dep_level_unstable_parcel_air', val1, ierr) + if (val1 .ne. 17) stop 9 + call get_g2_fixedsurfacetypes('dep_level_mixed_parcel_air', val1, ierr) + if (val1 .ne. 18) stop 9 + call get_g2_fixedsurfacetypes('lowest_cloud_cover', val1, ierr) + if (val1 .ne. 19) stop 9 call get_g2_fixedsurfacetypes('xxx', val1, ierr) if (ierr .ne. 9) stop 9 From e549fe49fdd7eaf3e0a2cf28887e1a98cd962636 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:55:00 -0800 Subject: [PATCH 13/26] Update grib2_all_tables_module.F90 --- src/grib2_all_tables_module.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 0260346..268d22a 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -441,9 +441,9 @@ module grib2_all_tables_module ! ! Added fixed surface levels (12/20/2024) ! - data table4_5(106) /fixed_surface_types('dep_level_unstable_parcel_air',17)/ - data table4_5(106) /fixed_surface_types('dep_level_mixed_parcel_air',18)/ - data table4_5(106) /fixed_surface_types('lowest_cloud_cover',19)/ + data table4_5(107) /fixed_surface_types('dep_level_unstable_parcel_air',17)/ + data table4_5(108) /fixed_surface_types('dep_level_mixed_parcel_air',18)/ + data table4_5(109) /fixed_surface_types('lowest_cloud_cover',19)/ ! ! type type_of_ens_fcst From 93a03093922a3849f48891e7088f8a195a336d2b Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:58:53 -0800 Subject: [PATCH 14/26] table 4.5 26-27 --- src/grib2_all_tables_module.F90 | 2 ++ tests/test_all_key_tables.F90 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 268d22a..b815912 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -444,6 +444,8 @@ module grib2_all_tables_module data table4_5(107) /fixed_surface_types('dep_level_unstable_parcel_air',17)/ data table4_5(108) /fixed_surface_types('dep_level_mixed_parcel_air',18)/ data table4_5(109) /fixed_surface_types('lowest_cloud_cover',19)/ + data table4_5(110) /fixed_surface_types('conv_cloud_base',26)/ + data table4_5(111) /fixed_surface_types('conv_cloud_top',27)/ ! ! type type_of_ens_fcst diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index b49bc23..c3e8791 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -532,6 +532,10 @@ program test_all_tables if (val1 .ne. 18) stop 9 call get_g2_fixedsurfacetypes('lowest_cloud_cover', val1, ierr) if (val1 .ne. 19) stop 9 + call get_g2_fixedsurfacetypes('conv_cloud_base', val1, ierr) + if (val1 .ne. 26) stop 9 + call get_g2_fixedsurfacetypes('conv_cloud_top', val1, ierr) + if (val1 .ne. 27) stop 9 call get_g2_fixedsurfacetypes('xxx', val1, ierr) if (ierr .ne. 9) stop 9 From 1846a55fca22b4f45a19347720fed40399bc5d16 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:05:43 -0800 Subject: [PATCH 15/26] table 4.5 30-35 --- src/grib2_all_tables_module.F90 | 6 ++++++ tests/test_all_key_tables.F90 | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index b815912..958d025 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -446,6 +446,12 @@ module grib2_all_tables_module data table4_5(109) /fixed_surface_types('lowest_cloud_cover',19)/ data table4_5(110) /fixed_surface_types('conv_cloud_base',26)/ data table4_5(111) /fixed_surface_types('conv_cloud_top',27)/ + data table4_5(112) /fixed_surface_types('spec_rad_centre_sun',30)/ + data table4_5(113) /fixed_surface_types('solar_photosphere',31)/ + data table4_5(114) /fixed_surface_types('ion_d_region_lev',32)/ + data table4_5(115) /fixed_surface_types('ion_e_region_lev',33)/ + data table4_5(116) /fixed_surface_types('ion_f1_region_lev',34)/ + data table4_5(117) /fixed_surface_types('ion_f2_region_lev',35)/ ! ! type type_of_ens_fcst diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index c3e8791..fcce192 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -536,6 +536,18 @@ program test_all_tables if (val1 .ne. 26) stop 9 call get_g2_fixedsurfacetypes('conv_cloud_top', val1, ierr) if (val1 .ne. 27) stop 9 + call get_g2_fixedsurfacetypes('spec_rad_centre_sun', val1, ierr) + if (val1 .ne. 30) stop 9 + call get_g2_fixedsurfacetypes('solar_photosphere', val1, ierr) + if (val1 .ne. 31) stop 9 + call get_g2_fixedsurfacetypes('ion_d_region_lev', val1, ierr) + if (val1 .ne. 32) stop 9 + call get_g2_fixedsurfacetypes('ion_e_region_lev', val1, ierr) + if (val1 .ne. 33) stop 9 + call get_g2_fixedsurfacetypes('ion_f1_region_lev', val1, ierr) + if (val1 .ne. 34) stop 9 + call get_g2_fixedsurfacetypes('ion_f2_region_lev', val1, ierr) + if (val1 .ne. 35) stop 9 call get_g2_fixedsurfacetypes('xxx', val1, ierr) if (ierr .ne. 9) stop 9 From 1bcdfb5a348f4546abb5473651a299ee72c43062 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:08:40 -0800 Subject: [PATCH 16/26] table 4.5 152 --- src/grib2_all_tables_module.F90 | 1 + tests/test_all_key_tables.F90 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 958d025..219e384 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -452,6 +452,7 @@ module grib2_all_tables_module data table4_5(115) /fixed_surface_types('ion_e_region_lev',33)/ data table4_5(116) /fixed_surface_types('ion_f1_region_lev',34)/ data table4_5(117) /fixed_surface_types('ion_f2_region_lev',35)/ + data table4_5(118) /fixed_surface_types('sea_ice_lev',152)/ ! ! type type_of_ens_fcst diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index fcce192..fb4df82 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -548,6 +548,8 @@ program test_all_tables if (val1 .ne. 34) stop 9 call get_g2_fixedsurfacetypes('ion_f2_region_lev', val1, ierr) if (val1 .ne. 35) stop 9 + call get_g2_fixedsurfacetypes('sea_ice_lev', val1, ierr) + if (val1 .ne. 152) stop 9 call get_g2_fixedsurfacetypes('xxx', val1, ierr) if (ierr .ne. 9) stop 9 From 22a75e68432ead66a74681db93154f63c78b1f2f Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:14:07 -0800 Subject: [PATCH 17/26] table 4.5 171-173 --- src/grib2_all_tables_module.F90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 219e384..0eea046 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -453,6 +453,9 @@ module grib2_all_tables_module data table4_5(116) /fixed_surface_types('ion_f1_region_lev',34)/ data table4_5(117) /fixed_surface_types('ion_f2_region_lev',35)/ data table4_5(118) /fixed_surface_types('sea_ice_lev',152)/ + data table4_5(119) /fixed_surface_types('ocean_level_vert_eddy_diffus',171)/ + data table4_5(120) /fixed_surface_types('ocean_level_rho_diff',172)/ + data table4_5(121) /fixed_surface_types('top_snow_over_sea_ice',173)/ ! ! type type_of_ens_fcst From ccee91eeb6418ed5654daeea69b66345be165d34 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:20:29 -0800 Subject: [PATCH 18/26] table 4.5 180-189 --- src/grib2_all_tables_module.F90 | 5 +++++ tests/test_all_key_tables.F90 | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 0eea046..935eea0 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -456,6 +456,11 @@ module grib2_all_tables_module data table4_5(119) /fixed_surface_types('ocean_level_vert_eddy_diffus',171)/ data table4_5(120) /fixed_surface_types('ocean_level_rho_diff',172)/ data table4_5(121) /fixed_surface_types('top_snow_over_sea_ice',173)/ + data table4_5(122) /fixed_surface_types('roof_lev',185)/ + data table4_5(123) /fixed_surface_types('wall_lev',186)/ + data table4_5(124) /fixed_surface_types('road_lev',187)/ + data table4_5(125) /fixed_surface_types('melt_pond_top_surf',188)/ + data table4_5(126) /fixed_surface_types('melt_pond_bottom_surf',189)/ ! ! type type_of_ens_fcst diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index fb4df82..64d253c 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -550,6 +550,22 @@ program test_all_tables if (val1 .ne. 35) stop 9 call get_g2_fixedsurfacetypes('sea_ice_lev', val1, ierr) if (val1 .ne. 152) stop 9 + call get_g2_fixedsurfacetypes('ocean_level_vert_eddy_diffus', val1, ierr) + if (val1 .ne. 171) stop 9 + call get_g2_fixedsurfacetypes('ocean_level_rho_diff', val1, ierr) + if (val1 .ne. 172) stop 9 + call get_g2_fixedsurfacetypes('top_snow_over_sea_ice', val1, ierr) + if (val1 .ne. 173) stop 9 + call get_g2_fixedsurfacetypes('roof_lev', val1, ierr) + if (val1 .ne. 185) stop 9 + call get_g2_fixedsurfacetypes('wall_lev', val1, ierr) + if (val1 .ne. 186) stop 9 + call get_g2_fixedsurfacetypes('road_lev', val1, ierr) + if (val1 .ne. 187) stop 9 + call get_g2_fixedsurfacetypes('melt_pond_top_surf', val1, ierr) + if (val1 .ne. 188) stop 9 + call get_g2_fixedsurfacetypes('melt_pond_bottom_surf', val1, ierr) + if (val1 .ne. 189) stop 9 call get_g2_fixedsurfacetypes('xxx', val1, ierr) if (ierr .ne. 9) stop 9 From b0f2b2175dafdd3a2f1d1057d1b684d31e0e053e Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:24:58 -0800 Subject: [PATCH 19/26] table 4.7 --- src/grib2_all_tables_module.F90 | 4 ++++ tests/test_all_key_tables.F90 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 935eea0..a8afaa9 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -514,6 +514,10 @@ module grib2_all_tables_module data table4_7(22) /type_of_derive_fcst('percentile_value_75',203)/ data table4_7(23) /type_of_derive_fcst('percentile_value_95',204)/ ! + ! Added type of derive forecast (12/20/2024) + ! + data table4_7(24) /type_of_derive_fcst('var_all_ens_mem',10)/ + ! ! ! Added Clustering Method Table 4.8 (06/26/2019) ! diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 64d253c..1fc4c47 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -1777,6 +1777,8 @@ program test_all_tables if (val1 .ne. 203) stop 21 call get_g2_typeofderivefcst('percentile_value_95', val1, ierr) if (val1 .ne. 204) stop 21 + call get_g2_typeofderivefcst('var_all_ens_mem', val1, ierr) + if (val1 .ne. 10) stop 21 call get_g2_typeofderivefcst('xxxx', val1, ierr) if (ierr .ne. 9) stop 21 From 16a03ff2875824ed09950d58ebedd8d624e00b74 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:31:50 -0800 Subject: [PATCH 20/26] table 4.9 --- src/grib2_all_tables_module.F90 | 4 ++++ tests/test_all_key_tables.F90 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index a8afaa9..60e94c9 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -553,6 +553,10 @@ module grib2_all_tables_module data table4_9(8) /type_of_prob('prob_near_normal_cat',7)/ data table4_9(9) /type_of_prob('prob_below_normal_cat',8)/ ! + ! Added Probability Type (12/20/2024) + ! + data table4_9(10) /type_of_prob('prob_counts_cat_boolean',9)/ + ! ! type statistical_processing_types character(len=80) :: statprocesstypeskey diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 1fc4c47..d364994 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -1809,6 +1809,8 @@ program test_all_tables if (val1 .ne. 7) stop 23 call get_g2_typeofprob('prob_below_normal_cat', val1, ierr) if (val1 .ne. 8) stop 23 + call get_g2_typeofprob('prob_counts_cat_boolean', val1, ierr) + if (val1 .ne. 9) stop 23 call get_g2_typeofprob('xxxx', val1, ierr) if (ierr .ne. 9) stop 23 From ae3570c5cfb93ad92393a85e333588646d694407 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:35:51 -0800 Subject: [PATCH 21/26] table 4.10 --- src/grib2_all_tables_module.F90 | 6 ++++++ tests/test_all_key_tables.F90 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 60e94c9..ed592e8 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -600,6 +600,12 @@ module grib2_all_tables_module data table4_10(32) /statistical_processing_types('variance',208)/ data table4_10(33) /statistical_processing_types('confficient',209)/ ! + ! Added Statistical Processing Type (12/20/2024) + ! + data table4_10(34) /statistical_processing_types('severity',100)/ + data table4_10(35) /statistical_processing_types('mode',101)/ + data table4_10(36) /statistical_processing_types('index_proc',102)/ + ! ! type type_of_time_intervals character(len=80) :: typeoftimeintervalskey diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index d364994..3250ce6 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -636,6 +636,12 @@ program test_all_tables if (val1 .ne. 208) stop 10 call get_g2_statprocesstypes('confficient', val1, ierr) if (val1 .ne. 209) stop 10 + call get_g2_statprocesstypes('severity', val1, ierr) + if (val1 .ne. 100) stop 10 + call get_g2_statprocesstypes('mode', val1, ierr) + if (val1 .ne. 101) stop 10 + call get_g2_statprocesstypes('index_proc', val1, ierr) + if (val1 .ne. 102) stop 10 call get_g2_statprocesstypes('xxxxx', val1, ierr) if (ierr .ne. 9) stop 10 From 206eeffa23d352dfb47ac373763540105681f4db Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:44:26 -0800 Subject: [PATCH 22/26] table 4.233 --- src/grib2_all_tables_module.F90 | 7 ++++++- tests/test_all_key_tables.F90 | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index ed592e8..383528a 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -809,7 +809,12 @@ module grib2_all_tables_module data table4_233(125) /type_of_aerosol('aerosol_lo_absorption',62023)/ data table4_233(126) /type_of_aerosol('volcanic_ash',62025)/ ! Add new parameter (04/12/2022) - data table4_233(127) /type_of_aerosol('brown_carbon_dry',63034)/ + ! Corrected code figure (12/20/2024) + data table4_233(127) /type_of_aerosol('brown_carbon_dry',62036)/ + ! + ! Added Aerosol Type (12/20/2024) + ! + data table4_233(128) /type_of_aerosol('oxygen',38)/ ! ! type type_of_orig_field_vals diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 3250ce6..74d54e3 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -956,9 +956,11 @@ program test_all_tables call get_g2_typeofaerosol('volcanic_ash', val1, ierr) if (val1 .ne. 62025) stop 13 call get_g2_typeofaerosol('brown_carbon_dry', val1, ierr) - if (val1 .ne. 63034) stop 13 + if (val1 .ne. 62036) stop 13 call get_g2_typeofaerosol('', val1, ierr) if (val1 .ne. 65535) stop 13 + call get_g2_typeofaerosol('oxygen', val1, ierr) + if (val1 .ne. 38) stop 13 call get_g2_typeofaerosol('xxxx', val1, ierr) if (ierr .ne. 9) stop 13 From 1a5582387e134dc0d8b2ac5f3952e60650ec666c Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:51:16 -0800 Subject: [PATCH 23/26] table 5.0 --- src/grib2_all_tables_module.F90 | 5 +++++ tests/test_all_key_tables.F90 | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 383528a..cb07935 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -882,6 +882,11 @@ module grib2_all_tables_module data table5_0(10) /type_of_packingmethod('simple_packing_log_preprcs',61)/ data table5_0(11) /type_of_packingmethod('run_length_packing_lvl_val',200)/ ! + ! Added Packing Method (12/20/2024) + ! + data table5_0(12) /type_of_packingmethod('ccsds_lossless',42)/ + data table5_0(13) /type_of_packingmethod('spectral_limited_area_complex',53)/ + ! ! type origin_centers character(len=50) :: origincenterskey diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 74d54e3..ab911d0 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -1719,6 +1719,10 @@ program test_all_tables if (val1 .ne. 61) stop 19 call get_g2_sec5packingmethod('run_length_packing_lvl_val', val1, ierr) if (val1 .ne. 200) stop 19 + call get_g2_sec5packingmethod('ccsds_lossless', val1, ierr) + if (val1 .ne. 42) stop 19 + call get_g2_sec5packingmethod('spectral_limited_area_complex', val1, ierr) + if (val1 .ne. 53) stop 19 call get_g2_sec5packingmethod('xxxxx', val1, ierr) if (ierr .ne. 9) stop 19 From 41ba51d8579d282fe514f7f61f95ebf59c3283cd Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:02:09 -0800 Subject: [PATCH 24/26] on388 table 0 --- src/grib2_all_tables_module.F90 | 9 +++++++++ tests/test_all_key_tables.F90 | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index cb07935..39b894f 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -1118,6 +1118,15 @@ module grib2_all_tables_module data on388_table0(217) /origin_centers('ncsa_argentina',147)/ data on388_table0(218) /origin_centers('brazilian_decea',148)/ ! + ! Added original center (12/20/2024) + ! + data on388_table0(219) /origin_centers('nasa',173)/ + data on388_table0(220) /origin_centers('isdm_meds',174)/ + data on388_table0(221) /origin_centers('cimss',176)/ + data on388_table0(222) /origin_centers('niwa',204)/ + data on388_table0(223) /origin_centers('opera',247)/ + data on388_table0(224) /origin_centers('cosmo',250)/ + ! ! type gen_proc character(len=30) :: genprockey diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index ab911d0..9207234 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -1401,6 +1401,18 @@ program test_all_tables if (val1 .ne. 147) stop 14 call get_g2_on388origincenters('brazilian_decea', val1, ierr) if (val1 .ne. 148) stop 14 + call get_g2_on388origincenters('nasa', val1, ierr) + if (val1 .ne. 173) stop 14 + call get_g2_on388origincenters('isdm_meds', val1, ierr) + if (val1 .ne. 174) stop 14 + call get_g2_on388origincenters('cimss', val1, ierr) + if (val1 .ne. 176) stop 14 + call get_g2_on388origincenters('niwa', val1, ierr) + if (val1 .ne. 204) stop 14 + call get_g2_on388origincenters('opera', val1, ierr) + if (val1 .ne. 247) stop 14 + call get_g2_on388origincenters('cosmo', val1, ierr) + if (val1 .ne. 250) stop 14 call get_g2_on388origincenters('xxxx', val1, ierr) if (ierr .ne. 9) stop 14 From 426c4a1680cd6e7cd0bdaa8ad148e4138c2e7b70 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:16:33 -0800 Subject: [PATCH 25/26] on388 table a --- src/grib2_all_tables_module.F90 | 8 ++++++++ tests/test_all_key_tables.F90 | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index 39b894f..e397493 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -1270,6 +1270,14 @@ module grib2_all_tables_module data on388_tablea(120) /gen_proc('extra_trop_storm_surge_atl_3d',21)/ data on388_tablea(121) /gen_proc('extra_trop_storm_surge_pac_3d',22)/ data on388_tablea(122) /gen_proc('extra_trop_storm_surge_micro_3',23)/ + ! + ! Added new entries in tablea (12/20/2024) + ! + data on388_tablea(123) /gen_proc('rtofs',85)/ + data on388_tablea(124) /gen_proc('national_blend',104)/ + data on388_tablea(125) /gen_proc('urma',118)/ + data on388_tablea(126) /gen_proc('wam',119)/ + data on388_tablea(127) /gen_proc('ccpa',184)/ contains ! diff --git a/tests/test_all_key_tables.F90 b/tests/test_all_key_tables.F90 index 9207234..5d8c8b2 100644 --- a/tests/test_all_key_tables.F90 +++ b/tests/test_all_key_tables.F90 @@ -1655,6 +1655,22 @@ program test_all_tables if (val1 .ne. 134) stop 15 call get_g2_on388genproc('hafs', val1, ierr) if (val1 .ne. 135) stop 15 + call get_g2_on388genproc('extra_trop_storm_surge_atl_3d', val1, ierr) + if (val1 .ne. 21) stop 15 + call get_g2_on388genproc('extra_trop_storm_surge_pac_3d', val1, ierr) + if (val1 .ne. 22) stop 15 + call get_g2_on388genproc('extra_trop_storm_surge_micro_3', val1, ierr) + if (val1 .ne. 23) stop 15 + call get_g2_on388genproc('rtofs', val1, ierr) + if (val1 .ne. 85) stop 15 + call get_g2_on388genproc('national_blend', val1, ierr) + if (val1 .ne. 104) stop 15 + call get_g2_on388genproc('urma', val1, ierr) + if (val1 .ne. 118) stop 15 + call get_g2_on388genproc('wam', val1, ierr) + if (val1 .ne. 119) stop 15 + call get_g2_on388genproc('ccpa', val1, ierr) + if (val1 .ne. 184) stop 15 call get_g2_on388genproc('xxxx', val1, ierr) if (ierr .ne. 9) stop 15 From 7a13121a1438a91b07437cd016af30a5e705108a Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:18:52 -0800 Subject: [PATCH 26/26] comment --- src/grib2_all_tables_module.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/grib2_all_tables_module.F90 b/src/grib2_all_tables_module.F90 index e397493..935a780 100644 --- a/src/grib2_all_tables_module.F90 +++ b/src/grib2_all_tables_module.F90 @@ -20,6 +20,7 @@ !> 2021/04/20 | Boi Vuong | Updated table 4.3, 4.5,4.7 and on388_tablea !> 2023/03/30 | Andrew Benjamin | Added new entires to on388)_tablea !> 2024/02/23 | Andrew Benjamin | Added new subcenter to on388)_tablec +!> 2024/12/20 | Alyson Stahl | Added multiple entries from 2024 WMO updates !> !> @author Jun Wang @date 2012/01/25 module grib2_all_tables_module