From 5eb8312b451798f9e38cfa4faf8b005164f4f352 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 22 Sep 2025 19:11:32 +0000 Subject: [PATCH 1/5] Clean set of physics changes for Capgen transition --- .gitmodules | 2 +- .../GFS_cloud_diagnostics.meta | 2 +- .../UFS_SCM_NEPTUNE/GFS_debug.F90 | 40 +++++++++---------- .../UFS_SCM_NEPTUNE/GFS_debug.meta | 26 +++++++----- .../GFS_radiation_surface.meta | 4 +- .../UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta | 18 ++++----- .../GFS_rrtmgp_cloud_overlap.meta | 2 +- .../UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta | 12 +++--- .../UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 | 4 +- .../UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta | 2 - .../GFS_surface_composites_pre.F90 | 10 ++--- .../GFS_surface_composites_pre.meta | 4 +- .../GFS_surface_generic_post.F90 | 8 ++-- .../GFS_surface_generic_post.meta | 2 +- .../module_ccpp_suite_simulator.meta | 16 -------- .../UFS_SCM_NEPTUNE/sgscloud_radpre.meta | 10 ++--- physics/MP/TEMPO/TEMPO | 2 +- physics/MP/Thompson/mp_thompson.meta | 4 +- physics/MP/Zhao_Carr/zhaocarr_gscond.f | 2 +- physics/Radiation/RRTMG/radlw_main.meta | 1 + physics/Radiation/RRTMG/radlw_param.meta | 31 ++------------ physics/Radiation/RRTMG/radsw_main.meta | 1 + physics/Radiation/RRTMG/radsw_param.meta | 40 +++---------------- physics/Radiation/RRTMG/rrtmg_lw_post.meta | 2 +- physics/Radiation/RRTMG/rrtmg_sw_post.meta | 2 +- .../RRTMGP/rrtmgp_aerosol_optics.meta | 12 +++--- physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 | 2 +- physics/Radiation/RRTMGP/rrtmgp_lw_main.meta | 26 ++++++------ physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 | 2 +- physics/Radiation/RRTMGP/rrtmgp_sw_main.meta | 28 ++++++------- physics/SFC_Layer/UFS/sfc_diff.f | 2 +- physics/SFC_Models/Lake/CLM/clm_lake.meta | 2 +- .../SFC_Models/Lake/Flake/flake_driver.F90 | 4 +- .../SFC_Models/Lake/Flake/flake_driver.meta | 3 +- .../SFC_Models/Land/Noahmp/lnd_iau_mod.meta | 31 ++------------ physics/SFC_Models/SeaIce/CICE/sfc_sice.meta | 12 +++--- physics/photochem/module_h2ophys.meta | 16 -------- physics/photochem/module_ozphys.meta | 16 -------- physics/smoke_dust/rrfs_smoke_wrapper.F90 | 2 +- 39 files changed, 142 insertions(+), 263 deletions(-) diff --git a/.gitmodules b/.gitmodules index cc173dc23a..e3841e85dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,4 +5,4 @@ [submodule "physics/MP/TEMPO/TEMPO"] path = physics/MP/TEMPO/TEMPO url = https://github.com/NCAR/TEMPO - branch = main + branch = feature/capgen diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta index daf1bddee2..adf76e6491 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta @@ -114,7 +114,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 index 79132626bf..72d9ce4888 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 @@ -537,7 +537,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%qrain ', Sfcprop%qrain) end if ! CCPP/RUC only - if (Model%lsm == Model%lsm_ruc) then + if (Model%lsm == Model%ilsm_ruc) then call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%sh2o', Sfcprop%sh2o) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%smois', Sfcprop%smois) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tslb', Sfcprop%tslb) @@ -557,14 +557,14 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%emis_ice', Sfcprop%emis_ice) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%emis_wat', Sfcprop%emis_wat) ! NoahMP and RUC - if (Model%lsm == Model%lsm_ruc .or. Model%lsm == Model%lsm_noahmp) then + if (Model%lsm == Model%ilsm_ruc .or. Model%lsm == Model%ilsm_noahmp) then call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirvis_lnd', Sfcprop%albdirvis_lnd) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirnir_lnd', Sfcprop%albdirnir_lnd) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdifvis_lnd', Sfcprop%albdifvis_lnd) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdifnir_lnd', Sfcprop%albdifnir_lnd) end if ! RUC only - if (Model%lsm == Model%lsm_ruc) then + if (Model%lsm == Model%ilsm_ruc) then call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirvis_ice', Sfcprop%albdirvis_ice) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdifvis_ice', Sfcprop%albdifvis_ice) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirnir_ice', Sfcprop%albdirnir_ice) @@ -712,7 +712,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%tdoms ', Diag%tdoms) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%trans ', Diag%trans) ! CCPP/RUC only - if (Model%lsm == Model%lsm_ruc) then + if (Model%lsm == Model%ilsm_ruc) then call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%wetness ', Sfcprop%wetness) else call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%wet1 ', Diag%wet1) @@ -918,7 +918,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, end if if (Model%do_RRTMGP) then call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Coupling%fluxlwUP_jac', Coupling%fluxlwUP_jac) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Coupling%htrlw', Coupling%htrlw) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Coupling%hrlw', Coupling%hrlw) end if ! ! Grid @@ -1138,23 +1138,23 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup if (mpirank==impi .and. omprank==iomp) then ! Print static variables call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ipr ', Interstitial%ipr ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%itc ', Interstitial%itc ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%itc ', Model%itc ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%latidxprnt ', Interstitial%latidxprnt ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%levi ', Interstitial%levi ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%lmk ', Interstitial%lmk ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%lmp ', Interstitial%lmp ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nbdlw ', Interstitial%nbdlw ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nbdsw ', Interstitial%nbdsw ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nf_aelw ', Interstitial%nf_aelw ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nf_aesw ', Interstitial%nf_aesw ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nsamftrac ', Interstitial%nsamftrac ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nscav ', Interstitial%nscav ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nspc1 ', Interstitial%nspc1 ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ntiwx ', Interstitial%ntiwx ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nvdiff ', Interstitial%nvdiff ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%lmk ', Model%lmk ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%lmp ', Model%lmp ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nbdlw ', Model%nbdlw ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nbdsw ', Model%nbdsw ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nf_aelw ', Model%nf_aelw ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nf_aesw ', Model%nf_aesw ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nsamftrac ', Model%nsamftrac ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nscav ', Model%nscav ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nspc1 ', Model%nspc1 ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%ntiwx ', Model%ntiwx ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nvdiff ', Model%nvdiff ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%phys_hydrostatic ', Interstitial%phys_hydrostatic ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%skip_macro ', Interstitial%skip_macro ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%trans_aero ', Interstitial%trans_aero ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%trans_aero ', Model%trans_aero ) ! Print all other variables call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%adjsfculw_land ', Interstitial%adjsfculw_land ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%adjsfculw_ice ', Interstitial%adjsfculw_ice ) @@ -1433,7 +1433,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%qgl ', Interstitial%qgl ) end if ! Noah MP - if (Model%lsm == Model%lsm_noahmp) then + if (Model%lsm == Model%ilsm_noahmp) then call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%t2mmp ', Interstitial%t2mmp ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%q2mp ', Interstitial%q2mp ) end if @@ -1511,7 +1511,7 @@ subroutine GFS_abort_run (Model, blkno, errmsg, errflg) errmsg = '' errflg = 0 - if (Model%kdt==1 .and. blkno==size(Model%blksz)) then + if (Model%kdt==1 .and. blkno==size(Model%chunks)) then if (Model%me==Model%master) write(0,*) "GFS_abort_run: ABORTING MODEL" call sleep(10) stop diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta index 0d12b2bbb0..6cd464a27b 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta @@ -2,6 +2,8 @@ name = GFS_diagtoscreen type = scheme dependencies = ../../hooks/machine.F + dependencies = ../../../../../scm/src/GFS_typedefs.F90,../../../../../scm/src/CCPP_typedefs.F90 + module_name = GFS_diagtoscreen ######################################################################## [ccpp-arg-table] @@ -286,8 +288,8 @@ type = integer intent = in [blkno] - standard_name = ccpp_block_number - long_name = number of block for explicit data blocking in CCPP + standard_name = ccpp_chunk_number + long_name = number of chunk for using array chunks in CCPP units = index dimensions = () type = integer @@ -313,6 +315,7 @@ name = GFS_interstitialtoscreen type = scheme dependencies = ../../hooks/machine.F + module_name = GFS_interstitialtoscreen ######################################################################## [ccpp-arg-table] @@ -597,8 +600,8 @@ type = integer intent = in [blkno] - standard_name = ccpp_block_number - long_name = number of block for explicit data blocking in CCPP + standard_name = ccpp_chunk_number + long_name = number of chunk for using array chunks in CCPP units = index dimensions = () type = integer @@ -624,6 +627,7 @@ name = GFS_abort type = scheme dependencies = ../../hooks/machine.F + module_name = GFS_abort ######################################################################## [ccpp-arg-table] @@ -637,8 +641,8 @@ type = GFS_control_type intent = in [blkno] - standard_name = ccpp_block_number - long_name = number of block for explicit data blocking in CCPP + standard_name = ccpp_chunk_number + long_name = number of chunk for using array chunks in CCPP units = index dimensions = () type = integer @@ -664,6 +668,7 @@ name = GFS_checkland type = scheme dependencies = ../../hooks/machine.F + module_name = GFS_checkland ######################################################################## [ccpp-arg-table] @@ -684,8 +689,8 @@ type = integer intent = in [blkno] - standard_name = ccpp_block_number - long_name = number of block for explicit data blocking in CCPP + standard_name = ccpp_chunk_number + long_name = number of chunk for using array chunks in CCPP units = index dimensions = () type = integer @@ -923,6 +928,7 @@ name = GFS_checktracers type = scheme dependencies = ../../hooks/machine.F + module_name = GFS_checktracers ######################################################################## [ccpp-arg-table] @@ -1099,8 +1105,8 @@ type = integer intent = in [blkno] - standard_name = ccpp_block_number - long_name = number of block for explicit data blocking in CCPP + standard_name = ccpp_chunk_number + long_name = number of chunk for using array chunks in CCPP units = index dimensions = () type = integer diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta index 94043898de..20a926fbff 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta @@ -383,7 +383,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [semis_ice] standard_name = surface_longwave_emissivity_over_ice long_name = surface lw emissivity in fraction over ice @@ -391,7 +391,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [semis_wat] standard_name = surface_longwave_emissivity_over_water long_name = surface lw emissivity in fraction over water diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta index 84c0432f0b..15746fcb8b 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta @@ -494,7 +494,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -502,7 +502,7 @@ standard_name = cloud_liquid_water_path long_name = layer cloud liquid water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -510,7 +510,7 @@ standard_name = mean_effective_radius_for_liquid_cloud long_name = mean effective radius for liquid cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -518,7 +518,7 @@ standard_name = cloud_ice_water_path long_name = layer cloud ice water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -526,7 +526,7 @@ standard_name = mean_effective_radius_for_ice_cloud long_name = mean effective radius for ice cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -534,7 +534,7 @@ standard_name = cloud_snow_water_path long_name = layer cloud snow water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -542,7 +542,7 @@ standard_name = mean_effective_radius_for_snow_flake long_name = mean effective radius for snow cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -550,7 +550,7 @@ standard_name = cloud_rain_water_path long_name = layer cloud rain water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -558,7 +558,7 @@ standard_name = mean_effective_radius_for_rain_drop long_name = mean effective radius for rain cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta index 3455087b53..c6c1f68da1 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta @@ -176,7 +176,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta index 5d67afcd8e..cce1cbf73f 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta @@ -59,7 +59,7 @@ type = logical intent = in [do_sw_clrsky_hr] - standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output sw heating rate units = flag dimensions = () @@ -73,7 +73,7 @@ type = logical intent = in [do_lw_clrsky_hr] - standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output lw heating rate units = flag dimensions = () @@ -281,7 +281,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -289,7 +289,7 @@ standard_name = cloud_optical_depth_layers_at_10mu_band long_name = approx 10mu band layer cloud optical depth units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -297,7 +297,7 @@ standard_name = cloud_optical_depth_layers_at_0p55mu_band long_name = approx .55mu band layer cloud optical depth units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -485,7 +485,7 @@ standard_name = tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep long_name = longwave clear sky heating rate units = K s-1 - dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) + dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 index 0a747aa44f..4a719f6811 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 @@ -41,7 +41,7 @@ subroutine GFS_rrtmgp_pre_init(nGases, active_gases, active_gases_array, errmsg, nGases !< Number of active gases in RRTMGP character(len=*), intent(in) :: & active_gases !< List of active gases from namelist - character(len=*), dimension(:), intent(out), optional :: & + character(len=*), dimension(:), intent(out) :: & active_gases_array !< List of active gases from namelist as array ! Outputs @@ -145,7 +145,7 @@ subroutine GFS_rrtmgp_pre_run(me, nCol, nLev, i_o3, doSWrad, doLWrad, fhswr, fhl prsi !< Pressure at model-interfaces (Pa) real(kind_phys), dimension(:,:,:), intent(in) :: & qgrs !< Tracer concentrations (kg/kg) - character(len=*), dimension(:), intent(in), optional :: & + character(len=*), dimension(:), intent(in) :: & active_gases_array !< List of active gases from namelist as array ! Outputs diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta index 7af8e04d56..e3de2bb0ae 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta @@ -32,7 +32,6 @@ type = character kind = len=128 intent = out - optional = True [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP @@ -477,7 +476,6 @@ type = character kind = len=* intent = in - optional = True [coszdg] standard_name = cosine_of_solar_zenith_angle_on_radiation_timestep long_name = daytime mean cosz over rad call period diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 index 4279e63c31..e03d19e00c 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 @@ -21,7 +21,7 @@ module GFS_surface_composites_pre !! \htmlinclude GFS_surface_composites_pre_run.html !! subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_lake_clm, & - flag_cice, cplflx, cplice, cplwav2atm, lsm, lsm_ruc, & + flag_cice, cplflx, cplice, cplwav2atm, lsm, ilsm_ruc, & landfrac, lakefrac, lakedepth, oceanfrac, frland, & dry, icy, lake, use_lake_model, wet, hice, cice, zorlo, zorll, zorli, & snowd, snowd_lnd, snowd_ice, tprcp, tprcp_wat, tgrs1, & @@ -34,7 +34,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l implicit none ! Interface variables - integer, intent(in ) :: im, lkm, kdt, lsm, lsm_ruc, iopt_lake, iopt_lake_clm + integer, intent(in ) :: im, lkm, kdt, lsm, ilsm_ruc, iopt_lake, iopt_lake_clm logical, intent(in ) :: cplflx, cplice, cplwav2atm, frac_grid logical, dimension(:), intent(inout) :: flag_cice logical, dimension(:), intent(inout) :: dry, icy, lake, wet @@ -234,7 +234,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l endif if (dry(i)) then ! Land uustar_lnd(i) = uustar(i) - if(lsm /= lsm_ruc) weasd_lnd(i) = weasd(i) + if(lsm /= ilsm_ruc) weasd_lnd(i) = weasd(i) tsurf_lnd(i) = tsfcl(i) ! DH* else @@ -248,7 +248,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l endif if (icy(i)) then ! Ice is_clm = lkm>0 .and. iopt_lake==iopt_lake_clm .and. use_lake_model(i)>0 - if(lsm /= lsm_ruc .and. .not.is_clm) then + if(lsm /= ilsm_ruc .and. .not.is_clm) then weasd_ice(i) = weasd(i) endif tsurf_ice(i) = tisfc(i) @@ -284,7 +284,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l endif endif enddo - elseif(lsm /= lsm_ruc) then ! do not do snow initialization with RUC lsm + elseif(lsm /= ilsm_ruc) then ! do not do snow initialization with RUC lsm do i=1,im if (icy(i)) then if (kdt == 1 .or. (.not. cplflx .or. lakefrac(i) > zero)) then diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta index d4824f3b0d..5c63cf1fc8 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta @@ -63,7 +63,7 @@ dimensions = () type = integer intent = in -[lsm_ruc] +[ilsm_ruc] standard_name = identifier_for_ruc_land_surface_scheme long_name = flag for RUC land surface model units = flag @@ -230,7 +230,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [tprcp] standard_name = nonnegative_lwe_thickness_of_precipitation_amount_on_dynamics_timestep long_name = total precipitation amount in each time step diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90 index 648f6bf811..76ed62d340 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90 @@ -46,7 +46,7 @@ end subroutine GFS_surface_generic_post_init !! \htmlinclude GFS_surface_generic_post_run.html !! subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpllnd, cpl_fire, lssav, dry, icy, wet, & - lsm, lsm_noahmp, dtf, ep1d, gflx, tgrs_1, qgrs_1, ugrs_1, vgrs_1, & + lsm, ilsm_noahmp, dtf, ep1d, gflx, tgrs_1, qgrs_1, ugrs_1, vgrs_1, & adjsfcdlw, adjsfcdsw, adjnirbmd, adjnirdfd, adjvisbmd, adjvisdfd, adjsfculw, adjsfculw_wat, adjnirbmu, adjnirdfu, & adjvisbmu, adjvisdfu, t2m, q2m, u10m, v10m, tsfc, tsfc_wat, pgr, xcosz, evbs, evcw, trans, sbsno, snowc, snohf, pah, pahi, & epi, gfluxi, t1, q1, u1, v1, dlwsfci_cpl, dswsfci_cpl, dlwsfc_cpl, dswsfc_cpl, dnirbmi_cpl, dnirdfi_cpl, dvisbmi_cpl, & @@ -61,7 +61,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl integer, intent(in) :: im logical, intent(in) :: cplflx, cplaqm, cplchm, cplwav, cpllnd, cpl_fire, lssav logical, dimension(:), intent(in) :: dry, icy, wet - integer, intent(in) :: lsm, lsm_noahmp + integer, intent(in) :: lsm, ilsm_noahmp real(kind=kind_phys), intent(in) :: dtf real(kind=kind_phys), dimension(:), intent(in) :: ep1d, gflx, tgrs_1, qgrs_1, ugrs_1, vgrs_1, adjsfcdlw, adjsfcdsw, & @@ -108,7 +108,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl do i=1,im epi(i) = ep1d(i) gfluxi(i) = gflx(i) - if (lsm == lsm_noahmp) then + if (lsm == ilsm_noahmp) then pahi(i) = pah(i) endif t1(i) = tgrs_1(i) @@ -251,7 +251,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl tecan(i) = tecan(i) + ecan(i) * dtf tetran(i) = tetran(i) + etran(i) * dtf tedir(i) = tedir(i) + edir(i) * dtf - if (lsm == lsm_noahmp) then + if (lsm == ilsm_noahmp) then paha(i) = paha(i) + pah(i) * dtf twa(i) = waxy(i) endif diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta index 5e7949b8fb..bff2956ae8 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta @@ -168,7 +168,7 @@ dimensions = () type = integer intent = in -[lsm_noahmp] +[ilsm_noahmp] standard_name = identifier_for_noahmp_land_surface_scheme long_name = flag for NOAH MP land surface model units = flag diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.meta index 55b9e07b18..62c44abed4 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.meta @@ -6,19 +6,3 @@ [ccpp-arg-table] name = base_physics_process type = ddt - -######################################################################## -[ccpp-table-properties] - name = module_ccpp_suite_simulator - type = module - dependencies = ../../hooks/machine.F - -[ccpp-arg-table] - name = module_ccpp_suite_simulator - type = module -[base_physics_process] - standard_name = base_physics_process - long_name = definition of type base_physics_process - units = DDT - dimensions = () - type = base_physics_process diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta index 9f7712d53d..7fd975d901 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta @@ -345,7 +345,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -353,7 +353,7 @@ standard_name = cloud_liquid_water_path long_name = layer cloud liquid water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -361,7 +361,7 @@ standard_name = mean_effective_radius_for_liquid_cloud long_name = mean effective radius for liquid cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -369,7 +369,7 @@ standard_name = cloud_ice_water_path long_name = layer cloud ice water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout @@ -377,7 +377,7 @@ standard_name = mean_effective_radius_for_ice_cloud long_name = mean effective radius for ice cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout diff --git a/physics/MP/TEMPO/TEMPO b/physics/MP/TEMPO/TEMPO index c62efd27ca..2e29b6ae85 160000 --- a/physics/MP/TEMPO/TEMPO +++ b/physics/MP/TEMPO/TEMPO @@ -1 +1 @@ -Subproject commit c62efd27caa26f660edf24232f33f154e608b77a +Subproject commit 2e29b6ae85489693133d551f38857651a5dee2d4 diff --git a/physics/MP/Thompson/mp_thompson.meta b/physics/MP/Thompson/mp_thompson.meta index 1e8b9422d4..4bc78b22ed 100644 --- a/physics/MP/Thompson/mp_thompson.meta +++ b/physics/MP/Thompson/mp_thompson.meta @@ -770,8 +770,8 @@ type = integer intent = in [blkno] - standard_name = ccpp_block_number - long_name = number of block for explicit data blocking in CCPP + standard_name = ccpp_chunk_number + long_name = number of chunk for contiguous data in CCPP units = index dimensions = () type = integer diff --git a/physics/MP/Zhao_Carr/zhaocarr_gscond.f b/physics/MP/Zhao_Carr/zhaocarr_gscond.f index 1d22c09ac1..61f6e5aabc 100644 --- a/physics/MP/Zhao_Carr/zhaocarr_gscond.f +++ b/physics/MP/Zhao_Carr/zhaocarr_gscond.f @@ -104,7 +104,7 @@ subroutine zhaocarr_gscond_run (im,km,dt,dtf,prsl,ps,q,clw1 & real(kind=kind_phys), intent(in) :: clw1(:,:), clw2(:,:) real(kind=kind_phys), intent(out) :: cwm(:,:) real(kind=kind_phys), intent(inout) :: & - &, tp(:,:), qp(:,:), psp(:) & + & tp(:,:), qp(:,:), psp(:) & &, tp1(:,:), qp1(:,:), psp1(:) real(kind=kind_phys), intent(in) :: u(:,:) logical, intent(in) :: lprnt diff --git a/physics/Radiation/RRTMG/radlw_main.meta b/physics/Radiation/RRTMG/radlw_main.meta index ec90cc5331..545e1652ff 100644 --- a/physics/Radiation/RRTMG/radlw_main.meta +++ b/physics/Radiation/RRTMG/radlw_main.meta @@ -2,6 +2,7 @@ name = rrtmg_lw type = scheme dependencies = ../../hooks/machine.F,../mersenne_twister.f,../../hooks/physcons.F90,radlw_datatb.f,radlw_param.f + module_name = rrtmg_lw ######################################################################## [ccpp-arg-table] diff --git a/physics/Radiation/RRTMG/radlw_param.meta b/physics/Radiation/RRTMG/radlw_param.meta index c2fc40df3a..44dc2b70f2 100644 --- a/physics/Radiation/RRTMG/radlw_param.meta +++ b/physics/Radiation/RRTMG/radlw_param.meta @@ -2,6 +2,7 @@ name = topflw_type type = ddt dependencies = + module_name = module_radlw_parameters [ccpp-arg-table] name = topflw_type @@ -12,6 +13,7 @@ name = sfcflw_type type = ddt dependencies = + module_name = module_radlw_parameters [ccpp-arg-table] name = sfcflw_type @@ -22,35 +24,8 @@ name = proflw_type type = ddt dependencies = + module_name = module_radlw_parameters [ccpp-arg-table] name = proflw_type type = ddt - -######################################################################## -[ccpp-table-properties] - name = module_radlw_parameters - type = module - dependencies = - -[ccpp-arg-table] - name = module_radlw_parameters - type = module -[topflw_type] - standard_name = topflw_type - long_name = definition of type topflw_type - units = DDT - dimensions = () - type = topflw_type -[sfcflw_type] - standard_name = sfcflw_type - long_name = definition of type sfcflw_type - units = DDT - dimensions = () - type = sfcflw_type -[proflw_type] - standard_name = proflw_type - long_name = definition of type proflw_type - units = DDT - dimensions = () - type = proflw_type diff --git a/physics/Radiation/RRTMG/radsw_main.meta b/physics/Radiation/RRTMG/radsw_main.meta index 55b7c29b31..3782cc2d14 100644 --- a/physics/Radiation/RRTMG/radsw_main.meta +++ b/physics/Radiation/RRTMG/radsw_main.meta @@ -2,6 +2,7 @@ name = rrtmg_sw type = scheme dependencies = ../../hooks/machine.F,../mersenne_twister.f,../../hooks/physcons.F90,radsw_datatb.f,radsw_param.f + module_name = rrtmg_sw ######################################################################## [ccpp-arg-table] diff --git a/physics/Radiation/RRTMG/radsw_param.meta b/physics/Radiation/RRTMG/radsw_param.meta index d6b734a7a6..d13ad729b5 100644 --- a/physics/Radiation/RRTMG/radsw_param.meta +++ b/physics/Radiation/RRTMG/radsw_param.meta @@ -2,7 +2,8 @@ name = topfsw_type type = ddt dependencies = - + module_name = module_radsw_parameters + [ccpp-arg-table] name = topfsw_type type = ddt @@ -12,6 +13,7 @@ name = sfcfsw_type type = ddt dependencies = + module_name = module_radsw_parameters [ccpp-arg-table] name = sfcfsw_type @@ -22,6 +24,7 @@ name = cmpfsw_type type = ddt dependencies = + module_name = module_radsw_parameters [ccpp-arg-table] name = cmpfsw_type @@ -32,41 +35,8 @@ name = profsw_type type = ddt dependencies = + module_name = module_radsw_parameters [ccpp-arg-table] name = profsw_type type = ddt - -######################################################################## -[ccpp-table-properties] - name = module_radsw_parameters - type = module - dependencies = - -[ccpp-arg-table] - name = module_radsw_parameters - type = module -[topfsw_type] - standard_name = topfsw_type - long_name = definition of type topfsw_type - units = DDT - dimensions = () - type = topfsw_type -[sfcfsw_type] - standard_name = sfcfsw_type - long_name = definition of type sfcfsw_type - units = DDT - dimensions = () - type = sfcfsw_type -[cmpfsw_type] - standard_name = cmpfsw_type - long_name = definition of type cmpfsw_type - units = DDT - dimensions = () - type = cmpfsw_type -[profsw_type] - standard_name = profsw_type - long_name = definition of type profsw_type - units = DDT - dimensions = () - type = profsw_type diff --git a/physics/Radiation/RRTMG/rrtmg_lw_post.meta b/physics/Radiation/RRTMG/rrtmg_lw_post.meta index 6ed7c23658..aeee3e4743 100644 --- a/physics/Radiation/RRTMG/rrtmg_lw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_lw_post.meta @@ -50,7 +50,7 @@ type = logical intent = in [lwhtr] - standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output lw heating rate (Radtend%lwhc) units = flag dimensions = () diff --git a/physics/Radiation/RRTMG/rrtmg_sw_post.meta b/physics/Radiation/RRTMG/rrtmg_sw_post.meta index 0a48b04d7f..c777c1f31e 100644 --- a/physics/Radiation/RRTMG/rrtmg_sw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_sw_post.meta @@ -64,7 +64,7 @@ type = logical intent = in [swhtr] - standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output sw heating rate (Radtend%swhc) units = flag dimensions = () diff --git a/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta index 37ec2e9a0a..68d468c5bf 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta @@ -186,7 +186,7 @@ standard_name = aerosol_optical_depth_for_shortwave_bands_01_16 long_name = aerosol optical depth for shortwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_shortwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys intent = out @@ -194,7 +194,7 @@ standard_name = aerosol_single_scattering_albedo_for_shortwave_bands_01_16 long_name = aerosol single scattering albedo for shortwave bands 01-16 units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_shortwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys intent = out @@ -202,7 +202,7 @@ standard_name = aerosol_asymmetry_parameter_for_shortwave_bands_01_16 long_name = aerosol asymmetry parameter for shortwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_shortwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys intent = out @@ -210,7 +210,7 @@ standard_name = aerosol_optical_depth_for_longwave_bands_01_16 long_name = aerosol optical depth for longwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_longwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation) type = real kind = kind_phys intent = out @@ -218,7 +218,7 @@ standard_name = aerosol_single_scattering_albedo_for_longwave_bands_01_16 long_name = aerosol single scattering albedo for longwave bands 01-16 units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_longwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation) type = real kind = kind_phys intent = out @@ -226,7 +226,7 @@ standard_name = aerosol_asymmetry_parameter_for_longwave_bands_01_16 long_name = aerosol asymmetry parameter for longwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_longwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation) type = real kind = kind_phys intent = out diff --git a/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 b/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 index 2c501b2081..1fcb5a5350 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 +++ b/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 @@ -40,7 +40,7 @@ subroutine rrtmgp_lw_main_init(rrtmgp_root_dir, rrtmgp_lw_file_gas, rrtmgp_lw_fi !< clouds optical properties rrtmgp_lw_file_gas !< RRTMGP file containing coefficients used to compute !< gaseous optical properties - character(len=*), dimension(:), intent(in), optional :: & + character(len=*), dimension(:), intent(in) :: & active_gases_array !< List of active gases from namelist as array) logical, intent(in) :: & doGP_cldoptics_PADE, & !< Use RRTMGP cloud-optics: PADE approximation? diff --git a/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta index 16a3204424..1eb50ed87b 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta @@ -129,7 +129,7 @@ type = logical intent = in [doLWclrsky] - standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output lw heating rate (Radtend%lwhc) units = flag dimensions = () @@ -354,7 +354,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -362,7 +362,7 @@ standard_name = cloud_liquid_water_path long_name = layer cloud liquid water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -370,7 +370,7 @@ standard_name = mean_effective_radius_for_liquid_cloud long_name = mean effective radius for liquid cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -378,7 +378,7 @@ standard_name = cloud_ice_water_path long_name = layer cloud ice water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -386,7 +386,7 @@ standard_name = mean_effective_radius_for_ice_cloud long_name = mean effective radius for ice cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -394,7 +394,7 @@ standard_name = cloud_snow_water_path long_name = layer cloud snow water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -402,7 +402,7 @@ standard_name = mean_effective_radius_for_snow_flake long_name = mean effective radius for snow cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -410,7 +410,7 @@ standard_name = cloud_rain_water_path long_name = layer cloud rain water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -418,7 +418,7 @@ standard_name = mean_effective_radius_for_rain_drop long_name = mean effective radius for rain cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -522,7 +522,7 @@ standard_name = aerosol_optical_depth_for_longwave_bands_01_16 long_name = aerosol optical depth for longwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_longwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation) type = real kind = kind_phys intent = in @@ -530,7 +530,7 @@ standard_name = aerosol_single_scattering_albedo_for_longwave_bands_01_16 long_name = aerosol single scattering albedo for longwave bands 01-16 units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_longwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation) type = real kind = kind_phys intent = in @@ -538,7 +538,7 @@ standard_name = aerosol_asymmetry_parameter_for_longwave_bands_01_16 long_name = aerosol asymmetry parameter for longwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_longwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation) type = real kind = kind_phys intent = in diff --git a/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 b/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 index bdef49cba9..51118c12e4 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 +++ b/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 @@ -39,7 +39,7 @@ subroutine rrtmgp_sw_main_init(rrtmgp_root_dir, rrtmgp_sw_file_gas, rrtmgp_sw_fi rrtmgp_root_dir, & !< RTE-RRTMGP root directory rrtmgp_sw_file_clouds, & !< RRTMGP file containing K-distribution data rrtmgp_sw_file_gas !< RRTMGP file containing cloud-optics data - character(len=*), dimension(:), intent(in), optional :: & + character(len=*), dimension(:), intent(in) :: & active_gases_array !< List of active gases from namelist as array) logical, intent(in) :: & doGP_cldoptics_PADE, & !< Use RRTMGP cloud-optics: PADE approximation? diff --git a/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta index abba7e1aa2..0d1df34952 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta @@ -129,7 +129,7 @@ type = logical intent = in [doSWclrsky] - standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output sw heating rate (Radtend%swhc) units = flag dimensions = () @@ -353,7 +353,7 @@ standard_name = total_cloud_fraction long_name = layer total cloud fraction units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -361,7 +361,7 @@ standard_name = cloud_liquid_water_path long_name = layer cloud liquid water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -369,7 +369,7 @@ standard_name = mean_effective_radius_for_liquid_cloud long_name = mean effective radius for liquid cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -377,7 +377,7 @@ standard_name = cloud_ice_water_path long_name = layer cloud ice water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -385,7 +385,7 @@ standard_name = mean_effective_radius_for_ice_cloud long_name = mean effective radius for ice cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -393,7 +393,7 @@ standard_name = cloud_snow_water_path long_name = layer cloud snow water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -401,7 +401,7 @@ standard_name = mean_effective_radius_for_snow_flake long_name = mean effective radius for snow cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -409,7 +409,7 @@ standard_name = cloud_rain_water_path long_name = layer cloud rain water path units = g m-2 - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -417,7 +417,7 @@ standard_name = mean_effective_radius_for_rain_drop long_name = mean effective radius for rain cloud units = um - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = in @@ -553,7 +553,7 @@ standard_name = aerosol_optical_depth_for_shortwave_bands_01_16 long_name = aerosol optical depth for shortwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_shortwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys intent = in @@ -561,7 +561,7 @@ standard_name = aerosol_single_scattering_albedo_for_shortwave_bands_01_16 long_name = aerosol single scattering albedo for shortwave bands 01-16 units = frac - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_shortwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys intent = in @@ -569,7 +569,7 @@ standard_name = aerosol_asymmetry_parameter_for_shortwave_bands_01_16 long_name = aerosol asymmetry parameter for shortwave bands 01-16 units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_bands_for_shortwave_radiation) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys intent = in @@ -624,7 +624,7 @@ standard_name = cloud_optical_depth_layers_at_0p55mu_band long_name = approx .55mu band layer cloud optical depth units = none - dimensions = (horizontal_loop_extent,vertical_layer_dimension) + dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys intent = inout diff --git a/physics/SFC_Layer/UFS/sfc_diff.f b/physics/SFC_Layer/UFS/sfc_diff.f index 3e09651d1d..922550230c 100644 --- a/physics/SFC_Layer/UFS/sfc_diff.f +++ b/physics/SFC_Layer/UFS/sfc_diff.f @@ -54,7 +54,7 @@ module sfc_diff !!\f] !! - Calculate the exchange coefficients:\f$cm\f$, \f$ch\f$, and \f$stress\f$ as inputs of other \a sfc schemes. !! - subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & !intent(in) + subroutine sfc_diff_run (im,rvrdm1,eps,epsm1,grav, & & ps,t1,q1,z1,garea,wind, & !intent(in) & prsl1,prslki,prsik1,prslk1, & !intent(in) & sigmaf,vegtype,shdmax,ivegsrc, & !intent(in) diff --git a/physics/SFC_Models/Lake/CLM/clm_lake.meta b/physics/SFC_Models/Lake/CLM/clm_lake.meta index 7b3bc0a49b..c327965cb7 100644 --- a/physics/SFC_Models/Lake/CLM/clm_lake.meta +++ b/physics/SFC_Models/Lake/CLM/clm_lake.meta @@ -730,7 +730,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [t1] standard_name = air_temperature_at_surface_adjacent_layer long_name = mean temperature at lowest model layer diff --git a/physics/SFC_Models/Lake/Flake/flake_driver.F90 b/physics/SFC_Models/Lake/Flake/flake_driver.F90 index b5d54009a9..1ba1059c88 100644 --- a/physics/SFC_Models/Lake/Flake/flake_driver.F90 +++ b/physics/SFC_Models/Lake/Flake/flake_driver.F90 @@ -427,8 +427,8 @@ end subroutine flake_driver_post_init subroutine flake_driver_post_finalize() end subroutine flake_driver_post_finalize -!> \section arg_table_flake_driver_post Argument Table -!! \htmlinclude flake_driver_post.html +!> \section arg_table_flake_driver_post_run Argument Table +!! \htmlinclude flake_driver_post_run.html !! subroutine flake_driver_post_run (im, use_lake_model, h_ML, T_wML, & Tsurf, lakedepth, xz, zm, tref, tsfco, & diff --git a/physics/SFC_Models/Lake/Flake/flake_driver.meta b/physics/SFC_Models/Lake/Flake/flake_driver.meta index 22ab62d1e7..98dc7632cb 100644 --- a/physics/SFC_Models/Lake/Flake/flake_driver.meta +++ b/physics/SFC_Models/Lake/Flake/flake_driver.meta @@ -411,7 +411,8 @@ [ccpp-table-properties] name = flake_driver_post type = scheme - dependencies = machine.F + dependencies = ../../../hooks/machine.F + ######################################################################## [ccpp-arg-table] name = flake_driver_post_run diff --git a/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta b/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta index 8541af659b..52e2a4875e 100644 --- a/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta +++ b/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta @@ -2,6 +2,7 @@ name = land_iau_external_data_type type = ddt dependencies = + module_name = land_iau_mod [ccpp-arg-table] name = land_iau_external_data_type @@ -13,6 +14,7 @@ name = land_iau_state_type type = ddt dependencies = + module_name = land_iau_mod [ccpp-arg-table] name = land_iau_state_type @@ -24,35 +26,8 @@ name = land_iau_control_type type = ddt dependencies = + module_name = land_iau_mod [ccpp-arg-table] name = land_iau_control_type type = ddt - -######################################################################## -[ccpp-table-properties] - name = land_iau_mod - type = module - dependencies = machine.F - -[ccpp-arg-table] - name = land_iau_mod - type = module -[land_iau_external_data_type] - standard_name = land_iau_external_data_type - long_name = definition of type land_iau_external_data_type - units = DDT - dimensions = () - type = land_iau_external_data_type -[land_iau_state_type] - standard_name = land_iau_state_type - long_name = definition of type land_iau_state_type - units = DDT - dimensions = () - type = land_iau_state_type -[land_iau_control_type] - standard_name = land_iau_control_type - long_name = definition of type land_iau_control_type - units = DDT - dimensions = () - type = land_iau_control_type diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta index 828a83939f..f4a472b6c5 100644 --- a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta +++ b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta @@ -344,7 +344,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [qss_w] standard_name = surface_specific_humidity_over_water long_name = surface air saturation specific humidity over water @@ -352,7 +352,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [snowmt] standard_name = surface_snow_melt long_name = snow melt during timestep @@ -392,7 +392,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [evapw] standard_name = kinematic_surface_upward_latent_heat_flux_over_water long_name = kinematic surface upward latent heat flux over water @@ -400,7 +400,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [hflxi] standard_name = kinematic_surface_upward_sensible_heat_flux_over_ice long_name = kinematic surface upward sensible heat flux over ice @@ -408,7 +408,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [hflxw] standard_name = kinematic_surface_upward_sensible_heat_flux_over_water long_name = kinematic surface upward sensible heat flux over water @@ -416,7 +416,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [islmsk] standard_name = sea_land_ice_mask_cice long_name = sea/land/ice mask cice (=0/1/2) diff --git a/physics/photochem/module_h2ophys.meta b/physics/photochem/module_h2ophys.meta index 030050acb9..c8f0e16c2d 100644 --- a/physics/photochem/module_h2ophys.meta +++ b/physics/photochem/module_h2ophys.meta @@ -6,20 +6,4 @@ [ccpp-arg-table] name = ty_h2ophys type = ddt - -######################################################################## -[ccpp-table-properties] - name = module_h2ophys - type = module - dependencies = machine.F - -[ccpp-arg-table] - name = module_h2ophys - type = module -[ty_h2ophys] - standard_name = ty_h2ophys - long_name = definition of type ty_h2ophys - units = DDT - dimensions = () - type = ty_h2ophys \ No newline at end of file diff --git a/physics/photochem/module_ozphys.meta b/physics/photochem/module_ozphys.meta index 2922d16d7a..3fcb189057 100644 --- a/physics/photochem/module_ozphys.meta +++ b/physics/photochem/module_ozphys.meta @@ -6,19 +6,3 @@ [ccpp-arg-table] name = ty_ozphys type = ddt - -######################################################################## -[ccpp-table-properties] - name = module_ozphys - type = module - dependencies = machine.F,funcphys.f90 - -[ccpp-arg-table] - name = module_ozphys - type = module -[ty_ozphys] - standard_name = ty_ozphys - long_name = definition of type ty_ozphys - units = DDT - dimensions = () - type = ty_ozphys \ No newline at end of file diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.F90 b/physics/smoke_dust/rrfs_smoke_wrapper.F90 index 7254304b80..087a690a0a 100755 --- a/physics/smoke_dust/rrfs_smoke_wrapper.F90 +++ b/physics/smoke_dust/rrfs_smoke_wrapper.F90 @@ -237,7 +237,7 @@ subroutine rrfs_smoke_wrapper_run(im, flag_init, kte, kme, ktau, dt, garea, land integer :: i, j, k, kp, n ! MPI variables integer :: mpiid - type(MPI_comm), intent(in) :: mpicomm + type(MPI_Comm), intent(in) :: mpicomm integer, intent(in) :: mpirank integer, intent(in) :: mpiroot From d47eb279c8d0bcd2d2fcc69ff3f9ce0e5a5a0321 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 22 Sep 2025 21:53:34 +0000 Subject: [PATCH 2/5] Changes from fortran-to-metadata comparision --- physics/CONV/Grell_Freitas/cu_gf_driver.F90 | 2 +- physics/CONV/Grell_Freitas/cu_gf_driver.meta | 1 + physics/CONV/SAMF/samfdeepcnv.f | 4 +++- physics/CONV/SAMF/samfshalcnv.f | 3 +++ .../UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta | 2 +- .../UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta | 2 +- .../UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 | 16 +++++++------- .../GFS_radiation_surface.meta | 2 +- .../UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 | 10 ++++----- .../UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta | 7 ++++++ .../UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta | 2 ++ .../UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta | 7 +++--- .../GFS_suite_interstitial_3.meta | 8 +++---- .../GFS_suite_interstitial_4.meta | 2 +- .../GFS_suite_interstitial_5.meta | 2 +- .../GFS_surface_generic_post.meta | 2 +- .../maximum_hourly_diagnostics.meta | 2 +- .../GFDL/v3_2022/gfdl_cloud_microphys_v3.meta | 2 +- physics/MP/NSSL/mp_nssl.meta | 12 +++++----- physics/MP/TEMPO/mp_tempo.F90 | 2 +- physics/MP/TEMPO/mp_tempo.meta | 4 ++-- physics/MP/Thompson/mp_thompson.F90 | 2 +- physics/MP/Thompson/mp_thompson.meta | 2 +- physics/MP/Zhao_Carr/zhaocarr_precpd.f | 3 +++ physics/PBL/MYJ/myjpbl_wrapper.F90 | 3 +++ physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta | 2 +- physics/PBL/SHOC/moninshoc.f | 3 +++ physics/PBL/SHOC/shoc.F90 | 3 +++ physics/PBL/YSU/ysuvdif.F90 | 3 +++ physics/PBL/saYSU/shinhongvdif.F90 | 3 +++ physics/Radiation/RRTMG/radlw_main.meta | 8 +++++++ physics/Radiation/RRTMG/radsw_main.meta | 8 +++++++ physics/Radiation/RRTMG/rrtmg_lw_post.F90 | 8 +++---- physics/Radiation/RRTMG/rrtmg_lw_post.meta | 7 ++++++ physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 | 3 +++ physics/SFC_Models/Lake/CLM/clm_lake.f90 | 8 +++---- physics/SFC_Models/Lake/CLM/clm_lake.meta | 22 +++++++++++++++---- .../SFC_Models/Lake/Flake/flake_driver.meta | 19 +++++++++++----- physics/SFC_Models/Land/RUC/lsm_ruc.meta | 2 +- physics/SFC_Models/SeaIce/CICE/sfc_sice.meta | 2 +- physics/smoke_dust/rrfs_smoke_wrapper.meta | 14 ++++++------ 41 files changed, 149 insertions(+), 70 deletions(-) diff --git a/physics/CONV/Grell_Freitas/cu_gf_driver.F90 b/physics/CONV/Grell_Freitas/cu_gf_driver.F90 index 47bddd7997..797be87aa2 100644 --- a/physics/CONV/Grell_Freitas/cu_gf_driver.F90 +++ b/physics/CONV/Grell_Freitas/cu_gf_driver.F90 @@ -129,7 +129,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co integer, dimension (:), intent(out) :: hbot,htop,kcnv integer, dimension (:), intent(in) :: xland real(kind=kind_phys), dimension (:), intent(in) :: pbl - real(kind=kind_phys), dimension (:), intent(in) :: maxMF + real(kind=kind_phys), dimension (:), intent(in), optional :: maxMF !$acc declare copyout(hbot,htop,kcnv) !$acc declare copyin(xland,pbl) integer, dimension (im) :: tropics diff --git a/physics/CONV/Grell_Freitas/cu_gf_driver.meta b/physics/CONV/Grell_Freitas/cu_gf_driver.meta index 39a20f7555..4a645b4abd 100644 --- a/physics/CONV/Grell_Freitas/cu_gf_driver.meta +++ b/physics/CONV/Grell_Freitas/cu_gf_driver.meta @@ -335,6 +335,7 @@ type = real kind = kind_phys intent = inout + optional = True [cliw] standard_name = ice_water_mixing_ratio_convective_transport_tracer long_name = ratio of mass of ice water to mass of dry air plus vapor (without condensates) in the convectively transported tracer array diff --git a/physics/CONV/SAMF/samfdeepcnv.f b/physics/CONV/SAMF/samfdeepcnv.f index b4fe700279..91f7aeed85 100644 --- a/physics/CONV/SAMF/samfdeepcnv.f +++ b/physics/CONV/SAMF/samfdeepcnv.f @@ -11,7 +11,9 @@ module samfdeepcnv use progomega, only : progomega_calc contains - +!! \section arg_table_samfdeepcnv_init Argument Table +!! \htmlinclude samfdeepcnv_init.html +!! subroutine samfdeepcnv_init(imfdeepcnv,imfdeepcnv_samf, & & errmsg, errflg) diff --git a/physics/CONV/SAMF/samfshalcnv.f b/physics/CONV/SAMF/samfshalcnv.f index ee7f6a76e2..5120e0fe60 100644 --- a/physics/CONV/SAMF/samfshalcnv.f +++ b/physics/CONV/SAMF/samfshalcnv.f @@ -9,6 +9,9 @@ module samfshalcnv use progomega, only : progomega_calc contains +!! \section arg_table_samfshalcnv_init Argument Table +!! \htmlinclude samfshalcnv_init.html +!! subroutine samfshalcnv_init(imfshalcnv, imfshalcnv_samf, & & errmsg, errflg) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta index 15ad5f6b34..8330724a46 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta @@ -228,7 +228,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = in + intent = inout [gq0] standard_name = tracer_concentration_of_new_state long_name = tracer concentration updated by physics diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta index fbd9e47d83..a0ee036548 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta @@ -98,7 +98,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers) type = real kind = kind_phys - intent = in + intent = inout [ntqv] standard_name = index_of_specific_humidity_in_tracer_concentration_array long_name = tracer index for water vapor (specific humidity) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 index 46585c9da0..544bb0fc90 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 @@ -29,19 +29,19 @@ subroutine GFS_rad_time_vary_timestep_init (lrseeds, rseeds, ! Interface variables logical, intent(in) :: lrseeds - integer, intent(in) :: rseeds(:,:) + integer, intent(in), optional :: rseeds(:,:) integer, intent(in) :: isubc_lw, isubc_sw, cnx, cny, isc, jsc, kdt integer, intent(in) :: imp_physics, imp_physics_zhao_carr, ipsd0, ipsdlim logical, intent(in) :: lslwr, lsswr - integer, intent(inout) :: icsdsw(:), icsdlw(:) + integer, intent(inout), optional :: icsdsw(:), icsdlw(:) integer, intent(in) :: imap(:), jmap(:) real(kind_phys), intent(in) :: sec - real(kind_phys), intent(inout) :: ps_2delt(:) - real(kind_phys), intent(inout) :: ps_1delt(:) - real(kind_phys), intent(inout) :: t_2delt(:,:) - real(kind_phys), intent(inout) :: t_1delt(:,:) - real(kind_phys), intent(inout) :: qv_2delt(:,:) - real(kind_phys), intent(inout) :: qv_1delt(:,:) + real(kind_phys), intent(inout), optional :: ps_2delt(:) + real(kind_phys), intent(inout), optional :: ps_1delt(:) + real(kind_phys), intent(inout), optional :: t_2delt(:,:) + real(kind_phys), intent(inout), optional :: t_1delt(:,:) + real(kind_phys), intent(inout), optional :: qv_2delt(:,:) + real(kind_phys), intent(inout), optional :: qv_1delt(:,:) real(kind_phys), intent(in) :: t(:,:), qv(:,:), ps(:) character(len=*), intent(out) :: errmsg integer, intent(out) :: errflg diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta index 20a926fbff..1cb46c3a20 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta @@ -327,7 +327,7 @@ units = flag dimensions = (horizontal_loop_extent) type = integer - intent = inout + intent = in [alvsf] standard_name = vis_albedo_strong_cosz long_name = mean vis albedo with strong cosz dependency diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 index 76ee18ec22..0a0d563b0c 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 @@ -19,7 +19,7 @@ module GFS_rrtmg_post !! \htmlinclude GFS_rrtmg_post_run.html !! subroutine GFS_rrtmg_post_run (im, km, kmp1, lm, ltp, kt, kb, kd, nspc1, & - nfxr, nday, lsswr, lslwr, lssav, fhlwr, fhswr, raddt, coszen, & + lmk,nfxr, nday, lsswr, lslwr, lssav, fhlwr, fhswr, raddt, coszen,& coszdg, prsi, tgrs, aerodp, cldsa, mtopa, mbota, clouds1, & cldtaulw, cldtausw, sfcflw, sfcfsw, topflw, topfsw, scmpsw, & fluxr, total_albedo, errmsg, errflg) @@ -33,7 +33,7 @@ subroutine GFS_rrtmg_post_run (im, km, kmp1, lm, ltp, kt, kb, kd, nspc1, & ! Interface variables integer, intent(in) :: im, km, kmp1, lm, ltp, kt, kb, kd, & - nspc1, nfxr, nday + nspc1, nfxr, nday, lmk logical, intent(in) :: lsswr, lslwr, lssav real(kind=kind_phys), intent(in) :: raddt, fhlwr, fhswr @@ -45,9 +45,9 @@ subroutine GFS_rrtmg_post_run (im, km, kmp1, lm, ltp, kt, kb, kd, nspc1, & real(kind=kind_phys), dimension(im,NSPC1), intent(in) :: aerodp real(kind=kind_phys), dimension(im,5), intent(in) :: cldsa integer, dimension(im,3), intent(in) :: mbota, mtopa - real(kind=kind_phys), dimension(im,lm+LTP), intent(in) :: clouds1 - real(kind=kind_phys), dimension(im,lm+LTP), intent(in) :: cldtausw - real(kind=kind_phys), dimension(im,lm+LTP), intent(in) :: cldtaulw + real(kind=kind_phys), dimension(im,lmk), intent(in) :: clouds1 + real(kind=kind_phys), dimension(im,lmk), intent(in) :: cldtausw + real(kind=kind_phys), dimension(im,lmk), intent(in) :: cldtaulw real(kind=kind_phys), dimension(im), intent(inout) :: total_albedo type(sfcflw_type), dimension(im), intent(in) :: sfcflw diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta index b387c3e336..8984e1dd33 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta @@ -44,6 +44,13 @@ dimensions = () type = integer intent = in +[lmk] + standard_name = adjusted_vertical_layer_dimension_for_radiation + long_name = adjusted number of vertical layers for radiation + units = count + dimensions = () + type = integer + intent = in [kt] standard_name = vertical_index_difference_between_layer_and_upper_bound long_name = vertical index difference between layer and upper bound diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta index cce1cbf73f..ac2a534434 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta @@ -481,6 +481,7 @@ type = real kind = kind_phys intent = inout + optional = True [htrlwc] standard_name = tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep long_name = longwave clear sky heating rate @@ -489,6 +490,7 @@ type = real kind = kind_phys intent = inout + optional = True [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta index e3de2bb0ae..bda0bba5b6 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta @@ -22,7 +22,7 @@ units = none dimensions = () type = character - kind = len=128 + kind = len=* intent = in [active_gases_array] standard_name = list_of_active_gases_used_by_RRTMGP @@ -30,7 +30,7 @@ units = none dimensions = (number_of_active_gases_used_by_RRTMGP) type = character - kind = len=128 + kind = len=* intent = out [errmsg] standard_name = ccpp_error_message @@ -361,7 +361,6 @@ type = real kind = kind_phys intent = inout - optional = True [tsfg] standard_name = surface_ground_temperature_for_radiation long_name = surface ground temperature for radiation @@ -515,7 +514,7 @@ units = count dimensions = () type = integer - intent = inout + intent = out [idxday] standard_name = daytime_points long_name = daytime points diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta index 4cf339e4de..08b3a01069 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta @@ -268,7 +268,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = out + intent = inout optional = True [omegain] standard_name = prognostic_updraft_velocity_in_convection @@ -277,7 +277,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = in + intent = inout optional = True [omegaout] standard_name = updraft_velocity_updated_by_physics @@ -533,7 +533,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = out [save_inc] standard_name = ice_cloud_number_concentration_save long_name = ice cloud number concentration before entering a physics scheme @@ -541,7 +541,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = out [ntlnc] standard_name = index_of_mass_number_concentration_of_cloud_droplets_in_tracer_concentration_array long_name = tracer index for liquid number concentration diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta index dff0375b22..5f4c8099d5 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta @@ -327,7 +327,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = in [dtidx] standard_name = cumulative_change_of_state_variables_outer_index long_name = index of state-variable and process in last dimension of diagnostic tendencies array AKA cumulative_change_index diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.meta index 5111379015..ae8bbd76ba 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.meta @@ -65,7 +65,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers_for_convective_transport) type = real kind = kind_phys - intent = inout + intent = out [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta index bff2956ae8..063a7e9b21 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta @@ -454,7 +454,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout optional = True [epi] standard_name = instantaneous_surface_potential_evaporation diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta index 7108e2f97f..7109d04c37 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta @@ -229,7 +229,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = in [pratemax] standard_name = maximum_precipitation_rate_over_maximum_hourly_time_interval long_name = maximum precipitation rate over maximum hourly time interval diff --git a/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta b/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta index 3b022bf25b..8208b6d1cc 100644 --- a/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta +++ b/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta @@ -385,7 +385,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = in [dtp] standard_name = timestep_for_physics long_name = physics timestep diff --git a/physics/MP/NSSL/mp_nssl.meta b/physics/MP/NSSL/mp_nssl.meta index 93a5aa65b6..6af238ca29 100644 --- a/physics/MP/NSSL/mp_nssl.meta +++ b/physics/MP/NSSL/mp_nssl.meta @@ -592,7 +592,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = out [rain] standard_name = lwe_thickness_of_explicit_rain_amount long_name = explicit rain fall on physics timestep @@ -600,7 +600,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = out [graupel] standard_name = lwe_thickness_of_graupel_amount long_name = graupel fall on physics timestep @@ -608,7 +608,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = out [ice] standard_name = lwe_thickness_of_ice_amount long_name = ice fall on physics timestep @@ -616,7 +616,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = out [snow] standard_name = lwe_thickness_of_snow_amount long_name = snow fall on physics timestep @@ -624,7 +624,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = out [sr] standard_name = ratio_of_snowfall_to_rainfall long_name = ratio of snowfall to large-scale rainfall @@ -640,7 +640,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = out + intent = inout [do_radar_ref] standard_name = flag_for_radar_reflectivity long_name = flag for radar reflectivity diff --git a/physics/MP/TEMPO/mp_tempo.F90 b/physics/MP/TEMPO/mp_tempo.F90 index 174eaac2ee..e3275abb84 100644 --- a/physics/MP/TEMPO/mp_tempo.F90 +++ b/physics/MP/TEMPO/mp_tempo.F90 @@ -427,7 +427,7 @@ subroutine mp_tempo_run(ncol, nlev, con_g, con_rd, & real(kind_phys), optional, intent(in ) :: nwfa2d(:) real(kind_phys), optional, intent(in ) :: nifa2d(:) real(kind_phys), intent(in) :: aerfld(:,:,:) - logical, optional, intent(in ) :: aero_ind_fdb + logical, intent(in ) :: aero_ind_fdb ! State variables and timestep information real(kind_phys), intent(inout) :: tgrs(:,:) real(kind_phys), intent(in ) :: prsl(:,:) diff --git a/physics/MP/TEMPO/mp_tempo.meta b/physics/MP/TEMPO/mp_tempo.meta index 0bac3e856d..2a76446688 100644 --- a/physics/MP/TEMPO/mp_tempo.meta +++ b/physics/MP/TEMPO/mp_tempo.meta @@ -774,7 +774,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = out + intent = inout [max_hail_diam_sfc] standard_name = max_hail_diameter_sfc long_name = instantaneous maximum hail diameter at lowest model level @@ -827,7 +827,7 @@ type = integer intent = in [blkno] - standard_name = ccpp_block_number + standard_name = ccpp_chunk_number long_name = number of block for explicit data blocking in CCPP units = index dimensions = () diff --git a/physics/MP/Thompson/mp_thompson.F90 b/physics/MP/Thompson/mp_thompson.F90 index e1500aa406..87cc9a84b4 100644 --- a/physics/MP/Thompson/mp_thompson.F90 +++ b/physics/MP/Thompson/mp_thompson.F90 @@ -391,7 +391,7 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd, & real(kind_phys), optional, intent(in ) :: nwfa2d(:) real(kind_phys), optional, intent(in ) :: nifa2d(:) real(kind_phys), intent(in) :: aerfld(:,:,:) - logical, optional, intent(in ) :: aero_ind_fdb + logical, intent(in ) :: aero_ind_fdb ! State variables and timestep information real(kind_phys), intent(inout) :: tgrs(:,:) real(kind_phys), intent(in ) :: prsl(:,:) diff --git a/physics/MP/Thompson/mp_thompson.meta b/physics/MP/Thompson/mp_thompson.meta index 4bc78b22ed..472f3e76ea 100644 --- a/physics/MP/Thompson/mp_thompson.meta +++ b/physics/MP/Thompson/mp_thompson.meta @@ -717,7 +717,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = out + intent = inout [max_hail_diam_sfc] standard_name = max_hail_diameter_sfc long_name = instantaneous maximum hail diameter at lowest model level diff --git a/physics/MP/Zhao_Carr/zhaocarr_precpd.f b/physics/MP/Zhao_Carr/zhaocarr_precpd.f index 922fedfcc7..251f4506dc 100644 --- a/physics/MP/Zhao_Carr/zhaocarr_precpd.f +++ b/physics/MP/Zhao_Carr/zhaocarr_precpd.f @@ -11,6 +11,9 @@ module zhaocarr_precpd logical :: is_initialized = .False. contains +!! \section arg_table_zhaocarr_precpd_init Argument Table +!! \htmlinclude zhaocarr_precpd_init.html +!! subroutine zhaocarr_precpd_init (imp_physics, & & imp_physics_zhao_carr, & & imp_physics_zhao_carr_pdf, & diff --git a/physics/PBL/MYJ/myjpbl_wrapper.F90 b/physics/PBL/MYJ/myjpbl_wrapper.F90 index cfa4fff09a..7b58cfb719 100644 --- a/physics/PBL/MYJ/myjpbl_wrapper.F90 +++ b/physics/PBL/MYJ/myjpbl_wrapper.F90 @@ -8,6 +8,9 @@ MODULE myjpbl_wrapper contains +!! \section arg_table_myjpbl_wrapper_init Argument Table +!! \htmlinclude myjpbl_wrapper_init.html +!! subroutine myjpbl_wrapper_init (do_myjpbl,errmsg,errflg) logical, intent(in) :: do_myjpbl diff --git a/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta b/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta index e7b8a5a32f..02c8d81c0e 100644 --- a/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta +++ b/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta @@ -362,7 +362,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = in optional = True [prsl] standard_name = air_pressure diff --git a/physics/PBL/SHOC/moninshoc.f b/physics/PBL/SHOC/moninshoc.f index 994b78bf69..284292de01 100644 --- a/physics/PBL/SHOC/moninshoc.f +++ b/physics/PBL/SHOC/moninshoc.f @@ -9,6 +9,9 @@ module moninshoc contains +!> \section arg_table_moninshoc_init Argument Table +!! \htmlinclude moninshoc_init.html +!! subroutine moninshoc_init (do_shoc, errmsg, errflg) implicit none diff --git a/physics/PBL/SHOC/shoc.F90 b/physics/PBL/SHOC/shoc.F90 index b9860dc33d..09ba1b2443 100644 --- a/physics/PBL/SHOC/shoc.F90 +++ b/physics/PBL/SHOC/shoc.F90 @@ -14,6 +14,9 @@ module shoc contains +!> \section arg_table_shoc_init Argument Table +!! \htmlinclude shoc_init.html +!! subroutine shoc_init (do_shoc, errmsg, errflg) implicit none logical, intent(in) :: do_shoc diff --git a/physics/PBL/YSU/ysuvdif.F90 b/physics/PBL/YSU/ysuvdif.F90 index 09ba28625b..fda8c4de70 100644 --- a/physics/PBL/YSU/ysuvdif.F90 +++ b/physics/PBL/YSU/ysuvdif.F90 @@ -11,6 +11,9 @@ module ysuvdif contains +!> \section arg_table_ysuvdif_init Argument Table +!! \htmlinclude ysuvdif_init.html +!! subroutine ysuvdif_init (do_ysu,errmsg,errflg) logical, intent(in) :: do_ysu diff --git a/physics/PBL/saYSU/shinhongvdif.F90 b/physics/PBL/saYSU/shinhongvdif.F90 index f56eae6171..59f7b1f8e7 100644 --- a/physics/PBL/saYSU/shinhongvdif.F90 +++ b/physics/PBL/saYSU/shinhongvdif.F90 @@ -11,6 +11,9 @@ module shinhongvdif contains +!> \section arg_table_shinhongvdif_init Argument Table +!! \htmlinclude shinhongvdif_init.html +!! subroutine shinhongvdif_init (shinhong,errmsg,errflg) logical, intent(in) :: shinhong diff --git a/physics/Radiation/RRTMG/radlw_main.meta b/physics/Radiation/RRTMG/radlw_main.meta index 545e1652ff..5485653004 100644 --- a/physics/Radiation/RRTMG/radlw_main.meta +++ b/physics/Radiation/RRTMG/radlw_main.meta @@ -373,6 +373,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_liq] standard_name = mean_effective_radius_for_liquid_cloud long_name = mean effective radius for liquid cloud @@ -381,6 +382,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_iwp] standard_name = cloud_ice_water_path long_name = cloud ice water path @@ -389,6 +391,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_ice] standard_name = mean_effective_radius_for_ice_cloud long_name = mean effective radius for ice cloud @@ -397,6 +400,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_rwp] standard_name = cloud_rain_water_path long_name = cloud ice water path @@ -405,6 +409,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_rain] standard_name = mean_effective_radius_for_rain_drop long_name = mean effective radius for rain drop @@ -413,6 +418,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_swp] standard_name = cloud_snow_water_path long_name = cloud snow water path @@ -421,6 +427,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_snow] standard_name = mean_effective_radius_for_snow_flake long_name = mean effective radius for snow flake @@ -429,6 +436,7 @@ type = real kind = kind_phys intent = in + optional = True [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP diff --git a/physics/Radiation/RRTMG/radsw_main.meta b/physics/Radiation/RRTMG/radsw_main.meta index 3782cc2d14..feaee246f0 100644 --- a/physics/Radiation/RRTMG/radsw_main.meta +++ b/physics/Radiation/RRTMG/radsw_main.meta @@ -442,6 +442,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_liq] standard_name = mean_effective_radius_for_liquid_cloud long_name = mean effective radius for liquid cloud @@ -450,6 +451,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_iwp] standard_name = cloud_ice_water_path long_name = cloud ice water path @@ -458,6 +460,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_ice] standard_name = mean_effective_radius_for_ice_cloud long_name = mean effective radius for ice cloud @@ -466,6 +469,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_rwp] standard_name = cloud_rain_water_path long_name = cloud rain water path @@ -474,6 +478,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_rain] standard_name = mean_effective_radius_for_rain_drop long_name = mean effective radius for rain drop @@ -482,6 +487,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_swp] standard_name = cloud_snow_water_path long_name = cloud snow water path @@ -490,6 +496,7 @@ type = real kind = kind_phys intent = in + optional = True [cld_ref_snow] standard_name = mean_effective_radius_for_snow_flake long_name = mean effective radius for snow flake @@ -498,6 +505,7 @@ type = real kind = kind_phys intent = in + optional = True [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP diff --git a/physics/Radiation/RRTMG/rrtmg_lw_post.F90 b/physics/Radiation/RRTMG/rrtmg_lw_post.F90 index 36661973d1..b514d6d1c4 100644 --- a/physics/Radiation/RRTMG/rrtmg_lw_post.F90 +++ b/physics/Radiation/RRTMG/rrtmg_lw_post.F90 @@ -11,7 +11,7 @@ module rrtmg_lw_post !> \section arg_table_rrtmg_lw_post_run Argument Table !! \htmlinclude rrtmg_lw_post_run.html !! - subroutine rrtmg_lw_post_run (im, levs, ltp, lm, kd, lslwr, lwhtr, & + subroutine rrtmg_lw_post_run (im, levs, ltp, lm, lmk, kd, lslwr, lwhtr, & tsfa, htlwc, htlw0, sfcflw, tsflw, sfcdlw, htrlw, lwhc, & errmsg, errflg) @@ -20,11 +20,11 @@ subroutine rrtmg_lw_post_run (im, levs, ltp, lm, kd, lslwr, lwhtr, & implicit none - integer, intent(in) :: im, levs, ltp, lm, kd + integer, intent(in) :: im, lmk, levs, ltp, lm, kd logical, intent(in) :: lslwr, lwhtr real(kind=kind_phys), dimension(im), intent(in) :: tsfa - real(kind=kind_phys), dimension(im, LM+LTP), intent(in) :: htlwc - real(kind=kind_phys), dimension(im, LM+LTP), intent(in) :: htlw0 + real(kind=kind_phys), dimension(im, LMK), intent(in) :: htlwc + real(kind=kind_phys), dimension(im, LMK), intent(in) :: htlw0 type(sfcflw_type), dimension(im), intent(in) :: sfcflw diff --git a/physics/Radiation/RRTMG/rrtmg_lw_post.meta b/physics/Radiation/RRTMG/rrtmg_lw_post.meta index aeee3e4743..56d9069d25 100644 --- a/physics/Radiation/RRTMG/rrtmg_lw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_lw_post.meta @@ -35,6 +35,13 @@ dimensions = () type = integer intent = in +[lmk] + standard_name = adjusted_vertical_layer_dimension_for_radiation + long_name = adjusted number of vertical layers for radiation + units = count + dimensions = () + type = integer + intent = in [kd] standard_name = vertical_index_difference_between_inout_and_local long_name = vertical index difference between in/out and local diff --git a/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 b/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 index d8f6b543c1..4d3cf05998 100644 --- a/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 +++ b/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 @@ -8,6 +8,9 @@ MODULE myjsfc_wrapper contains +!! \section arg_table_myjsfc_wrapper_init Argument Table +!! \htmlinclude myjsfc_wrapper_init.html +!! subroutine myjsfc_wrapper_init (do_myjsfc, & & errmsg,errflg) diff --git a/physics/SFC_Models/Lake/CLM/clm_lake.f90 b/physics/SFC_Models/Lake/CLM/clm_lake.f90 index f02ed92496..7a6cd40ace 100644 --- a/physics/SFC_Models/Lake/CLM/clm_lake.f90 +++ b/physics/SFC_Models/Lake/CLM/clm_lake.f90 @@ -263,7 +263,7 @@ end subroutine calculate_z_dz_lake !! SUBROUTINE clm_lake_run( & ! Model time and metadata: - flag_restart, im, km, me, master, fhour, IDATE, kdt, & + flag_restart, im, km, me, master, nlevs1, nlevs0, fhour, IDATE, kdt, & ! Configuration and initialization: iopt_lake, iopt_lake_clm, min_lakeice, lakedepth_default, use_lakedepth, & @@ -305,7 +305,7 @@ SUBROUTINE clm_lake_run( & ! Model time and metadata: ! LOGICAL , INTENT (IN) :: flag_restart - INTEGER , INTENT (IN) :: im,km,me,master + INTEGER , INTENT (IN) :: im,km,me,master,nlevs0,nlevs1 INTEGER, INTENT(IN) :: IDATE(4), kdt REAL(KIND_PHYS), INTENT(IN) :: fhour INTEGER, INTENT(IN) :: lkm @@ -362,13 +362,13 @@ SUBROUTINE clm_lake_run( & real(kind_phys), dimension( :,: ), INTENT(inout) :: t_lake3d, & lake_icefrac3d - real(kind_phys), dimension( :,-nlevsnow+1: ) ,INTENT(inout) :: t_soisno3d, & + real(kind_phys), dimension( :,nlevs1: ) ,INTENT(inout) :: t_soisno3d, & h2osoi_ice3d, & h2osoi_liq3d, & h2osoi_vol3d, & z3d, & dz3d - real(kind_phys), dimension( :,-nlevsnow+0: ) ,INTENT(inout) :: zi3d + real(kind_phys), dimension( :,nlevs0: ) ,INTENT(inout) :: zi3d REAL(KIND_PHYS), DIMENSION( : ) ,INTENT(INOUT) :: clm_lakedepth REAL(KIND_PHYS), DIMENSION( : ) ,INTENT(INOUT) :: input_lakedepth diff --git a/physics/SFC_Models/Lake/CLM/clm_lake.meta b/physics/SFC_Models/Lake/CLM/clm_lake.meta index c327965cb7..da21f631d8 100644 --- a/physics/SFC_Models/Lake/CLM/clm_lake.meta +++ b/physics/SFC_Models/Lake/CLM/clm_lake.meta @@ -42,6 +42,20 @@ dimensions = () type = integer intent = in +[nlevs0] + standard_name = snow_plus_soil_vertical_dimension_for_clm_lake_model + long_name = snow plus soil vertical dimension for clm lake model + units = count + dimensions = () + type = integer + intent = in +[nlevs1] + standard_name = snow_plus_soil_minus_one_vertical_dimension_for_clm_lake_model + long_name = snow plus soil minus one vertical dimension for clm lake model + units = count + dimensions = () + type = integer + intent = in [fhour] standard_name = forecast_time long_name = current forecast time @@ -115,7 +129,7 @@ units = flag dimensions = (horizontal_loop_extent) type = integer - intent = inout + intent = in [clm_lake_initialized] standard_name = flag_for_clm_lake_initialization long_name = set to true in clm_lake_run after likeini is called, as a workaround for ccpp limitation @@ -312,7 +326,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [flag_iter] standard_name = flag_for_iteration long_name = flag for iteration @@ -557,7 +571,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout [lake_q2m] standard_name = specific_humidity_at_2m_from_clm_lake long_name = specific humidity at 2m from clm lake @@ -565,7 +579,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout [weasd] standard_name = lwe_thickness_of_surface_snow_amount long_name = water equiv of acc snow depth over land and sea ice diff --git a/physics/SFC_Models/Lake/Flake/flake_driver.meta b/physics/SFC_Models/Lake/Flake/flake_driver.meta index 98dc7632cb..e12810a3be 100644 --- a/physics/SFC_Models/Lake/Flake/flake_driver.meta +++ b/physics/SFC_Models/Lake/Flake/flake_driver.meta @@ -182,7 +182,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = inout + intent = in [snwdph] standard_name = surface_snow_thickness_water_equivalent_over_ice long_name = water equivalent snow depth over ice @@ -424,6 +424,13 @@ dimensions = () type = integer intent = in +[use_lake_model] + standard_name = flag_for_using_lake_model + long_name = flag indicating lake points using a lake model + units = flag + dimensions = (horizontal_loop_extent) + type = integer + intent = in [lakedepth] standard_name = lake_depth long_name = lake depth @@ -463,7 +470,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout [zm] standard_name = ocean_mixed_layer_thickness long_name = mixed layer thickness @@ -471,7 +478,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout [tref] standard_name = reference_sea_surface_temperature long_name = reference/foundation temperature @@ -479,15 +486,15 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out -[tfco] + intent = inout +[tsfco] standard_name = sea_surface_temperature long_name = sea surface temperature units = K dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP diff --git a/physics/SFC_Models/Land/RUC/lsm_ruc.meta b/physics/SFC_Models/Land/RUC/lsm_ruc.meta index bc4d358e3c..6fd0675f4d 100644 --- a/physics/SFC_Models/Land/RUC/lsm_ruc.meta +++ b/physics/SFC_Models/Land/RUC/lsm_ruc.meta @@ -775,7 +775,7 @@ units = index dimensions = (horizontal_loop_extent) type = integer - intent = in + intent = inout [vtype] standard_name = vegetation_type_classification long_name = vegetation type at each grid cell diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta index f4a472b6c5..f6bc339b1c 100644 --- a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta +++ b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta @@ -304,7 +304,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = in + intent = inout [tprcp] standard_name = nonnegative_lwe_thickness_of_precipitation_amount_on_dynamics_timestep_over_ice long_name = total precipitation amount in each time step over ice diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta index ba630d1018..2f57bfaf2a 100755 --- a/physics/smoke_dust/rrfs_smoke_wrapper.meta +++ b/physics/smoke_dust/rrfs_smoke_wrapper.meta @@ -392,7 +392,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = in [us3d] standard_name = x_wind_of_new_state long_name = updated x-direction wind @@ -400,7 +400,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = in [vs3d] standard_name = y_wind_of_new_state long_name = updated y-direction wind @@ -408,7 +408,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = in [spechum] standard_name = specific_humidity_of_new_state long_name = water vapor specific humidity updated by physics @@ -416,7 +416,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - intent = inout + intent = in [w] standard_name = lagrangian_tendency_of_air_pressure long_name = layer mean vertical velocity @@ -439,7 +439,7 @@ dimensions = (horizontal_loop_extent,vertical_dimension_of_soil_internal_to_land_surface_scheme) type = real kind = kind_phys - intent = inout + intent = in optional = True [tslb] standard_name = soil_temperature_for_land_surface_model @@ -896,7 +896,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout optional = True [hwp_ave] standard_name = hourly_wildfire_potential_average @@ -939,7 +939,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - intent = out + intent = inout optional = True [lu_nofire_out] standard_name = sum_of_land_use_fractions_for_no_fire_pixels From 385e0fc9d8b5e28f53d1d6b1379f7a4390b5f627 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 26 Nov 2025 18:35:49 +0000 Subject: [PATCH 3/5] One more small change --- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 index 72d9ce4888..96d05d7588 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 @@ -1193,7 +1193,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cmm_land ', Interstitial%cmm_land ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cmm_water ', Interstitial%cmm_water ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cnvc ', Interstitial%cnvc ) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cnvw ', Interstitial%cnvw ) + call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cnvw ', Cldprop%cnvw ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ctei_r ', Interstitial%ctei_r ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ctei_rml ', Interstitial%ctei_rml ) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cumabs ', Interstitial%cumabs ) From ca813d542e9635aa8b3484cda3c167b7647454ea Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 26 Nov 2025 21:01:30 +0000 Subject: [PATCH 4/5] Resolve some merge conflicts --- physics/Radiation/RRTMG/rrtmg_lw_post.meta | 2 +- physics/Radiation/RRTMG/rrtmg_sw_post.meta | 2 +- physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/physics/Radiation/RRTMG/rrtmg_lw_post.meta b/physics/Radiation/RRTMG/rrtmg_lw_post.meta index 56d9069d25..cc169389c3 100644 --- a/physics/Radiation/RRTMG/rrtmg_lw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_lw_post.meta @@ -57,7 +57,7 @@ type = logical intent = in [lwhtr] - standard_name = flag_for_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_longwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output lw heating rate (Radtend%lwhc) units = flag dimensions = () diff --git a/physics/Radiation/RRTMG/rrtmg_sw_post.meta b/physics/Radiation/RRTMG/rrtmg_sw_post.meta index c777c1f31e..0a48b04d7f 100644 --- a/physics/Radiation/RRTMG/rrtmg_sw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_sw_post.meta @@ -64,7 +64,7 @@ type = logical intent = in [swhtr] - standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output sw heating rate (Radtend%swhc) units = flag dimensions = () diff --git a/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 b/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 index 7f86c6ca3a..73d461bef9 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 +++ b/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 @@ -40,7 +40,7 @@ subroutine rrtmgp_lw_main_init(rrtmgp_root_dir, rrtmgp_lw_file_gas, rrtmgp_lw_fi !< clouds optical properties rrtmgp_lw_file_gas !< RRTMGP file containing coefficients used to compute !< gaseous optical properties - character(len=*), dimension(:), intent(in), optional :: & + character(len=*), dimension(:), intent(in) :: & active_gases_array !< List of active gases from namelist as array) integer, intent(inout) :: & nrghice !< Number of ice-roughness categories From c63f534a6ecb1835012b387174c1467ff217229e Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 26 Nov 2025 21:33:41 +0000 Subject: [PATCH 5/5] A few more merge conflicts resolved --- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta | 2 +- physics/Radiation/RRTMGP/rrtmgp_lw_main.meta | 2 +- physics/Radiation/RRTMGP/rrtmgp_sw_main.meta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta index d8ee35c54b..37badf70f8 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta @@ -283,7 +283,7 @@ standard_name = tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep long_name = longwave clear sky heating rate units = K s-1 - dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) + dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout diff --git a/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta index 0b0be8304b..8c20632ee5 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta @@ -116,7 +116,7 @@ type = logical intent = in [doLWclrsky] - standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output lw heating rate (Radtend%lwhc) units = flag dimensions = () diff --git a/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta index dc66df2160..a69168bd02 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta @@ -115,7 +115,7 @@ type = logical intent = in [doSWclrsky] - standard_name = flag_for_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky + standard_name = flag_for_output_of_tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep_assuming_clear_sky long_name = flag to output sw heating rate (Radtend%swhc) units = flag dimensions = ()