ufs-community · DusanJovic-NOAA · Mar 21, 2021 · Nov 25, 2020 · Dec 2, 2020 · Dec 14, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/pjpegion/fv3atm
+  branch = cld_perts
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
@@ -16,8 +16,8 @@
   branch = develop
 [submodule "stochastic_physics"]
   path = stochastic_physics
-  url = https://github.com/noaa-psd/stochastic_physics
-  branch = master
+  url = https://github.com/pjpegion/stochastic_physics
+  branch = ocn_stoch
 [submodule "CMakeModules"]
   path = CMakeModules
   url = https://github.com/NOAA-EMC/CMakeModules
@@ -28,8 +28,8 @@
   branch = emc/develop
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
-  url = https://github.com/NOAA-EMC/MOM6
-  branch = dev/emc
+  url = https://github.com/pjpegion/MOM6
+  branch = ocn_stoch
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE

diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,6 +136,7 @@ set_property(SOURCE FMS/fft/fft.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "-DSGIC
 list(APPEND _fms_defs_public use_libMPI
                              use_netCDF
                              GFS_PHYS
+                             UFS
                              INTERNAL_FILE_NML)
 if(QUAD_PRECISION)
   list(APPEND _fms_defs_public ENABLE_QUAD_PRECISION)
@@ -169,9 +170,9 @@ set_target_properties(fms PROPERTIES PUBLIC_HEADER "${fms_headers}" )
 ###############################################################################
 ### stochastic_physics
 ###############################################################################
-if(NOT DATM)
+#if(NOT DATM)
   add_subdirectory(stochastic_physics)
-endif()
+#endif()
 
 ###############################################################################
 ### FV3 or Data Atmosphere
@@ -280,7 +281,7 @@ endif()
 target_include_directories(ufs INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                          $<INSTALL_INTERFACE:mod>)
 
-target_link_libraries(ufs PUBLIC esmf)
+target_link_libraries(ufs PUBLIC esmf stochastic_physics)
 
 if(DATM)
   target_link_libraries(ufs PUBLIC datatm)
@@ -293,7 +294,7 @@ if(S2S)
                                 FRONT_CICE6=ice_comp_nuopc
                                 CMEPS
                                 FRONT_CMEPS=MED)
-  add_dependencies(ufs mom6 cice cmeps)
+  add_dependencies(ufs mom6 cice cmeps stochastic_physics)
   target_link_libraries(ufs PUBLIC mom6
                                    cice
                                    cmeps)
@@ -325,8 +326,7 @@ if(DATM)
 endif()
 target_link_libraries(ufs_model PRIVATE ufs
                                         esmf
-                                        NetCDF::NetCDF_Fortran
-                                        ${MKL_LIB})
+                                        NetCDF::NetCDF_Fortran)
 
 ###############################################################################
 ### Install
@@ -344,7 +344,8 @@ install(EXPORT fms-config
   DESTINATION lib/cmake
 )
 install(
-  TARGETS ufs
+  #TARGETS ufs
+  TARGETS ufs stochastic_physics
   EXPORT ufs-config
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib)

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
@@ -22,11 +22,13 @@ set(MOM6SOLO OFF CACHE BOOL "Build MOM6 solo")
 
 # Too many files to list, so include them via this file
 include("mom6_files.cmake")
-
+#SP LIB
+# sp::sp_d
 ### Use common object library for building target library
 add_library(mom6_obj OBJECT ${mom6_src_files})
 set_target_properties(mom6_obj PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
+                                            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../stochastic_physics>)
 target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
                                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 target_link_libraries(mom6_obj PRIVATE fms
@@ -38,9 +40,11 @@ target_link_libraries(mom6_obj PRIVATE fms
 
 add_library(mom6_nuopc_obj OBJECT ${mom6_nuopc_src_files})
 set_target_properties(mom6_nuopc_obj PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
+                                                  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../stochastic_physics>)
 target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
                                                   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
+#target_include_directories(mom6_nuopc_obj PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../stochastic_physics)
 target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
                                              fms
                                              esmf)
@@ -56,9 +60,13 @@ target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_
                                        $<INSTALL_INTERFACE:mod>)
 target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
+#target_include_directories(mom6 PUBLIC  ${CMAKE_CURRENT_BINARY_DIR}/../stochastic_physics)
 target_link_libraries(mom6 PUBLIC fms
                                   esmf
                                   NetCDF::NetCDF_Fortran)
+target_link_libraries(mom6 PRIVATE fms
+                                   esmf
+                                   stochastic_physics )
 # OpenMP is disabled in MOM6
 #if(OpenMP_Fortran_FOUND)
 #  target_link_libraries(mom6 PRIVATE OpenMP::OpenMP_Fortran)
@@ -70,12 +78,15 @@ if(MOM6SOLO)
   add_executable(mom6solo ${mom6_solo_src_files})
   add_dependencies(mom6solo mom6_obj)
   set_target_properties(mom6solo PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod_solo)
-  target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
-  target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod_solo>)
+  target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
+                                              $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod_solo>
+                                              $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../stochastic_physics>)
   target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
                                               $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
   target_link_libraries(mom6solo PRIVATE mom6_obj
-                                         fms
+                                         fms  
+                                         stochastic_physics
+                                         esmf
                                          NetCDF::NetCDF_Fortran)
   # OpenMP is disabled in MOM6
   #if(OpenMP_Fortran_FOUND)
@@ -88,7 +99,8 @@ endif()
 ###############################################################################
 
 install(
-  TARGETS mom6
+  #TARGETS mom6 stochastic_physics
+  TARGETS mom6 
   EXPORT  mom6-config
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
@@ -101,5 +113,6 @@ install(EXPORT      mom6-config
         DESTINATION lib/cmake)
 
 if(MOM6SOLO)
-  install(TARGETS mom6solo RUNTIME DESTINATION bin)
+  #install(TARGETS mom6solo RUNTIME DESTINATION bin)
+  install(TARGETS mom6solo stochastic_physics RUNTIME DESTINATION bin)
 endif()
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/modulefiles/macosx.gnu/fv3 b/modulefiles/macosx.gnu/fv3
@@ -39,6 +39,6 @@ fi
 ##
 ## Intel MKL library
 ##
-export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
-export MKL_INC="-m64 -I${MKL_DIR}/include"
-export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
+#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
+#export MKL_INC="-m64 -I${MKL_DIR}/include"
+#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
diff --git a/modulefiles/macosx.gnu/fv3_debug b/modulefiles/macosx.gnu/fv3_debug
@@ -39,6 +39,6 @@ fi
 ##
 ## Intel MKL library
 ##
-export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
-export MKL_INC="-m64 -I${MKL_DIR}/include"
-export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
+#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
+#export MKL_INC="-m64 -I${MKL_DIR}/include"
+#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
diff --git a/stochastic_physics b/stochastic_physics
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
@@ -1,4 +1,4 @@
-Thu Jan 28 20:21:09 UTC 2021
+Tue Jan 12 21:53:42 UTC 2021
 Start Regression test