]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add "mpirun -np2" to step-32 and step-33, "step42 input.prm" to step-42
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 24 Oct 2012 16:48:22 +0000 (16:48 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 24 Oct 2012 16:48:22 +0000 (16:48 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27195 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
deal.II/examples/step-32/CMakeLists.txt
deal.II/examples/step-33/CMakeLists.txt
deal.II/examples/step-42/CMakeLists.txt

index 40a6cbac368343f00dd9c3524abdba241464e9c0..0403eab2a8cce1a62dc4cdc1abaf91e77554fc06 100644 (file)
 #       TARGET         -  a string used for the project and target name
 #       TARGET_SRC     -  a list of source file to compile for target
 #                         ${TARGET}
+#       TARGET_RUN     -  (optional) the command line that should be
+#                         invoked by "make run", will be set to default
+#                         values if empty
 #       CLEAN_UP_FILES -  (optional) a list of files (globs) that will be
 #                         removed with "make runclean" and "make
 #                         distclean", will be set to default values if
 #                         empty
-#       RUN_COMMAND    -  (optional) the command line that should be
-#                         invoked by "make run", will be set to default
-#                         values if empty
 #
 
 MACRO(DEAL_II_INVOKE_AUTOPILOT)
@@ -48,12 +48,13 @@ MACRO(DEAL_II_INVOKE_AUTOPILOT)
     MESSAGE(STATUS "Autopilot invoked")
 
     # Define a custom target to easily run the program:
-    IF("${RUN_COMMAND}" STREQUAL "")
-      SET(RUN_COMMAND ${TARGET})
+    IF("${TARGET_RUN}" STREQUAL "")
+      SET(TARGET_RUN ${TARGET})
     ENDIF()
     ADD_CUSTOM_TARGET(run
-      COMMAND ${RUN_COMMAND}
-      COMMENT "Run ${TARGET} compiled with ${CMAKE_BUILD_TYPE} configuration in ${CMAKE_SOURCE_DIR}"
+      COMMAND ${TARGET_RUN}
+      DEPENDS ${TARGET}
+      COMMENT "Run ${TARGET} with ${CMAKE_BUILD_TYPE} configuration"
       )
 
     # Define custom targets to easily switch the build type:
index e5d3814d8922ca05c17339b8c3003d3607ec90ef..6bc47a03a396495c1e879498eb4925b0bc7b532a 100644 (file)
@@ -11,6 +11,12 @@ SET(TARGET_SRC
   # You can specify additional files here!
   )
 
+# A custom command line to run the program
+SET(TARGET_RUN mpirun -np 2 ${TARGET})
+
+# Define the output that should be cleaned:
+SET(CLEAN_UP_FILES *.vtu *.pvtu *.visit)
+
 # Usually, you will not need to modify anything beyond this point...
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
@@ -28,9 +34,12 @@ FIND_PACKAGE(deal.II 8.0 REQUIRED
 #
 # Are all dependencies fullfilled?
 #
-IF(NOT  DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS)
+IF( NOT DEAL_II_WITH_MPI OR
+    NOT DEAL_II_WITH_P4EST OR
+    NOT DEAL_II_WITH_TRILINOS )
   MESSAGE(FATAL_ERROR "
 Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+    DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
 which is required for this tutorial step."
index af3eea68c60e709af236c10646fca721c15021ca..f34e13adf9674b9579e955fb4f568947f9e18d9a 100644 (file)
@@ -11,6 +11,9 @@ SET(TARGET_SRC
   # You can specify additional files here!
   )
 
+# A custom command line to run the program
+SET(TARGET_RUN ${TARGET} input.prm)
+
 # Usually, you will not need to modify anything beyond this point...
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
index ec5982ef5be97435393f8548d45e42cf5d701c38..cabb1fb3bb90b9a9bbc9d26c27c796d048bcd7bb 100644 (file)
@@ -11,6 +11,12 @@ SET(TARGET_SRC
   # You can specify additional files here!
   )
 
+# A custom command line to run the program
+SET(TARGET_RUN mpirun -np 2 ${TARGET})
+
+# Define the output that should be cleaned:
+SET(CLEAN_UP_FILES *.vtu *.pvtu *.visit)
+
 # Usually, you will not need to modify anything beyond this point...
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
@@ -28,10 +34,12 @@ FIND_PACKAGE(deal.II 8.0 REQUIRED
 #
 # Are all dependencies fullfilled?
 #
-IF( NOT DEAL_II_WITH_P4EST OR
+IF( NOT DEAL_II_WITH_MPI OR
+    NOT DEAL_II_WITH_P4EST OR
     NOT DEAL_II_WITH_TRILINOS )
   MESSAGE(FATAL_ERROR "
 Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+    DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
 which is required for this tutorial step."

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.