Merge pull request NCAR#120 from climbfuji/update_gsl_develop_from_de…

…velop_20211215 Update gsl/develop from develop 2021/12/15
hannahcbarnes · Dec 15, 2021 · 1df1fc4 · 1df1fc4
2 parents 07ed3e8 + 2c2f799
commit 1df1fc4
Show file tree

Hide file tree

Showing 29 changed files with 946 additions and 432 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,7 @@
   path = ccpp/physics
   url = https://github.com/NOAA-GSL/ccpp-physics
   branch = gsl/develop
+[submodule "upp"]
+  path = upp
+  url = https://github.com/NOAA-EMC/UPP
+  branch = develop
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,6 +20,8 @@ add_subdirectory(atmos_cubed_sphere)
 ### fv3atm
 ###############################################################################
 if(INLINE_POST)
+  set(BUILD_POSTEXEC OFF)
+  add_subdirectory(upp)
   set(POST_SRC io/inline_post.F90 io/post_nems_routines.F90 io/post_gfs.F90 io/post_regional.F90)
 else()
   set(POST_SRC io/inline_post_stub.F90)

diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
@@ -65,19 +65,20 @@ endif()
 #------------------------------------------------------------------------------
 # Set flag for 32bit dynamics build
 if(32BIT)
-  set(DYN32 ON CACHE BOOL "Enable support for 32bit fast physics in CCPP")
-  message(STATUS "Dynamics compiled with 32-bit option, adjust fv_sat_adj types")
+  message(STATUS "Compile CCPP slow physics with 64-bit precision, fast physics with 32-bit precision")
   add_definitions(-DOVERLOAD_R4)
-  message ("Force 64 bits in ccpp")
   if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -real-size 64")
+    set(CMAKE_Fortran_FLAGS_PHYSICS  "-real-size 64 -no-prec-div -no-prec-sqrt")
   elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8")
+    set(CMAKE_Fortran_FLAGS_PHYSICS  "-fdefault-real-8 -fdefault-double-8")
   endif()
+  set(CMAKE_Fortran_FLAGS_DYNAMICS "")
 else()
-  set(DYN32 OFF CACHE BOOL "Disable support for 32bit fast physics in CCPP")
+  message(STATUS "Compile CCPP physics with 64-bit precision")
   remove_definitions(-DOVERLOAD_R8)
   remove_definitions(-DOVERLOAD_R4)
+  set(CMAKE_Fortran_FLAGS_PHYSICS  "")
+  set(CMAKE_Fortran_FLAGS_DYNAMICS "")
 endif()
 
 #------------------------------------------------------------------------------

diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta
@@ -213,7 +213,7 @@
 [pkz]
   standard_name = finite_volume_mean_edge_pressure_raised_to_the_power_of_kappa
   long_name = finite-volume mean edge pressure raised to the power of kappa
-  units = Pa**kappa
+  units = 1
   dimensions = (starting_x_direction_index:ending_x_direction_index,starting_y_direction_index:ending_y_direction_index,1:vertical_dimension_for_fast_physics)
   type = real
   kind = kind_dyn

diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90