From 596e23b40f6d2e077cdaddd4826597d15a2c95a2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Nov 2021 06:39:11 -0700 Subject: [PATCH 1/5] Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 12 ++++++++---- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index a54f243ae..c6901129e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,13 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + #url = https://github.com/NCAR/ccpp-framework + #branch = main + url = https://github.com/climbfuji/ccpp-framework + branch = update_main_from_feature_capgen [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + #url = https://github.com/NCAR/ccpp-physics + #branch = main + url = https://github.com/climbfuji/ccpp-physics + branch = correct_units_due_to_feature_capgen diff --git a/ccpp/framework b/ccpp/framework index 47a5f65ae..87cb832ed 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 47a5f65ae6b760b513d7babfbe66138a8f4a23bc +Subproject commit 87cb832ede3c48aa9f08a9df3d1beb2d126712be diff --git a/ccpp/physics b/ccpp/physics index d18964278..426b3fbe3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d189642784545b7edfeebace7b972fea25f42e20 +Subproject commit 426b3fbe36b67bc80557f29ab3d5360fcde8a453 From 178e777161b31cbabdace8909d6b237fbe30c177 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Nov 2021 06:39:27 -0700 Subject: [PATCH 2/5] Replace units 'various' with 'mixed', update several invalid units of non-physical quantities, fix units of humidity diagnostic variables --- ccpp/data/CCPP_typedefs.meta | 2 +- ccpp/data/GFS_typedefs.meta | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta index ed0fd63cf..9dfabe739 100644 --- a/ccpp/data/CCPP_typedefs.meta +++ b/ccpp/data/CCPP_typedefs.meta @@ -213,7 +213,7 @@ [pkz] standard_name = finite_volume_mean_edge_pressure_raised_to_the_power_of_kappa long_name = finite-volume mean edge pressure raised to the power of kappa - units = Pa**kappa + units = 1 dimensions = (starting_x_direction_index:ending_x_direction_index,starting_y_direction_index:ending_y_direction_index,1:vertical_dimension_for_fast_physics) type = real kind = kind_dyn diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 0b5abf86e..8bd3dab83 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -609,7 +609,7 @@ [hprime] standard_name = statistical_measures_of_subgrid_orography_collection_array long_name = orographic metrics - units = various + units = mixed dimensions = (horizontal_loop_extent,number_of_statistical_measures_of_subgrid_orography) type = real kind = kind_phys @@ -5735,21 +5735,21 @@ [tau_amf] standard_name = absolute_momentum_flux_due_to_nonorographic_gravity_wave_drag long_name = ngw_absolute_momentum_flux - units = various + units = mixed dimensions = (horizontal_loop_extent) type = real kind = kind_phys [ozpl] standard_name = ozone_forcing long_name = ozone forcing data - units = various + units = mixed dimensions = (horizontal_loop_extent,vertical_dimension_of_ozone_forcing_data,number_of_coefficients_in_ozone_forcing_data) type = real kind = kind_phys [h2opl] standard_name = stratospheric_water_vapor_forcing long_name = water forcing data - units = various + units = mixed dimensions = (horizontal_loop_extent,vertical_dimension_of_h2o_forcing_data,number_of_coefficients_in_h2o_forcing_data) type = real kind = kind_phys @@ -6340,7 +6340,7 @@ [fluxr] standard_name = cumulative_radiation_diagnostic long_name = time-accumulated 2D radiation-related diagnostic fields - units = various + units = mixed dimensions = (horizontal_loop_extent,number_of_diagnostics_variables_for_radiation) type = real kind = kind_phys @@ -6921,7 +6921,7 @@ [dtend] standard_name = cumulative_change_of_state_variables long_name = diagnostic tendencies for state variables - units = various + units = mixed dimensions = (horizontal_loop_extent,vertical_layer_dimension,cumulative_change_of_state_variables_outer_index_max) type = real kind = kind_phys @@ -6957,14 +6957,14 @@ [rh02max] standard_name = maximum_relative_humidity_at_2m_over_maximum_hourly_time_interval long_name = maximum relative humidity at 2m over maximum hourly time interval - units = % + units = 1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys [rh02min] standard_name = minimum_relative_humidity_at_2m_over_maximum_hourly_time_interval long_name = minumum relative humidity at 2m over maximum hourly time interval - units = % + units = 1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys @@ -8186,7 +8186,7 @@ [faerlw] standard_name = aerosol_optical_properties_for_longwave_bands_01_16 long_name = aerosol optical properties for longwave bands 01-16 - units = various + units = mixed dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation,number_of_aerosol_output_fields_for_longwave_radiation) type = real kind = kind_phys @@ -8214,7 +8214,7 @@ [faersw] standard_name = aerosol_optical_properties_for_shortwave_bands_01_16 long_name = aerosol optical properties for shortwave bands 01-16 - units = various + units = mixed dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation,number_of_aerosol_output_fields_for_shortwave_radiation) type = real kind = kind_phys @@ -9820,7 +9820,7 @@ [q_lay] standard_name = water_vapor_mixing_ratio long_name = water vaport mixing ratio - units = kg/kg + units = kg kg-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys @@ -9982,7 +9982,7 @@ [aerosolslw] standard_name = RRTMGP_aerosol_optical_properties_for_longwave_bands_01_16 long_name = aerosol optical properties for longwave bands 01-16 - units = various + units = mixed dimensions = (horizontal_loop_extent,vertical_layer_dimension, number_of_longwave_bands,number_of_aerosol_output_fields_for_longwave_radiation) type = real kind = kind_phys @@ -10011,7 +10011,7 @@ [aerosolssw] standard_name = RRTMGP_aerosol_optical_properties_for_shortwave_bands_01_16 long_name = aerosol optical properties for shortwave bands 01-16 - units = various + units = mixed dimensions = (horizontal_loop_extent,vertical_layer_dimension, number_of_shortwave_bands, number_of_aerosol_output_fields_for_shortwave_radiation) type = real kind = kind_phys From 9229956efeaf3b41c688e1927b6a8f36519730ce Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 18 Nov 2021 16:05:54 -0700 Subject: [PATCH 3/5] Update submodule pointers for ccpp-framework and ccpp-physics --- ccpp/framework | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/framework b/ccpp/framework index 87cb832ed..fb76eefab 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 87cb832ede3c48aa9f08a9df3d1beb2d126712be +Subproject commit fb76eefabcd93b0b37b1c00c3556633a8310cdd2 diff --git a/ccpp/physics b/ccpp/physics index 415b3942b..e96358c3c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 415b3942b294de0bbd025f784c1adff9fc2bd679 +Subproject commit e96358c3cc1b44753999bf175fa12222c666fdae From 0ed5b4ddccd57696b3add36d9bac7e2332ee6151 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Nov 2021 08:42:59 -0700 Subject: [PATCH 4/5] Change units of relative humidity variables in CCPP metadata from 1 or none to frac, remove intent attributes from GFS_typedefs.meta --- ccpp/data/GFS_typedefs.meta | 12 +++++------- ccpp/physics | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 7a90610ce..b446d6e79 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -3247,7 +3247,7 @@ [mg_qcvar] standard_name = relative_variance_of_subgrid_cloud_condensate_distribution long_name = cloud water relative variance for MG microphysics - units = + units = frac dimensions = () type = real kind = kind_phys @@ -3261,7 +3261,7 @@ [mg_rhmini] standard_name = relative_humidity_threshold_for_ice_nucleation long_name = relative humidity threshold parameter for nucleating ice for MG microphysics - units = none + units = frac dimensions = () type = real kind = kind_phys @@ -3512,14 +3512,12 @@ units = flag dimensions = () type = logical - intent = in [decfl] standard_name = deformed_CFL_factor long_name = deformed CFL factor units = count dimensions = () type = integer - intent = in [lgfdlmprad] standard_name = flag_for_GFDL_microphysics_radiation_interaction long_name = flag for GFDL microphysics-radiation interaction @@ -3812,7 +3810,7 @@ [rhgrd] standard_name = relative_humidity_threshold_for_condensation long_name = relative humidity threshold parameter for condensation for FA scheme - units = none + units = frac dimensions = () type = real kind = kind_phys @@ -6950,14 +6948,14 @@ [rh02max] standard_name = maximum_relative_humidity_at_2m_over_maximum_hourly_time_interval long_name = maximum relative humidity at 2m over maximum hourly time interval - units = 1 + units = frac dimensions = (horizontal_loop_extent) type = real kind = kind_phys [rh02min] standard_name = minimum_relative_humidity_at_2m_over_maximum_hourly_time_interval long_name = minumum relative humidity at 2m over maximum hourly time interval - units = 1 + units = frac dimensions = (horizontal_loop_extent) type = real kind = kind_phys diff --git a/ccpp/physics b/ccpp/physics index ef072d932..a233e2e87 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ef072d93225b5f45107f4aa66312a5f2a34d2e02 +Subproject commit a233e2e87411379562d03d214ef4ebc98aca94f4 From 153516b87071a1112d9f66640cb7b2e83bc514da Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Nov 2021 15:50:09 -0700 Subject: [PATCH 5/5] Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 12 ++++-------- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index a62b98147..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,16 +4,12 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = main - url = https://github.com/climbfuji/ccpp-framework - branch = update_main_from_feature_capgen + url = https://github.com/NCAR/ccpp-framework + branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/climbfuji/ccpp-physics - branch = correct_units_due_to_feature_capgen + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index fb76eefab..4cdbddf76 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit fb76eefabcd93b0b37b1c00c3556633a8310cdd2 +Subproject commit 4cdbddf760a9383c461dec3af4ae9423b43e4ba7 diff --git a/ccpp/physics b/ccpp/physics index a233e2e87..2c251ef10 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a233e2e87411379562d03d214ef4ebc98aca94f4 +Subproject commit 2c251ef10e084a7dce58517f1995cac5d16c9b4d