Skip to content

Commit

Permalink
Revert some changes. Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@dustinswales
dustinswales committed Sep 17, 2024
1 parent 6f18a9e commit b853dd7
Show file tree
Hide file tree
Showing 36 changed files with 250 additions and 86 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ endforeach()

#------------------------------------------------------------------------------
# Set the sources: kinds file
# DJS2024: This file is autogenerated by the framework (Capgen)
set(KINDS $ENV{CCPP_KINDS})
if(KINDS)
message(STATUS "Got CCPP KINDS from environment variable")
else(KIDNS)
else(KINDS)
include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_KINDS.cmake)
message(STATUS "Got CCPP KINDS from cmakefile include file")
endif(KINDS)
Expand Down
10 changes: 5 additions & 5 deletions physics/GWD/gwdps.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,13 @@ subroutine gwdps_run( &
real(kind=kind_phys), intent(inout) :: ELVMAX(:)
real(kind=kind_phys), intent(in) :: &
& THETA(:), SIGMA(:), GAMMA(:)
real(kind=kind_phys), intent(inout) :: DUSFC(:), DVSFC(:)
real(kind=kind_phys), intent(out) :: RDXZB(:)
real(kind=kind_phys), intent(inout) :: dtaux2d_ms(:,:), &
real(kind=kind_phys), intent(inout) :: DUSFC(:), DVSFC(:), &
& RDXZB(:)
real(kind=kind_phys), intent(inout), optional :: dtaux2d_ms(:,:), &
& dtauy2d_ms(:,:), dtaux2d_bl(:,:), &
& dtauy2d_bl(:,:)
real(kind=kind_phys), intent(inout) :: dusfc_ms(:), dvsfc_ms(:), &
& dusfc_bl(:), dvsfc_bl(:)
real(kind=kind_phys), intent(inout), optional :: dusfc_ms(:), &
& dvsfc_ms(:), dusfc_bl(:), dvsfc_bl(:)
integer, intent(in) :: nmtvr
logical, intent(in) :: lprnt
logical, intent(in) :: ldiag_ugwp
Expand Down
1 change: 0 additions & 1 deletion physics/GWD/rayleigh_damp.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
dimensions = (number_of_tracers_plus_one_hundred,number_of_cumulative_change_processes)
type = integer
intent = in
optional = True
[index_of_process_rayleigh_damping]
standard_name = index_of_rayleigh_damping_process_in_cumulative_change_index
long_name = index of rayleigh damping process in second dimension of array cumulative change index
Expand Down
2 changes: 0 additions & 2 deletions physics/GWD/ugwpv1_gsldrag.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
type = character
kind = len=*
intent = in
optional = True
[logunit]
standard_name = iounit_of_log
long_name = fortran unit number for writing logfile
Expand Down Expand Up @@ -1112,7 +1111,6 @@
dimensions = (number_of_tracers_plus_one_hundred,number_of_cumulative_change_processes)
type = integer
intent = in
optional = True
[index_of_x_wind]
standard_name = index_of_x_wind_in_cumulative_change_index
long_name = index of x-wind in first dimension of array cumulative change index
Expand Down
2 changes: 0 additions & 2 deletions physics/GWD/unified_ugwp.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
type = character
kind = len=*
intent = in
optional = True
[logunit]
standard_name = iounit_of_log
long_name = fortran unit number for writing logfile
Expand Down Expand Up @@ -1146,7 +1145,6 @@
dimensions = (number_of_tracers_plus_one_hundred,number_of_cumulative_change_processes)
type = integer
intent = in
optional = True
[index_of_temperature]
standard_name = index_of_temperature_in_cumulative_change_index
long_name = index of temperature in first dimension of array cumulative change index
Expand Down
32 changes: 16 additions & 16 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,47 +49,47 @@ subroutine GFS_MP_generic_post_run(
real(kind=kind_phys), intent(in) :: dtf, frain, con_g, rainmin, rhowater
real(kind=kind_phys), dimension(:), intent(in) :: rain1, xlat, xlon, tsfc
real(kind=kind_phys), dimension(:), intent(inout) :: ice, snow, graupel, rainc
real(kind=kind_phys), dimension(:), intent(in) :: rain0, ice0, snow0, graupel0
real(kind=kind_phys), dimension(:), intent(in), optional :: rain0, ice0, snow0, graupel0
real(kind=kind_phys), dimension(:,:), intent(in) :: rann
real(kind=kind_phys), dimension(:,:), intent(in) :: prsl, save_t, del
real(kind=kind_phys), dimension(:,:), intent(in) :: prsi, phii,phil
real(kind=kind_phys), dimension(:,:,:), intent(in) :: gq0, save_q

real(kind=kind_phys), dimension(:,:,:), intent(in) :: dfi_radar_tten
real(kind=kind_phys), dimension(:,:,:), intent(in), optional :: dfi_radar_tten

real(kind=kind_phys), dimension(:), intent(in ) :: sr
real(kind=kind_phys), dimension(:), intent(inout) :: rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, &
srflag, cnvprcp, totprcp, totice, totsnw, totgrp, cnvprcpb, &
totprcpb, toticeb, totsnwb, totgrpb, pwat
real(kind=kind_phys), dimension(:), intent(inout) :: rain_cpl, rainc_cpl, snow_cpl

real(kind=kind_phys), dimension(:,:,:), intent(inout) :: dtend
real(kind=kind_phys), dimension(:,:,:), intent(inout), optional :: dtend
integer, dimension(:,:), intent(in) :: dtidx

! Stochastic physics / surface perturbations
real(kind=kind_phys), dimension(:), intent(inout) :: drain_cpl, dsnow_cpl
real(kind=kind_phys), dimension(:), intent(inout), optional :: drain_cpl, dsnow_cpl

! Rainfall variables previous time step
integer, intent(in) :: lsm, ilsm_ruc, ilsm_noahmp
real(kind=kind_phys), dimension(:), intent(inout) :: raincprv
real(kind=kind_phys), dimension(:), intent(inout) :: rainncprv
real(kind=kind_phys), dimension(:), intent(inout) :: iceprv
real(kind=kind_phys), dimension(:), intent(inout) :: snowprv
real(kind=kind_phys), dimension(:), intent(inout) :: graupelprv
real(kind=kind_phys), dimension(:), intent(inout) :: draincprv
real(kind=kind_phys), dimension(:), intent(inout) :: drainncprv
real(kind=kind_phys), dimension(:), intent(inout) :: diceprv
real(kind=kind_phys), dimension(:), intent(inout) :: dsnowprv
real(kind=kind_phys), dimension(:), intent(inout) :: dgraupelprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: raincprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: rainncprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: iceprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: snowprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: graupelprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: draincprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: drainncprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: diceprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: dsnowprv
real(kind=kind_phys), dimension(:), intent(inout), optional :: dgraupelprv
real(kind=kind_phys), dimension(:), intent(inout) :: frzr
real(kind=kind_phys), dimension(:), intent(inout) :: frzrb
real(kind=kind_phys), dimension(:), intent(inout) :: frozr
real(kind=kind_phys), dimension(:), intent(inout) :: frozrb
real(kind=kind_phys), dimension(:), intent(inout) :: tsnowp
real(kind=kind_phys), dimension(:), intent(inout) :: tsnowpb
real(kind=kind_phys), dimension(:), intent(inout) :: rhonewsn1
real(kind=kind_phys), dimension(:,:), intent(inout) :: dqdt_qmicro
real(kind=kind_phys), dimension(:,:), intent(inout) :: prevsq
real(kind=kind_phys), dimension(:,:), intent(inout), optional :: dqdt_qmicro
real(kind=kind_phys), dimension(:,:), intent(inout), optional :: prevsq
real(kind=kind_phys), intent(in) :: dtp

! CCPP error handling
Expand Down
1 change: 0 additions & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
dimensions = (number_of_tracers_plus_one_hundred,number_of_cumulative_change_processes)
type = integer
intent = in
optional = True
[dtp]
standard_name = timestep_for_physics
long_name = physics timestep
Expand Down
11 changes: 4 additions & 7 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@
type = integer
intent = in
[xlat_d]
standard_name = latitude
long_name = latitude
standard_name = latitude_in_degree
long_name = latitude in degree north
units = degree_north
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
intent = in
[xlon_d]
standard_name = longitude
long_name = longitude
standard_name = longitude_in_degree
long_name = longitude in degree east
units = degree_east
dimensions = (horizontal_dimension)
type = real
Expand Down Expand Up @@ -390,7 +390,6 @@
type = real
kind = kind_phys
intent = inout
optional = True
[lsm]
standard_name = control_for_land_surface_scheme
long_name = flag for land surface model
Expand Down Expand Up @@ -1582,7 +1581,6 @@
type = character
kind = len=256
intent = in
optional = True
[use_ufo]
standard_name = flag_for_gcycle_surface_option
long_name = flag for gcycle surface option
Expand Down Expand Up @@ -1924,7 +1922,6 @@
type = real
kind = kind_phys
intent = inout
optional = True
[cvb]
standard_name = pressure_at_convective_cloud_base_between_sw_radiation_calls_from_cnvc90
long_name = convective cloud bottom pressure
Expand Down
13 changes: 7 additions & 6 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
[ccpp-arg-table]
name = GFS_phys_time_vary_init
type = scheme

[me]
standard_name = mpi_rank
long_name = current MPI-rank
Expand Down Expand Up @@ -93,17 +94,17 @@
type = integer
intent = in
[xlat_d]
standard_name = latitude
long_name = latitude
units = radian
standard_name = latitude_in_degree
long_name = latitude in degree north
units = degree_north
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
intent = in
[xlon_d]
standard_name = longitude
long_name = longitude
units = radian
standard_name = longitude_in_degree
long_name = longitude in degree east
units = degree_east
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
Expand Down
5 changes: 3 additions & 2 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,10 +838,11 @@ subroutine cmp_reff_Thompson(nLev, nCol, i_cldliq, i_cldice, i_cldsnow, i_cldice
effrin_cldsnow

! Local
integer :: iCol, iLay, ilsmask
integer :: iCol, iLay
real(kind_phys) :: rho, orho
real(kind_phys),dimension(nCol,nLev) :: qv_mp, qc_mp, qi_mp, qs_mp, ni_mp, nc_mp, &
nwfa, re_cloud, re_ice, re_snow
nwfa, re_cloud, re_ice, re_snow
integer :: ilsmask

! Prepare cloud mixing-ratios and number concentrations for calc_effectRa
do iLay = 1, nLev
Expand Down
Loading

0 comments on commit b853dd7

Please sign in to comment.