From ccf33a00705106bd1fe3abca50e3eb4ca943e5ef Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jan 2018 11:35:37 -0700 Subject: [PATCH 1/4] Bug fix for calling GFS_MP_generic_post_run: Diag%dq3dt(:,:,6) changed to Diag%dq3dt(:,:,4) --- GFS_layer/GFS_physics_driver.F90 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/GFS_layer/GFS_physics_driver.F90 b/GFS_layer/GFS_physics_driver.F90 index b85c2544d..319c96551 100644 --- a/GFS_layer/GFS_physics_driver.F90 +++ b/GFS_layer/GFS_physics_driver.F90 @@ -2622,17 +2622,13 @@ subroutine GFS_physics_driver & Diag%rain, domr, domzr, domip, doms, Sfcprop%srflag, & ! output Sfcprop%tprcp) - ! DH* inside GFS_MP_generic_post_run Diag%dq3dt(:,:,6) is called dq3dt4 - ! also, the original GFS_physics_driver had interstitial code around line 2599 - ! Diag%dq3dt(:,:,4) = Diag%dq3dt(:,:,4) + (Stateout%gq0(:,:,1)-dqdt(:,:,1)) * frain - ! --> I think Diag%dq3dt(:,:,6) should be Diag%dq3dt(:,:,4) here *DH call GFS_MP_generic_post_run (size(Grid%xlon,1), size(Grid%xlon,1), Model%levs, Model%dtf, del, & Model%lssav, Model%ldiag3d, Diag%rain,frain, & Model%ntcw, Model%ncld, & Stateout%gq0(:,:,Model%ntcw), & Stateout%gt0, Stateout%gq0(:,:,1), & save_t, save_qv, Diag%totprcp, Diag%dt3dt(:,:,6),& - Diag%dq3dt(:,:,6), Diag%pwat) + Diag%dq3dt(:,:,4), Diag%pwat) ! if (Model%cal_pre) then ! hchuang: add dominant precipitation type algorithm ! i = min(3,Model%num_p3d) From 46aef0e170199460db2081aa0b58384e0d048410 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jan 2018 11:36:51 -0700 Subject: [PATCH 2/4] Changed longname from flag_to_print to flag_print in sw/lw radiation schemes, changed units from logical to flag --- physics/radlw_main.f | 4 ++-- physics/radsw_main.f | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/physics/radlw_main.f b/physics/radlw_main.f index 2c6de17ab..bad306bdd 100644 --- a/physics/radlw_main.f +++ b/physics/radlw_main.f @@ -477,9 +477,9 @@ end subroutine lwrad_init !! | npts | horizontal_loop_extent | horizontal dimension | index | 0 | integer | | in | F | !! | nlay | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | in | F | !! | nlp1 | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | in | F | -!! | lprnt | flag_to_print | logical flag to print | logical | 0 | logical | | in | F | +!! | lprnt | flag_print | flag to print | flag | 0 | logical | | in | F | !! | cld_cf | total_cloud_fraction | total cloud fraction | frac | 2 | real | kind_phys | in | F | -!! | lslwr | flag_to_calc_lw | logical flag to calculate LW irradiances | logical | 0 | logical | | in | F | +!! | lslwr | flag_to_calc_lw | flag to calculate LW irradiances | flag | 0 | logical | | in | F | !! | hlwc | tendency_of_air_temperature_due_to_longwave_heating_on_radiation_time_step | longwave total sky heating rate | K s-1 | 2 | real | kind_phys | out | F | !! | topflx | lw_fluxes_top_atmosphere | longwave total sky fluxes at the top of the atm | W m-2 | 1 | topflw_type | kind_phys | out | F | !! | sfcflx | lw_fluxes_sfc | longwave total sky fluxes at the Earth surface | W m-2 | 1 | sfcflw_type | kind_phys | out | F | diff --git a/physics/radsw_main.f b/physics/radsw_main.f index 2e9d20b74..4bdf85897 100644 --- a/physics/radsw_main.f +++ b/physics/radsw_main.f @@ -612,9 +612,9 @@ end subroutine swrad_init !! | npts | horizontal_loop_extent | horizontal dimension | index | 0 | integer | | in | F | !! | nlay | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | in | F | !! | nlp1 | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | in | F | -!! | lprnt | flag_to_print | logical flag to print | logical | 0 | logical | | in | F | +!! | lprnt | flag_print | flag to print | flag | 0 | logical | | in | F | !! | cld_cf | total_cloud_fraction | total cloud fraction | frac | 2 | real | kind_phys | in | F | -!! | lsswr | flag_to_calc_sw | logical flag to calculate SW irradiances | logical | 0 | logical | | in | F | +!! | lsswr | flag_to_calc_sw | flag to calculate SW irradiances | flag | 0 | logical | | in | F | !! | hswc | tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep | shortwave total sky heating rate | K s-1 | 2 | real | kind_phys | out | F | !! | topflx | sw_fluxes_top_atmosphere | shortwave total sky fluxes at the top of the atm | W m-2 | 1 | topfsw_type | kind_phys | out | F | !! | sfcflx | sw_fluxes_sfc | shortwave total sky fluxes at the Earth surface | W m-2 | 1 | sfcfsw_type | kind_phys | out | F | From fd72090116c0e98f0640df4834dd256b306d84a4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jan 2018 14:47:30 -0700 Subject: [PATCH 3/4] Adjust description (long name) of horizontal_loop_extent metadata entry, changed unit for horizontal_loop_extent and horizontal_dimension from index to count; fixed time units from hr to h --- physics/GFS_MP_generic_post.f90 | 4 ++-- physics/GFS_MP_generic_pre.f90 | 4 ++-- physics/GFS_PBL_generic.f90 | 2 +- physics/GFS_RRTMG_post.f90 | 2 +- physics/GFS_RRTMG_pre.f90 | 2 +- physics/GFS_calpreciptype.f90 | 4 ++-- physics/GFS_radlw_pre.f90 | 2 +- physics/GFS_radsw_pre.f90 | 2 +- physics/GFS_surface_loop_control.f | 4 ++-- physics/GFS_zhao_carr_pre.f90 | 4 ++-- physics/cnvc90.f | 4 ++-- physics/dcyc2.f | 6 +++--- physics/get_prs_fv3.f90 | 4 ++-- physics/gscond.f | 4 ++-- physics/gscondp.f | 0 physics/gwdc.f | 12 ++++++------ physics/gwdps.f | 10 +++++----- physics/h2ointerp.f90 | 0 physics/h2ophys.f | 0 physics/mfdeepcnv.f | 4 ++-- physics/mfpbl.f | 0 physics/mfshalcnv.f | 4 ++-- physics/moninedmf.f | 4 ++-- physics/ozphys.f | 6 +++--- physics/ozphys_2015.f | 0 physics/physparam.f | 0 physics/precpd.f | 4 ++-- physics/precpdp.f | 0 physics/radlw_main.f | 2 +- physics/radsw_main.f | 2 +- physics/rayleigh_damp.f | 6 +++--- physics/rayleigh_damp_mesopause.f | 0 physics/sfc_diag.f | 2 +- physics/sfc_diff.f | 2 +- physics/sfc_drv.f | 6 +++--- physics/sfc_nst.f | 6 +++--- physics/sfc_sice.f | 6 +++--- 37 files changed, 62 insertions(+), 62 deletions(-) mode change 100755 => 100644 physics/gscondp.f mode change 100755 => 100644 physics/h2ointerp.f90 mode change 100755 => 100644 physics/h2ophys.f mode change 100755 => 100644 physics/mfdeepcnv.f mode change 100755 => 100644 physics/mfpbl.f mode change 100755 => 100644 physics/mfshalcnv.f mode change 100755 => 100644 physics/moninedmf.f mode change 100755 => 100644 physics/ozphys_2015.f mode change 100755 => 100644 physics/physparam.f mode change 100755 => 100644 physics/precpdp.f mode change 100755 => 100644 physics/rayleigh_damp.f mode change 100755 => 100644 physics/rayleigh_damp_mesopause.f diff --git a/physics/GFS_MP_generic_post.f90 b/physics/GFS_MP_generic_post.f90 index e5400658a..4c3b4e9b4 100644 --- a/physics/GFS_MP_generic_post.f90 +++ b/physics/GFS_MP_generic_post.f90 @@ -20,8 +20,8 @@ end subroutine GFS_MP_generic_post_init !! \section arg_table_GFS_MP_generic_post_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------|----------------------------------------------------------------|-------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | dtf | time_step_for_dynamics | dynamics time step | s | 0 | real | kind_phys | in | F | !! | del | air_pressure_difference_between_midlayers | air pressure difference between midlayers | Pa | 2 | real | kind_phys | in | F | diff --git a/physics/GFS_MP_generic_pre.f90 b/physics/GFS_MP_generic_pre.f90 index 3425f4208..bba39fd67 100644 --- a/physics/GFS_MP_generic_pre.f90 +++ b/physics/GFS_MP_generic_pre.f90 @@ -16,8 +16,8 @@ end subroutine GFS_MP_generic_pre_init !> \section arg_table_GFS_MP_generic_pre_run Argument Table !! | local var name | longname |description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------|--------------------------------------------------------------------------|-------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | in | F | !! | clw2 | cloud_liquid_water_specific_humidity | cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F | diff --git a/physics/GFS_PBL_generic.f90 b/physics/GFS_PBL_generic.f90 index 1abe293a1..c62f90c45 100644 --- a/physics/GFS_PBL_generic.f90 +++ b/physics/GFS_PBL_generic.f90 @@ -14,7 +14,7 @@ end subroutine GFS_PBL_generic_pre_finalize !> \section arg_table_GFS_PBL_generic_pre_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|--------------------------------------------------------|----------------------------------------------------|---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | kinver | index_of_highest_temperature_inversion | index of highest temperature inversion | index | 1 | integer | | in | F | !! diff --git a/physics/GFS_RRTMG_post.f90 b/physics/GFS_RRTMG_post.f90 index c2987a879..6be520d72 100644 --- a/physics/GFS_RRTMG_post.f90 +++ b/physics/GFS_RRTMG_post.f90 @@ -20,7 +20,7 @@ end subroutine GFS_RRTMG_post_init !! | Statein | FV3-GFS_Statein_type | Fortran DDT containing FV3-GFS prognostic state data in from dycore | DDT | 0 | GFS_statein_type | | in | F | !! | Coupling | FV3-GFS_Coupling_type | Fortran DDT containing FV3-GFS fields to/from coupling with other components | DDT | 0 | GFS_coupling_type | | inout | F | !! | scmpsw | components_of_surface_downward_shortwave_fluxes | derived type for special components of surface downward shortwave fluxes | W m-2 | 1 | cmpfsw_type | | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | in | F | !! | ltp | extra_top_layer | extra top layers | none | 0 | integer | | in | F | !! | kt | vertical_index_difference_between_layer_and_upper_bound | vertical index difference between layer and upper bound | index | 0 | integer | | in | F | diff --git a/physics/GFS_RRTMG_pre.f90 b/physics/GFS_RRTMG_pre.f90 index 28d98a97a..9952e3a5b 100644 --- a/physics/GFS_RRTMG_pre.f90 +++ b/physics/GFS_RRTMG_pre.f90 @@ -24,7 +24,7 @@ end subroutine GFS_RRTMG_pre_init !! | Cldprop | FV3-GFS_Cldprop_type | Fortran DDT containing FV3-GFS cloud fields needed by radiation from physics | DDT | 0 | GFS_cldprop_type | | in | F | !! | Radtend | FV3-GFS_Radtend_type | Fortran DDT containing FV3-GFS radiation tendencies | DDT | 0 | GFS_radtend_type | | in | F | !! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | out | F | -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | out | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | out | F | !! | lmk | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | out | F | !! | lmp | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | out | F | !! | kd | vertical_index_difference_between_in-out_and_local | vertical index difference between in/out and local | index | 0 | integer | | out | F | diff --git a/physics/GFS_calpreciptype.f90 b/physics/GFS_calpreciptype.f90 index 87cfbe172..0310eff3d 100644 --- a/physics/GFS_calpreciptype.f90 +++ b/physics/GFS_calpreciptype.f90 @@ -15,8 +15,8 @@ end subroutine GFS_calpreciptype_init !! |----------------|---------------------------------------------------|-------------------------------------------------------|---------|------|---------|-----------|--------|----------| !! | kdt | index_of_time_step | current time step index | index | 0 | integer | | in | F | !! | nrcm | array_dimension_of_random_number | second dimension of random number array | count | 0 | integer | | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | lm | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | lp1 | vertical_interface_dimension | vertical interface dimension | index | 0 | integer | | in | F | !! | randomno | random_number_array | random number array | none | 2 | real | | in | F | diff --git a/physics/GFS_radlw_pre.f90 b/physics/GFS_radlw_pre.f90 index ca440c1e3..9d240dff4 100644 --- a/physics/GFS_radlw_pre.f90 +++ b/physics/GFS_radlw_pre.f90 @@ -18,7 +18,7 @@ end subroutine GFS_radlw_pre_init !! | Grid | FV3-GFS_Grid_type | Fortran DDT containing FV3-GFS grid and interpolation related data | DDT | 0 | GFS_grid_type | | in | F | !! | Sfcprop | FV3-GFS_Sfcprop_type | Fortran DDT containing FV3-GFS surface fields | DDT | 0 | GFS_sfcprop_type | | in | F | !! | Radtend | FV3-GFS_Radtend_type | Fortran DDT containing FV3-GFS radiation tendencies | DDT | 0 | GFS_radtend_type | | inout | F | -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | tsfg | surface_ground_temperature_for_radiation | surface ground temperature for radiation | K | 1 | real | kind_phys | in | F | !! | tsfa | surface_air_temperature_for_radiation | lowest model layer air temperature for radiation | K | 1 | real | kind_phys | in | F | !! diff --git a/physics/GFS_radsw_pre.f90 b/physics/GFS_radsw_pre.f90 index c0f3b1bda..bbb583fcf 100644 --- a/physics/GFS_radsw_pre.f90 +++ b/physics/GFS_radsw_pre.f90 @@ -18,7 +18,7 @@ end subroutine GFS_radsw_pre_init !! | Grid | FV3-GFS_Grid_type | Fortran DDT containing FV3-GFS grid and interpolation related data | DDT | 0 | GFS_grid_type | | in | F | !! | Sfcprop | FV3-GFS_Sfcprop_type | Fortran DDT containing FV3-GFS surface fields | DDT | 0 | GFS_sfcprop_type | | in | F | !! | Radtend | FV3-GFS_Radtend_type | Fortran DDT containing FV3-GFS radiation tendencies | DDT | 0 | GFS_radtend_type | | inout | F | -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | tsfg | surface_ground_temperature_for_radiation | surface ground temperature for radiation | K | 1 | real | kind_phys | in | F | !! | tsfa | surface_air_temperature_for_radiation | lowest model layer air temperature for radiation | K | 1 | real | kind_phys | in | F | !! | sfcalb1 | surface_albedo_due_to_near_IR_direct | surface albedo due to near IR direct beam | frac | 1 | real | kind_phys | out | F | diff --git a/physics/GFS_surface_loop_control.f b/physics/GFS_surface_loop_control.f index f267799f9..1f17ea32a 100644 --- a/physics/GFS_surface_loop_control.f +++ b/physics/GFS_surface_loop_control.f @@ -21,7 +21,7 @@ end subroutine GFS_surface_loop_control_part1_finalize !! \section arg_table_GFS_surface_loop_control_part1_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|--------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| iter | iteration_number | number of iteration | index | 0 | real | kind_phys | in | F | !!| wind | wind_speed_at_lowest_model_layer | wind speed at lowest model level | m s-1 | 1 | real | kind_phys | in | F | !!| flag_guess | flag_for_guess_run | flag for guess run | flag | 1 | logical | | inout | F | @@ -74,7 +74,7 @@ end subroutine GFS_surface_loop_control_part2_finalize !! \section arg_table_GFS_surface_loop_control_part2_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|--------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| iter | iteration_number | number of iteration | index | 0 | real | kind_phys | in | F | !!| wind | wind_speed_at_lowest_model_layer | wind speed at lowest model level | m s-1 | 1 | real | kind_phys | in | F | !!| flag_guess | flag_for_guess_run | flag for guess run | flag | 1 | logical | | inout | F | diff --git a/physics/GFS_zhao_carr_pre.f90 b/physics/GFS_zhao_carr_pre.f90 index 0e39f4bb2..a40489d5a 100644 --- a/physics/GFS_zhao_carr_pre.f90 +++ b/physics/GFS_zhao_carr_pre.f90 @@ -16,8 +16,8 @@ end subroutine GFS_zhao_carr_pre_init !> \section arg_table_GFS_zhao_carr_pre_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------|----------------------------------------------------------|-------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F | !! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | out | F | diff --git a/physics/cnvc90.f b/physics/cnvc90.f index fcb72c84c..fe580b8dc 100644 --- a/physics/cnvc90.f +++ b/physics/cnvc90.f @@ -13,8 +13,8 @@ end subroutine cnvc90_init !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|---------------------------------------------------------|---------------------------------------------------------|-------|------|---------|-----------|--------|----------| !! | clstp | convective_cloud_switch | switch for saving convective clouds | none | 0 | real | kind_phys | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | !! | rn | timestep_convective_rainfall_amount | convective rainfall amount | m | 1 | real | kind_phys | in | F | !! | kbot | vertical_index_at_cloud_base | vertical index at cloud base | index | 1 | integer | default | in | F | !! | ktop | vertical_index_at_cloud_top | vertical index at cloud top | index | 1 | integer | default | in | F | diff --git a/physics/dcyc2.f b/physics/dcyc2.f index 7845eafbe..24a784fd0 100644 --- a/physics/dcyc2.f +++ b/physics/dcyc2.f @@ -182,8 +182,8 @@ end subroutine dcyc2t3_init !! | sfcnirdfd | surface_downwelling_diffuse_near_infrared_shortwave_flux_on_radiation_time_step | total sky surface downwelling diffuse near-infrared shortwave flux on radiation time step | W m-2 | 1 | real | kind_phys | in | F | !! | sfcvisbmd | surface_downwelling_direct_ultraviolet_and_visible_shortwave_flux_on_radiation_time_step | total sky surface downwelling beam ultraviolet plus visible shortwave flux on radiation time step | W m-2 | 1 | real | kind_phys | in | F | !! | sfcvisdfd | surface_downwelling_diffuse_ultraviolet_and_visible_shortwave_flux_on_radiation_time_step | total sky surface downwelling diffuse ultraviolet plus visible shortwave flux on radiation time step | W m-2 | 1 | real | kind_phys | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | !! | levs | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | dtdt | tendency_of_air_temperature_due_to_model_physics | total radiative heating rate at current time | K s-1 | 2 | real | kind_phys | inout | F | !! | dtdtc | tendency_of_air_temperature_due_to_radiative_heating_assuming_clear_sky | clear sky radiative (shortwave + longwave) heating rate at current time | K s-1 | 2 | real | kind_phys | inout | F | @@ -351,7 +351,7 @@ end subroutine dcyc2t3_post_init !! \section arg_table_dcyc2t3_post_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|----------------------------------------|--------------------------------------------------------|---------|------|----------------------------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | !! | adjsfcdlw | surface_downwelling_longwave_flux | surface downwelling longwave flux at current time | W m-2 | 1 | real | kind_phys | in | F | !! | adjsfculw | surface_upwelling_longwave_flux | surface upwelling longwave flux at current time | W m-2 | 1 | real | kind_phys | in | F | !! | adjsfcdsw | surface_downwelling_shortwave_flux | surface downwelling shortwave flux at current time | W m-2 | 1 | real | kind_phys | in | F | diff --git a/physics/get_prs_fv3.f90 b/physics/get_prs_fv3.f90 index 68248d60e..31861b1a5 100644 --- a/physics/get_prs_fv3.f90 +++ b/physics/get_prs_fv3.f90 @@ -22,7 +22,7 @@ end subroutine get_prs_fv3_init !! \section arg_table_get_prs_fv3_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|------------|------|---------|-----------|--------|----------| -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | !! | levs | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | phii | geopotential_at_interface | interface geopotential | m2 s-2 | 2 | real | kind_phys | in | F | !! | prsi | air_pressure_at_interface | interface pressure | Pa | 2 | real | kind_phys | in | F | @@ -86,7 +86,7 @@ end subroutine get_phi_fv3_init !! \section arg_table_get_phi_fv3_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|------------|------|---------|-----------|--------|----------| -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | !! | levs | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | gt0 | air_temperature_updated_by_physics | updated air temperature | K | 2 | real | kind_phys | in | F | !! | gq01 | water_vapor_specific_humidity_updated_by_physics | mid-layer specific humidity of water vapor | kg kg-1 | 2 | real | kind_phys | in | F | diff --git a/physics/gscond.f b/physics/gscond.f index 1b61291d8..c663c27c6 100644 --- a/physics/gscond.f +++ b/physics/gscond.f @@ -66,8 +66,8 @@ end subroutine gscond_init !! \section arg_table_gscond_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------|----------------------------------------------------------|---------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | km | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | dt | time_step_for_physics | physics time step | s | 0 | real | kind_phys | in | F | !! | dtf | time_step_for_dynamics | dynamics time step | s | 0 | real | kind_phys | in | F | diff --git a/physics/gscondp.f b/physics/gscondp.f old mode 100755 new mode 100644 diff --git a/physics/gwdc.f b/physics/gwdc.f index de5d56c4a..3ae81615c 100644 --- a/physics/gwdc.f +++ b/physics/gwdc.f @@ -84,7 +84,7 @@ end subroutine gwdc_pre_init !! \section arg_table_gwdc_pre_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|--------------------------------------------------------------------------|---------------------------------------------------------------|-------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | !! | cgwf | multiplication_factors_for_convective_gravity_wave_drag | multiplication factors for convective gravity wave drag | none | 1 | real | kind_phys | in | F | !! | dx | cell_size | grid size in zonal direction | m | 1 | real | kind_phys | in | F | !! | work1 | grid_size_related_coefficient_used_in_scale-sensitive_schemes | grid size related coefficient used in scale-sensitive schemes | none | 1 | real | kind_phys | in | F | @@ -240,9 +240,9 @@ end subroutine gwdc_init !! \section arg_table_gwdc_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|--------------------------------------------------------|--------------------------------------------------------------------|------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | -!! | iy | horizontal_loop_extent | horizontal dimension | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | +!! | iy | horizontal_loop_extent | horizontal dimension | count | 0 | integer | default | in | F | !! | km | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | lat | latitude_index_in_debug_printouts | latitude index in debug printouts | index | 0 | integer | default | in | F | !! | u1 | x_wind | zonal wind | m s-1 | 2 | real | kind_phys | in | F | @@ -266,7 +266,7 @@ end subroutine gwdc_init !! | dlength | characteristic_grid_length_scale | representative horizontal length scale of grid box | m | 1 | real | kind_phys | in | F | !! | lprnt | flag_print | flag for debugging printouts | flag | 0 | logical | default | in | F | !! | ipr | horizontal_index_of_printed_column | horizontal index of column used in debugging printouts | index | 0 | integer | default | in | F | -!! | fhour | forecast_time | forecast hour | hr | 0 | real | kind_phys | in | F | +!! | fhour | forecast_time | forecast hour | h | 0 | real | kind_phys | in | F | !! | utgwc | tendency_of_x_wind_due_to_convective_gravity_wave_drag | zonal wind tendency due to convective gravity wave drag | m s-2 | 2 | real | kind_phys | out | F | !! | vtgwc | tendency_of_y_wind_due_to_convective_gravity_wave_drag | meridional wind tendency due to convective gravity wave drag | m s-2 | 2 | real | kind_phys | out | F | !! | tauctx | instantaneous_x_stress_due_to_gravity_wave_drag | zonal stress at cloud top due to convective gravity wave drag | Pa | 1 | real | kind_phys | out | F | @@ -1587,7 +1587,7 @@ end subroutine gwdc_post_init !! \section arg_table_gwdc_post_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------------|--------------------------------------------------------------------------|------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | !! | levs | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | lssav | flag_diagnostics | flag for calculating diagnostic fields | flag | 0 | logical | default | in | F | !! | ldiag3d | flag_diagnostics_3D | flag for calculating 3-D diagnostic fields | flag | 0 | logical | default | in | F | diff --git a/physics/gwdps.f b/physics/gwdps.f index c2e988e21..1a94a4d53 100644 --- a/physics/gwdps.f +++ b/physics/gwdps.f @@ -117,8 +117,8 @@ end subroutine gwdps_pre_init !! \section arg_table_gwdps_pre_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-------------------------------------------------------------------------|------------------------------------------------------------------------------------------|---------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal dimension | index | 0 | integer | default | in | F | -!! | iy | horizontal_loop_extent | horizontal dimension | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal dimension | count | 0 | integer | default | in | F | +!! | iy | horizontal_loop_extent | horizontal dimension | count | 0 | integer | default | in | F | !! | nmtvr | number_of_statistical_measures_of_subgrid_orography | number of statistical measures of subgrid orography | count | 0 | integer | default | in | F | !! | mntvar | statistical_measures_of_subgrid_orography | array of statistical measures of subgrid orography | various | 2 | real | kind_phys | in | F | !! | hprime | standard_deviation_of_subgrid_orography | standard deviation of subgrid orography | m | 1 | real | kind_phys | out | F | @@ -238,9 +238,9 @@ end subroutine gwdps_init !! \section arg_table_gwdps_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | -!! | iy | horizontal_loop_extent | horizontal dimension | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | +!! | iy | horizontal_loop_extent | horizontal dimension | count | 0 | integer | default | in | F | !! | km | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | A | tendency_of_y_wind_due_to_model_physics | meridional wind tendency due to model physics | m s-2 | 2 | real | kind_phys | inout | F | !! | B | tendency_of_x_wind_due_to_model_physics | zonal wind tendency due to model physics | m s-2 | 2 | real | kind_phys | inout | F | diff --git a/physics/h2ointerp.f90 b/physics/h2ointerp.f90 old mode 100755 new mode 100644 diff --git a/physics/h2ophys.f b/physics/h2ophys.f old mode 100755 new mode 100644 diff --git a/physics/mfdeepcnv.f b/physics/mfdeepcnv.f old mode 100755 new mode 100644 index e106ebeba..289e285a0 --- a/physics/mfdeepcnv.f +++ b/physics/mfdeepcnv.f @@ -35,8 +35,8 @@ end subroutine sasasdeep_finalize !! \section arg_table_sasasdeep_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------|-------------------------------------------------|---------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | km | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | delt | time_step_for_physics | physics time step | s | 0 | real | kind_phys | in | F | !! | delp | air_pressure_difference_between_midlayers | pres(k) - pres(k+1) | Pa | 2 | real | kind_phys | in | F | diff --git a/physics/mfpbl.f b/physics/mfpbl.f old mode 100755 new mode 100644 diff --git a/physics/mfshalcnv.f b/physics/mfshalcnv.f old mode 100755 new mode 100644 index 700c91b64..a1387bd32 --- a/physics/mfshalcnv.f +++ b/physics/mfshalcnv.f @@ -22,8 +22,8 @@ end subroutine sasasshal_init !! \section arg_table_sasasshal_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------|-------------------------------------------------|---------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | km | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | delt | time_step_for_physics | physics time step | s | 0 | real | kind_phys | in | F | !! | delp | air_pressure_difference_between_midlayers | pres(k) - pres(k+1) | Pa | 2 | real | kind_phys | in | F | diff --git a/physics/moninedmf.f b/physics/moninedmf.f old mode 100755 new mode 100644 index b0d15d359..e47b8254d --- a/physics/moninedmf.f +++ b/physics/moninedmf.f @@ -30,8 +30,8 @@ end subroutine edmf_finalize !! \section arg_table_edmf_run !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------------------------|-------------------------------------------------------|---------------|------|---------|-----------|--------|----------| -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | km | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | ntrac | number_of_vertical_diffusion_tracers | number of tracers to diffuse vertically | count | 0 | integer | | in | F | !! | ntcw | index_for_liquid_cloud_condensate | cloud condensate index in tracer array | index | 0 | integer | | in | F | diff --git a/physics/ozphys.f b/physics/ozphys.f index 359afa4d8..3308b1283 100644 --- a/physics/ozphys.f +++ b/physics/ozphys.f @@ -61,8 +61,8 @@ end subroutine ozphys_init !! \section arg_table_ozphys_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|---------------------------------------------------|---------------------------------------------------|---------|------|---------|-----------|--------|----------| -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | !! | levs | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | ko3 | vertical_dimension_of_ozone_forcing_data | number of vertical layers in ozone forcing data | index | 0 | integer | default | in | F | !! | dt | time_step_for_physics | physics time step | s | 0 | real | kind_phys | in | F | @@ -245,7 +245,7 @@ end subroutine ozphys_post_init !! \section arg_table_ozphys_post_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|----------------------------------------------|----------------------------------------------|---------|------|----------------------------|-----------|--------|----------| -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | !! | levs | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | pl_coeff | number_of_coefficients_in_ozone_forcing_data | number of coefficients in ozone forcing data | index | 0 | integer | default | in | F | !! | ozp | change_in_ozone_concentration | change in ozone concentration | kg kg-1 | 3 | real | kind_phys | in | F | diff --git a/physics/ozphys_2015.f b/physics/ozphys_2015.f old mode 100755 new mode 100644 diff --git a/physics/physparam.f b/physics/physparam.f old mode 100755 new mode 100644 diff --git a/physics/precpd.f b/physics/precpd.f index db142211d..439de58b2 100644 --- a/physics/precpd.f +++ b/physics/precpd.f @@ -25,8 +25,8 @@ end subroutine precpd_init !! \section arg_table_precpd_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|---------------------------------------------------------------|-------------------------------------------------------------------|---------|------|---------|----------|---------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F | !! | km | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | dt | time_step_for_physics | physics time step | s | 0 | real | kind_phys| in | F | !! | del | air_pressure_difference_between_midlayers | pressure level thickness | Pa | 2 | real | kind_phys| in | F | diff --git a/physics/precpdp.f b/physics/precpdp.f old mode 100755 new mode 100644 diff --git a/physics/radlw_main.f b/physics/radlw_main.f index bad306bdd..848c527a0 100644 --- a/physics/radlw_main.f +++ b/physics/radlw_main.f @@ -474,7 +474,7 @@ end subroutine lwrad_init !! | aerssa | aerosol_single_scattering_albedo_for_longwave_bands_01-16 | aerosol single scattering albedo for longwave bands 01-16 | frac | 3 | real | kind_phys | in | F | !! | sfemis | surface_longwave_emissivity | surface emissivity | frac | 1 | real | kind_phys | in | F | !! | sfgtmp | surface_ground_temperature_for_radiation | surface ground temperature for radiation | K | 1 | real | kind_phys | in | F | -!! | npts | horizontal_loop_extent | horizontal dimension | index | 0 | integer | | in | F | +!! | npts | horizontal_loop_extent | horizontal dimension | count | 0 | integer | | in | F | !! | nlay | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | in | F | !! | nlp1 | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | in | F | !! | lprnt | flag_print | flag to print | flag | 0 | logical | | in | F | diff --git a/physics/radsw_main.f b/physics/radsw_main.f index 4bdf85897..9ff47a5b2 100644 --- a/physics/radsw_main.f +++ b/physics/radsw_main.f @@ -609,7 +609,7 @@ end subroutine swrad_init !! | solcon | solar_constant | solar constant | W m-2 | 0 | real | kind_phys | in | F | !! | nday | daytime_points_dimension | daytime points dimension | count | 0 | integer | | in | F | !! | idxday | daytime_points | daytime points | index | 1 | integer | | in | F | -!! | npts | horizontal_loop_extent | horizontal dimension | index | 0 | integer | | in | F | +!! | npts | horizontal_loop_extent | horizontal dimension | count | 0 | integer | | in | F | !! | nlay | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | in | F | !! | nlp1 | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | in | F | !! | lprnt | flag_print | flag to print | flag | 0 | logical | | in | F | diff --git a/physics/rayleigh_damp.f b/physics/rayleigh_damp.f old mode 100755 new mode 100644 index f351c485e..20954e9a4 --- a/physics/rayleigh_damp.f +++ b/physics/rayleigh_damp.f @@ -11,9 +11,9 @@ end subroutine rayleigh_damp_init !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------|------------------------------------------------------|------------|------|---------|-----------|--------|----------| !! | lsidea | flag_idealized_physics | flag for idealized physics | flag | 0 | logical | default | in | F | -!! | im | horizontal_loop_extent | horizontal loop extent | index | 0 | integer | default | in | F | -!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | default | in | F | -!! | iy | horizontal_loop_extent | horizontal dimension | index | 0 | integer | default | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | default | in | F | +!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | default | in | F | +!! | iy | horizontal_loop_extent | horizontal dimension | count | 0 | integer | default | in | F | !! | km | vertical_dimension | number of vertical layers | index | 0 | integer | default | in | F | !! | A | tendency_of_y_wind_due_to_model_physics | meridional wind tendency due to model physics | m s-2 | 2 | real | kind_phys | inout | F | !! | B | tendency_of_x_wind_due_to_model_physics | zonal wind tendency due to model physics | m s-2 | 2 | real | kind_phys | inout | F | diff --git a/physics/rayleigh_damp_mesopause.f b/physics/rayleigh_damp_mesopause.f old mode 100755 new mode 100644 diff --git a/physics/sfc_diag.f b/physics/sfc_diag.f index 7e9395ac1..76517de2f 100644 --- a/physics/sfc_diag.f +++ b/physics/sfc_diag.f @@ -21,7 +21,7 @@ end subroutine sfc_diag_finalize !! \section arg_table_sfc_diag_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|-------------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| ps | surface_air_pressure | surface pressure | Pa | 1 | real | kind_phys | in | F | !!| u1 | x_wind_at_lowest_model_layer | x component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F | !!| v1 | y_wind_at_lowest_model_layer | y component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F | diff --git a/physics/sfc_diff.f b/physics/sfc_diff.f index 31e1c7fe8..075bf3dac 100644 --- a/physics/sfc_diff.f +++ b/physics/sfc_diff.f @@ -22,7 +22,7 @@ end subroutine sfc_ex_coef_finalize !! \section arg_table_sfc_ex_coef_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|-------------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| ps | surface_air_pressure | surface pressure | Pa | 1 | real | kind_phys | in | F | !!| u1 | x_wind_at_lowest_model_layer | x component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F | !!| v1 | y_wind_at_lowest_model_layer | y component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F | diff --git a/physics/sfc_drv.f b/physics/sfc_drv.f index 075e7491f..22f796e2f 100644 --- a/physics/sfc_drv.f +++ b/physics/sfc_drv.f @@ -21,7 +21,7 @@ end subroutine lsm_noah_pre_finalize !! \section arg_table_lsm_noah_pre_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|--------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| km | soil_vertical_dimension | soil vertical layer dimension | index | 0 | integer | | in | F | !!| drain | subsurface_runoff_flux | subsurface runoff flux | g m-2 s-1 | 1 | real | kind_phys | inout | F | !!| runof | surface_runoff_flux | surface runoff flux | g m-2 s-1 | 1 | real | kind_phys | inout | F | @@ -88,7 +88,7 @@ end subroutine lsm_noah_post_finalize !! \section arg_table_lsm_noah_post_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|--------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| km | soil_vertical_dimension | soil vertical layer dimension | index | 0 | integer | | in | F | !!| flag_lssav | flag_diagnostics | flag for calculating diagnostic fields | flag | 0 | logical | | in | F | !!| dtf | time_step_for_dynamics | dynamics time step | s | 0 | real | kind_phys | in | F | @@ -256,7 +256,7 @@ end subroutine lsm_noah_finalize !! \section arg_table_lsm_noah_run Arguments !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|------------|------|---------|-----------|--------|----------| -!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !!| km | soil_vertical_dimension | soil vertical layer dimension | index | 0 | integer | | in | F | !!| ps | surface_air_pressure | surface pressure | Pa | 1 | real | kind_phys | in | F | !!| u1 | x_wind_at_lowest_model_layer | x component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F | diff --git a/physics/sfc_nst.f b/physics/sfc_nst.f index 4108edf2c..0c2e8931c 100644 --- a/physics/sfc_nst.f +++ b/physics/sfc_nst.f @@ -57,7 +57,7 @@ end subroutine sfc_nst_finalize !! \section arg_table_sfc_nst_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------------------------|----------------------------------------------------- |---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | km | soil_vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F | !! | ps | surface_air_pressure | surface pressure | Pa | 1 | real | kind_phys | in | F | !! | u1 | x_wind_at_lowest_model_layer | x component of surface layer wind | m s-1 | 1 | real | kind_phys | in | F | @@ -744,7 +744,7 @@ end subroutine sfc_nst_pre_finalize !! \section arg_table_sfc_nst_pre_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------------------------|----------------------------------------------- |---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | islimsk | sea_land_ice_mask | landmask: sea/land/ice=0/1/2 | flag | 1 | integer | | in | F | !! | oro | orography | orography | m | 1 | real | kind_phys | in | F | !! | oro_uf | orography_unfiltered | unfiltered orographyo | m | 1 | real | kind_phys | in | F | @@ -843,7 +843,7 @@ end subroutine sfc_nst_post_finalize !! \section arg_table_sfc_nst_post_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|------------------------------------------------------------------------------|----------------------------------------------- |---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | islimsk | sea_land_ice_mask | landmask: sea/land/ice=0/1/2 | flag | 1 | integer | | in | F | !! | oro | orography | orography | m | 1 | real | kind_phys | in | F | !! | oro_uf | orography_unfiltered | unfiltered orography | m | 1 | real | kind_phys | in | F | diff --git a/physics/sfc_sice.f b/physics/sfc_sice.f index cb29717f6..a1e140fde 100644 --- a/physics/sfc_sice.f +++ b/physics/sfc_sice.f @@ -26,7 +26,7 @@ end subroutine sfc_sice_finalize !! \section arg_table_sfc_sice_run Arguments !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-------------------------------------------------------|----------------------------------------------------------|---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | km | soil_vertical_dimension | vertical loop extent for soil levels, start at 1 | index | 0 | integer | | in | F | !! | ps | surface_air_pressure | surface pressure | Pa | 1 | real | kind_phys | in | F | !! | u1 | x_wind_at_lowest_model_layer | u component of surface layer wind | m s-1 | 1 | real | kind_phys | in | F | @@ -746,7 +746,7 @@ end subroutine sfc_sice_pre_finalize !! \section arg_table_sfc_sice_pre_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-------------------------------------------------------|----------------------------------------------------------|---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | fice | sea_ice_concentration | sea-ice concentration [0,1] | frac | 1 | real | kind_phys | in | F | !! | hice | sea_ice_thickness | sea-ice thickness | m | 1 | real | kind_phys | in | F | !! | tisfc | sea_ice_temperature | sea-ice surface temperature | K | 1 | real | kind_phys | in | F | @@ -813,7 +813,7 @@ end subroutine sfc_sice_post_finalize !! \section arg_table_sfc_sice_post_run Argument Table !! | local var name | longname | description | units | rank | type | kind | intent | optional | !! |----------------|-------------------------------------------------------|---------------------------------------------|---------------|------|---------|-----------|--------|----------| -!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F | +!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | !! | islmsk | sea_land_ice_mask | sea/land/ice mask (=0/1/2) | flag | 1 | integer | | in | F | !! | cice | sea_ice_concentration | sea-ice concentration [0,1] | frac | 1 | real | kind_phys | in | F | !! | zice | sea_ice_thickness | sea-ice thickness | m | 1 | real | kind_phys | in | F | From 43797ecadfd0b80bffcf6463e91a4cbea32dbe21 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jan 2018 16:12:58 -0700 Subject: [PATCH 4/4] Further corrections of metadata tables, removal of unused variables --- GFS_layer/GFS_physics_driver.F90 | 23 +++++++++++++---------- physics/GFS_rad_time_vary.f90 | 6 +++--- physics/GFS_surface_loop_control.f | 4 ++-- physics/mfdeepcnv.f | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/GFS_layer/GFS_physics_driver.F90 b/GFS_layer/GFS_physics_driver.F90 index 319c96551..b7173be80 100644 --- a/GFS_layer/GFS_physics_driver.F90 +++ b/GFS_layer/GFS_physics_driver.F90 @@ -458,7 +458,7 @@ subroutine GFS_physics_driver & ! --- local variables !--- INTEGER VARIABLES - integer :: lprint, ipr, nvdiff + integer :: ipr, nvdiff integer :: i, kk, ic, k, n, k1, iter, levshcm, tracers, & trc_shft, tottracer, num2, num3, nshocm, nshoc, ntk @@ -558,12 +558,15 @@ subroutine GFS_physics_driver & ! !===> ... begin here - ! DH* these two need to go into some interstitial scheme + ! DH* UPDATE - in the final CCPP version, these are part of the + ! create_interstitital routine in GFS_typedefs.F90. Hence, the + ! following two lines of code have to go nvdiff = Model%ntrac ! vertical diffusion of all tracers! ipr = min(size(Grid%xlon,1),10) ! *DH - ! DH* this as well + ! DH* these lines get executed operationally, but are only used + ! in the Morrison microphysics scheme - we can ignore them do i = 1, size(Grid%xlon,1) if(nint(Sfcprop%slmsk(i)) == 1) then frland(i) = 1.0 @@ -1450,7 +1453,7 @@ subroutine GFS_physics_driver & ! write(7000,*)' vgrs=',vgrs(ipr,:) ! write(7000,*)' dvdt*dtp ',dvdt(ipr,:)*Model%dtp ! endif -! if(Model%lprnt) write(1000+Model%me,*)' gq0w=',gq0(ipr,:,ntcw) +! if(Model%lprnt) write(1000+Model%me,*)' gq0w=',gq0(ipr,:,Model%ntcw) ! if(Model%lprnt) write(0,*)' gq0i=',gq0(ipr,:,ntiw) if (Model%lsidea) then ! idea convective adjustment @@ -1524,7 +1527,7 @@ subroutine GFS_physics_driver & ! write(0,*) ' gt0=',(gt0(ipr,k),k=1,Model%levs),' kdt=',Model%kdt ! write(0,*)' gq0=',(gq0(ipr,k,1),k=1,Model%levs),' lat=',lat ! write(0,*)' gq0i2=',(gq0(ipr,k,ntiw),k=1,Model%levs),' lat=',lat -! write(0,*)' gq1=',(gq0(ipr,k,ntcw),k=1,Model%levs) +! write(0,*)' gq1=',(gq0(ipr,k,Model%ntcw),k=1,Model%levs) ! print *,' vvel=',vvel ! endif ! if (Model%lprnt) write(7000,*)' bef convection gu0=',gu0(ipr,:) @@ -1656,7 +1659,7 @@ subroutine GFS_physics_driver & ! ! dqdt(1:size(Grid%xlon,1),:,1) = gq0(1:size(Grid%xlon,1),:,1) ! dqdt(1:size(Grid%xlon,1),:,2) = gq0(1:size(Grid%xlon,1),:,ntiw) -! dqdt(1:size(Grid%xlon,1),:,3) = gq0(1:size(Grid%xlon,1),:,ntcw) +! dqdt(1:size(Grid%xlon,1),:,3) = gq0(1:size(Grid%xlon,1),:,Model%ntcw) !GFDL lat has no meaning inside of shoc - changed to "1" !GFDL call shoc(size(Grid%xlon,1), size(Grid%xlon,1), 1, Model%levs, Model%levs+1, Model%dtp, Model%me, lat, call shoc (size(Grid%xlon,1), size(Grid%xlon,1), 1, Model%levs, Model%levs+1, Model%dtp, Model%me, 1, Statein%prsl(1,1), & @@ -1891,7 +1894,7 @@ subroutine GFS_physics_driver & ! write(0,*)' aftcnvgt0=',gt0(ipr,:),' kdt=',Model%kdt,' lat=',lat ! write(0,*)' aftcnvgq0=',(gq0(ipr,k,1),k=1,Model%levs),' lat=',lat ! write(0,*)' gq0i2=',(gq0(ipr,k,ntiw),k=1,Model%levs),' lat=',lat -! write(0,*)' aftcnvgq1=',(gq0(ipr,k,ntcw),k=1,Model%levs) +! write(0,*)' aftcnvgq1=',(gq0(ipr,k,Model%ntcw),k=1,Model%levs) ! endif ! ! do i = 1, size(Grid%xlon,1) @@ -2255,10 +2258,10 @@ subroutine GFS_physics_driver & ! if (clw(1,1,2) < -999.0) then ! if clw is not partitioned to ice and water ! do k=1,Model%levs ! do i=1,size(Grid%xlon,1) -! tem = gq0(i,k,ntcw) & +! tem = gq0(i,k,Model%ntcw) & ! & * max(0.0, MIN(1.0, (TCR-gt0(i,k))*TCRF)) ! clw(i,k,1) = tem ! ice -! clw(i,k,2) = gq0(i,k,ntcw) - tem ! water +! clw(i,k,2) = gq0(i,k,Model%ntcw) - tem ! water ! enddo ! enddo ! endif ! Anning ncld ==2 @@ -2565,7 +2568,7 @@ subroutine GFS_physics_driver & ! if (Model%lprnt) write(0,*) ' aftlsgq0=',gq0(ipr,:,1),' kdt=',Model%kdt ! if (Model%lprnt) write(0,*)' clw1aft=',gq0(ipr,:,ntiw),' kdt=',Model%kdt ! if (Model%lprnt) write(0,*)' cloudsm=',phy_f3d(ipr,:,1)*100,' kdt=',Model%kdt -! if (Model%lprnt) write(0,*)' clw2aft=',gq0(ipr,:,ntcw),' kdt=',Model%kdt +! if (Model%lprnt) write(0,*)' clw2aft=',gq0(ipr,:,Model%ntcw),' kdt=',Model%kdt if (Model%fprcp == 1) then Stateout%gq0(:,:,Model%ntrw) = qrn(:,:) diff --git a/physics/GFS_rad_time_vary.f90 b/physics/GFS_rad_time_vary.f90 index 6826383ca..b57815e7b 100644 --- a/physics/GFS_rad_time_vary.f90 +++ b/physics/GFS_rad_time_vary.f90 @@ -16,10 +16,10 @@ end subroutine GFS_rad_time_vary_init !! | Model | FV3-GFS_Control_type | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F | !! | Statein | FV3-GFS_Statein_type | Fortran DDT containing FV3-GFS prognostic state data in from dycore | DDT | 0 | GFS_statein_type | | in | F | !! | Tbd | FV3-GFS_Tbd_type | Fortran DDT containing FV3-GFS data not yet assigned to a defined container | DDT | 0 | GFS_tbd_type | | in | F | -!! | blksz | horizontal_block_size | horizontal block size for explicit data blocking | none | 1 | integer | | in | F | +!! | blksz | horizontal_block_size | horizontal block size for explicit data blocking | count | 0 | integer | | in | F | !! | sec | seconds_elapsed_since_model_initialization | seconds elapsed since model initialization | s | 0 | real | kind_phys | in | F | -!! | ictmflg | flag_for_initial_time-date_control | flag for initial time/date control | none | 0 | integer | | in | F | -!! | isolar | flag_for_solar_constant | solar constant control flag | none | 0 | integer | | in | F | +!! | ictmflg | flag_for_initial_time-date_control | flag for initial time/date control | flag | 0 | integer | | in | F | +!! | isolar | flag_for_solar_constant | solar constant control flag | flag | 0 | integer | | in | F | !! subroutine GFS_rad_time_vary_run (Model, Statein, Tbd, blksz, sec, ictmflg, isolar) diff --git a/physics/GFS_surface_loop_control.f b/physics/GFS_surface_loop_control.f index 1f17ea32a..da1d2b188 100644 --- a/physics/GFS_surface_loop_control.f +++ b/physics/GFS_surface_loop_control.f @@ -22,7 +22,7 @@ end subroutine GFS_surface_loop_control_part1_finalize !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|--------------------------------------------|------------|------|---------|-----------|--------|----------| !!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | -!!| iter | iteration_number | number of iteration | index | 0 | real | kind_phys | in | F | +!!| iter | iteration_number | number of iteration | index | 0 | integer | | in | F | !!| wind | wind_speed_at_lowest_model_layer | wind speed at lowest model level | m s-1 | 1 | real | kind_phys | in | F | !!| flag_guess | flag_for_guess_run | flag for guess run | flag | 1 | logical | | inout | F | !! @@ -75,7 +75,7 @@ end subroutine GFS_surface_loop_control_part2_finalize !!| local var name | longname | description | units | rank | type | kind | intent | optional | !!|----------------|-------------------------------------------------------------|--------------------------------------------|------------|------|---------|-----------|--------|----------| !!| im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F | -!!| iter | iteration_number | number of iteration | index | 0 | real | kind_phys | in | F | +!!| iter | iteration_number | number of iteration | index | 0 | integer | | in | F | !!| wind | wind_speed_at_lowest_model_layer | wind speed at lowest model level | m s-1 | 1 | real | kind_phys | in | F | !!| flag_guess | flag_for_guess_run | flag for guess run | flag | 1 | logical | | inout | F | !!| flag_iter | flag_for_iteration | flag for iteration | flag | 1 | logical | | in | F | diff --git a/physics/mfdeepcnv.f b/physics/mfdeepcnv.f index 289e285a0..692862f3d 100644 --- a/physics/mfdeepcnv.f +++ b/physics/mfdeepcnv.f @@ -50,7 +50,7 @@ end subroutine sasasdeep_finalize !! | u1 | x_wind_updated_by_physics | updated x-direction wind | m s-1 | 2 | real | kind_phys | inout | F | !! | v1 | y_wind_updated_by_physics | updated y-direction wind | m s-1 | 2 | real | kind_phys | inout | F | !! | cldwrk | cloud_work_function | cloud work function | m2 s-2 | 1 | real | kind_phys | out | F | -!! | rn | rainfall_amount_on_physics_timestep | convective rainfall amount on physics timestep | m | 1 | real | kind_phys | out | F | +!! | rn | rainfall_amount_on_physics_timestep | convective rainfall amount on physics timestep | m | 1 | real | kind_phys | out | F | !! | kbot | vertical_index_at_cloud_base | index for cloud base | index | 1 | integer | | out | F | !! | ktop | vertical_index_at_cloud_top | index for cloud top | index | 1 | integer | | out | F | !! | kcnv | flag_deep_convection | deep convection: 0=no, 1=yes | flag | 1 | integer | | out | F |