Skip to content

Commit

Permalink
Update thompson mp 20210213 (NCAR#567) for gsl/develop (NCAR#75)
Browse files Browse the repository at this point in the history
* Add logical convert_dry_rho for Thompson MP, hardcoded to false
* Initialize all variables to NaN in ccpp-physics in DEBUG mode
* Update submodule pointer for ccpp-physics
  • Loading branch information
climbfuji authored Mar 16, 2021
1 parent 730ac5d commit 4516ae0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ccpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftrapuv -traceback")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrapuv -traceback")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fstack-protector-all -fpe0 -traceback -debug -ftrapuv")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fstack-protector-all -fpe0 -traceback -debug -ftrapuv -init=snan,arrays")
elseif (${CMAKE_BUILD_TYPE} MATCHES "Bitforbit")
if(LEGACY_INTEL)
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model strict -qoverride-limits -traceback")
Expand Down
5 changes: 5 additions & 0 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,11 @@ module GFS_typedefs

!--- microphysical switch
integer :: ncld !< choice of cloud scheme
logical :: convert_dry_rho = .false. !< flag for converting number concentrations from moist to dry
!< this flag will no longer be needed once the CCPP standard
!< names and the CCPP framework logic have been augmented to
!< automatically determine whether such conversions are necessary
!< and if yes, perform them; hardcoded to .false. for now
!--- new microphysical switch
integer :: imp_physics !< choice of microphysics scheme
integer :: imp_physics_gfdl = 11 !< choice of GFDL microphysics scheme
Expand Down
6 changes: 6 additions & 0 deletions ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2806,6 +2806,12 @@
units = count
dimensions = ()
type = integer
[convert_dry_rho]
standard_name = flag_for_converting_hydrometeors_from_moist_to_dry_air
long_name = flag for converting hydrometeors from moist to dry air
units = flag
dimensions = ()
type = logical
[imp_physics]
standard_name = flag_for_microphysics_scheme
long_name = choice of microphysics scheme
Expand Down

0 comments on commit 4516ae0

Please sign in to comment.