From b5db69a0310b3e59bb62f1ca490801336174d48e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Feb 2021 16:40:26 -0700 Subject: [PATCH 1/5] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4760351ce..22922d9b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ branch = gsl/develop [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NOAA-GSL/ccpp-physics - branch = gsl/develop + #url = https://github.com/NOAA-GSL/ccpp-physics + #branch = gsl/develop + url = https://github.com/climbfuji/ccpp-physics + branch = update_thompsonMP_20210213_merged_into_gsl_develop diff --git a/ccpp/physics b/ccpp/physics index c82e50126..c6f1cab8c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c82e50126dbb2cd63b866411f3aca76e39da0eb2 +Subproject commit c6f1cab8cc644c803739047aa238c7155102c0ef From 217b05cb2a4c4efd1f10b779ed4da56fa08857f0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 5 Mar 2021 10:27:10 -0700 Subject: [PATCH 2/5] Add logical convert_dry_rho for Thompson MP, hardcoded to false --- ccpp/data/GFS_typedefs.F90 | 5 +++++ ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index f91fdc06f..82fbed80f 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -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 diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index f39248d4c..c039c0a38 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -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 diff --git a/ccpp/physics b/ccpp/physics index c6f1cab8c..15f1aa751 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c6f1cab8cc644c803739047aa238c7155102c0ef +Subproject commit 15f1aa751a67aa2593f1700f951265f49d735947 From 90b28a6932ef61635960a62fcab48f893f22c82d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Mar 2021 08:43:50 -0700 Subject: [PATCH 3/5] Initialize all variables to NaN in ccpp-physics in DEBUG mode --- ccpp/CMakeLists.txt | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt index 760e09a8e..b1fc8ed42 100644 --- a/ccpp/CMakeLists.txt +++ b/ccpp/CMakeLists.txt @@ -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") diff --git a/ccpp/physics b/ccpp/physics index 15f1aa751..4d8f7f411 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 15f1aa751a67aa2593f1700f951265f49d735947 +Subproject commit 4d8f7f4117d5695c534580bdf6350c39eb95c2ad From e67571a7d8cc46e7680622085688f1c8a42974bb Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 13 Mar 2021 15:33:05 -0700 Subject: [PATCH 4/5] Update submodule pointer for ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 4d8f7f411..bbec19280 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4d8f7f4117d5695c534580bdf6350c39eb95c2ad +Subproject commit bbec192809f8e283b79eced5d032faf45060b423 From c0e5e3a38cf75b7d927dee9f09cac04073844094 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 16 Mar 2021 05:49:55 -0600 Subject: [PATCH 5/5] Revert change to .gitmodules and update submodule pointer for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22922d9b7..4760351ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,5 @@ branch = gsl/develop [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NOAA-GSL/ccpp-physics - #branch = gsl/develop - url = https://github.com/climbfuji/ccpp-physics - branch = update_thompsonMP_20210213_merged_into_gsl_develop + url = https://github.com/NOAA-GSL/ccpp-physics + branch = gsl/develop diff --git a/ccpp/physics b/ccpp/physics index bbec19280..8507df659 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit bbec192809f8e283b79eced5d032faf45060b423 +Subproject commit 8507df659d7d37bae5a697d684b8046f19e2f36b