Merge pull request #5164 from MFraters/update_gwb_to_0.5.0

Update world builder to version 0.5.0.
geodynamics · Jun 6, 2023 · c794185 · c794185
2 parents a830ddc + 5294773
commit c794185
Show file tree

Hide file tree

Showing 684 changed files with 171,320 additions and 35,180 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,65 +136,70 @@ if(ASPECT_WITH_WORLD_BUILDER)
     SET(WORLD_BUILDER_SOURCE_DIR "${CMAKE_SOURCE_DIR}/contrib/world_builder/" CACHE PATH "" FORCE)
   ENDIF()
 
-  # Always include the header files.
+  # add source and include dirs:
   INCLUDE_DIRECTORIES("${WORLD_BUILDER_SOURCE_DIR}/include/")
-
   INCLUDE("${WORLD_BUILDER_SOURCE_DIR}/cmake/version.cmake")
-  MESSAGE(STATUS "Using World Builder version ${WORLD_BUILDER_VERSION} found at ${WORLD_BUILDER_SOURCE_DIR}.")
 
-  # add source and include dirs:
-  IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
-    FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/*.cc")
-  ELSE()
-    FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/world_builder/*.cc")
-  ENDIF()
-  LIST(APPEND TARGET_SRC ${wb_files})
-  ADD_DEFINITIONS(-DWB_WITH_MPI)
-
-  # generate config.cc and include it:
-  IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
-    CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/source/config.cc.in" "${CMAKE_BINARY_DIR}/source/world_builder/config.cc" @ONLY)
-    LIST(INSERT TARGET_SRC 0 "${CMAKE_BINARY_DIR}/source/world_builder/config.cc")
-    FILE(REMOVE "${CMAKE_BINARY_DIR}/include/world_builder/config.h")
-  ELSE()
-    CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/include/world_builder/config.h.in" "${CMAKE_BINARY_DIR}/include/world_builder/config.h" @ONLY)
-    INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/include/")
-    FILE(REMOVE "${CMAKE_BINARY_DIR}/source/world_builder/config.cc")
-  ENDIF()
+  MESSAGE(STATUS "Using World Builder version ${WORLD_BUILDER_VERSION} found at ${WORLD_BUILDER_SOURCE_DIR}.")
 
-  # Move some file to the end for unity builds to make sure other file come
-  # "before". Note: The current design keeps all ASPECT files (including
-  # ASPECT_UNITY_LAST files) before all GWB files. Mixing them will causes
-  # many issues with non-unique namespace names like Utilities.
-  IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
-    SET(UNITY_WB_LAST_FILES
-    "${WORLD_BUILDER_SOURCE_DIR}/source/parameters.cc")
+  IF(WORLD_BUILDER_VERSION VERSION_GREATER_EQUAL 0.6.0)
+    ADD_SUBDIRECTORY("${WORLD_BUILDER_SOURCE_DIR}" ${CMAKE_BINARY_DIR}/world_builder/)
+    INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/world_builder/include/")
   ELSE()
-    SET(UNITY_WB_LAST_FILES
-    "${WORLD_BUILDER_SOURCE_DIR}/source/world_builder/parameters.cc")
-  ENDIF()
+    IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
+      FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/*.cc")
+    ELSE()
+      FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/world_builder/*.cc")
+    ENDIF()
+    LIST(APPEND TARGET_SRC ${wb_files})
+    ADD_DEFINITIONS(-DWB_WITH_MPI)
+
+    # generate config.cc and include it:
+    IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
+      CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/source/config.cc.in" "${CMAKE_BINARY_DIR}/source/world_builder/config.cc" @ONLY)
+      LIST(INSERT TARGET_SRC 0 "${CMAKE_BINARY_DIR}/source/world_builder/config.cc")
+      FILE(REMOVE "${CMAKE_BINARY_DIR}/include/world_builder/config.h")
+    ELSE()
+      Message(STATUS "C ${CMAKE_BINARY_DIR}")
+      CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/include/world_builder/config.h.in" "${CMAKE_BINARY_DIR}/include/world_builder/config.h" @ONLY)
+      INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/include/")
+      FILE(REMOVE "${CMAKE_BINARY_DIR}/source/world_builder/config.cc")
+    ENDIF()
 
-  FOREACH(_source_file ${UNITY_WB_LAST_FILES})
-    LIST(FIND TARGET_SRC ${_source_file} _index)
-    IF(_index EQUAL -1)
-      MESSAGE(FATAL_ERROR "could not find ${_source_file}.")
+    # Move some file to the end for unity builds to make sure other file come
+    # "before". Note: The current design keeps all ASPECT files (including
+    # ASPECT_UNITY_LAST files) before all GWB files. Mixing them will causes
+    # many issues with non-unique namespace names like Utilities.
+    IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
+      SET(UNITY_WB_LAST_FILES
+      "${WORLD_BUILDER_SOURCE_DIR}/source/parameters.cc")
+    ELSE()
+      SET(UNITY_WB_LAST_FILES
+      "${WORLD_BUILDER_SOURCE_DIR}/source/world_builder/parameters.cc")
     ENDIF()
 
-    LIST(REMOVE_ITEM TARGET_SRC ${_source_file})
-    LIST(APPEND TARGET_SRC ${_source_file})
-  ENDFOREACH()
+    FOREACH(_source_file ${UNITY_WB_LAST_FILES})
+      LIST(FIND TARGET_SRC ${_source_file} _index)
+      IF(_index EQUAL -1)
+        MESSAGE(FATAL_ERROR "could not find ${_source_file}.")
+      ENDIF()
 
-  FOREACH(_source_file ${wb_files})
-    # exclude the world builder files from including precompiled headers, they
-    # do not include ASPECT's dependencies at all.
-    SET_PROPERTY(SOURCE ${_source_file} PROPERTY COTIRE_EXCLUDED TRUE )
-    SET_PROPERTY(SOURCE ${_source_file} PROPERTY SKIP_PRECOMPILE_HEADERS TRUE )
-    # Temporarily disable world builder unity builds:
-    SET_PROPERTY(SOURCE ${_source_file} PROPERTY SKIP_UNITY_BUILD_INCLUSION TRUE )
-  ENDFOREACH()
+      LIST(REMOVE_ITEM TARGET_SRC ${_source_file})
+      LIST(APPEND TARGET_SRC ${_source_file})
+    ENDFOREACH()
+
+    FOREACH(_source_file ${wb_files})
+      # exclude the world builder files from including precompiled headers, they
+      # do not include ASPECT's dependencies at all.
+      SET_PROPERTY(SOURCE ${_source_file} PROPERTY COTIRE_EXCLUDED TRUE )
+      SET_PROPERTY(SOURCE ${_source_file} PROPERTY SKIP_PRECOMPILE_HEADERS TRUE )
+      # Temporarily disable world builder unity builds:
+      SET_PROPERTY(SOURCE ${_source_file} PROPERTY SKIP_UNITY_BUILD_INCLUSION TRUE )
+    ENDFOREACH()
 
-  SET_PROPERTY(SOURCE "${CMAKE_BINARY_DIR}/world_builder_config.cc" PROPERTY COTIRE_EXCLUDED TRUE )
-  SET_PROPERTY(SOURCE "${CMAKE_BINARY_DIR}/world_builder_config.cc" PROPERTY SKIP_PRECOMPILE_HEADERS TRUE )
+    SET_PROPERTY(SOURCE "${CMAKE_BINARY_DIR}/world_builder_config.cc" PROPERTY COTIRE_EXCLUDED TRUE )
+    SET_PROPERTY(SOURCE "${CMAKE_BINARY_DIR}/world_builder_config.cc" PROPERTY SKIP_PRECOMPILE_HEADERS TRUE )
+  ENDIF()
 ENDIF()
 
 
@@ -599,6 +604,12 @@ IF(ASPECT_WITH_NETCDF)
   ENDIF()
 ENDIF()
 
+IF(WORLD_BUILDER_VERSION VERSION_GREATER_EQUAL 0.6.0 AND ASPECT_WITH_WORLD_BUILDER)
+  FOREACH(_T ${TARGETS})
+    TARGET_LINK_LIBRARIES(${_T} WorldBuilder)
+  ENDFOREACH()
+ENDIF()
+
 
 IF (ASPECT_USE_SHARED_LIBS)
   # some systems need to explicitly link to some libraries to use dlopen

diff --git a/contrib/world_builder/AUTHORS b/contrib/world_builder/AUTHORS
@@ -1,8 +1,14 @@
 The Geodynamic World Builder is currently maintained and developed by Menno Fraters. 
 
 There have been contributions on the development from:
-  Wolfgang Bangerth
-  Rene Gassmoeller
-  Timo Heister
-  Cedric Thieulot
+  Wolfgang Bangerth,
+  Magali Billen,
+  Rebecca Fildes,
+  Rene Gassmoeller,
+  Timo Heister,
+  Haoyuan Li,
+  Chris Mills,
+  Arushi Saxena,
   Wim Spakman
+  and
+  Cedric Thieulot