From 668e15a5ce9b9730e11846a023012b3b58bb757d Mon Sep 17 00:00:00 2001 From: Dan Kokron Date: Fri, 26 May 2023 13:52:12 +0000 Subject: [PATCH 1/4] Increase optimization for ugwp_driver_v0.F --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 950bd048e..c109093a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,12 @@ if(${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_k APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} -O1") endif() +# Increase optimization for ugwp_driver_v0.F +if(CMAKE_BUILD_TYPE STREQUAL "Release" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel") + SET_SOURCE_FILES_PROPERTIES(${LOCAL_CURRENT_SOURCE_DIR}/physics/ugwp_driver_v0.F + APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} -fp-model=fast -fprotect-parens -fimf-precision=high") +endif() + #------------------------------------------------------------------------------ add_library(ccpp_physics STATIC ${SCHEMES} ${SCHEMES_OPENMP_OFF} ${SCHEMES_DYNAMICS} ${CAPS}) From b4e5499590d46a9c80b764755cb4792317f41cbb Mon Sep 17 00:00:00 2001 From: Ted Mansell Date: Wed, 31 May 2023 16:22:05 -0500 Subject: [PATCH 2/4] Add new namelist parameters to documentation for NSSL microphysics; minor naming tweak for these parameters in the code. --- physics/docs/pdftxt/suite_input.nml.txt | 3 +++ physics/module_mp_nssl_2mom.F90 | 2 +- physics/mp_nssl.F90 | 8 ++++---- physics/mp_nssl.meta | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/physics/docs/pdftxt/suite_input.nml.txt b/physics/docs/pdftxt/suite_input.nml.txt index f37383f24..093e38797 100644 --- a/physics/docs/pdftxt/suite_input.nml.txt +++ b/physics/docs/pdftxt/suite_input.nml.txt @@ -394,11 +394,14 @@ show some variables in the namelist that must match the SDF. cnvcld see \a GFS_typedefs.F90 flag for convective cloud .false. lgfdlmprad gfs_rrtmg_pre flag for GFDL mp scheme and radiation consistency .false. nssl_cccn mp_nssl CCN concentration (m^-3) 0.6e9 +nssl_alphar mp_nssl rain shape parameter 0.0 nssl_alphah mp_nssl graupel shape parameter 0.0 nssl_alphahl mp_nssl hail shape parameter 1.0 nssl_hail_on mp_nssl NSSL flag to activate the hail category .false. nssl_ccn_on mp_nssl NSSL flag to activate the CCN category .true. nssl_invertccn mp_nssl NSSL flag to treat CCN as activated or unactivated .true. +nssl_ehw0 mp_nssl NSSL graupel-droplet collection efficiency 0.9 +nssl_ehlw0 mp_nssl NSSL hail-droplet collection efficiency 0.9 \b Parameters \b related \b to \b gravity \b drag \b scheme \b options knob_ugwp_version cires_ugwp parameter selects a version of the UGWP implementation in FV3GFS-127L \n