Fix Actuator logic so that code builds when OpenFAST is disabled

Fixes #574
Exawind · Apr 28, 2020 · a3fd9cc · a3fd9cc
1 parent 0fae3f8
commit a3fd9cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Realm.C b/src/Realm.C
@@ -983,6 +983,7 @@ Realm::setup_post_processing_algorithms()
 
   if (NULL != actuatorMeta_)
   {
+#ifdef NALU_USES_OPENFAST
     switch(actuatorMeta_->actuatorType_){
       case(ActuatorType::ActLineFASTNGP):{
         actuatorBulk_ = make_unique<ActuatorBulkFAST>(*actuatorMeta_.get(),
@@ -998,6 +999,9 @@ Realm::setup_post_processing_algorithms()
         ThrowErrorMsg("Unsupported actuator type");
       }
     }
+#else
+    ThrowErrorMsg("Actuator methods require OpenFAST");
+#endif
   }
 
   // check for norm nodal fields
@@ -2319,6 +2323,7 @@ Realm::initialize_post_processing_algorithms()
 
   if (NULL != actuatorMeta_)
   {
+#ifdef NALU_USES_OPENFAST
     switch(actuatorMeta_->actuatorType_){
       case(ActuatorType::ActLineFASTNGP):
       case(ActuatorType::ActDiskFASTNGP):
@@ -2329,6 +2334,9 @@ Realm::initialize_post_processing_algorithms()
         ThrowErrorMsg("Unsupported actuator type");
       }
     }
+#else
+    ThrowErrorMsg("Actuator requires OpenFAST");
+#endif
   }
 }
 

diff --git a/src/actuator/CMakeLists.txt b/src/actuator/CMakeLists.txt
@@ -4,11 +4,11 @@ target_sources(nalu PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorParsing.C
    ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorSearch.C
    ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorFunctors.C
+   ${CMAKE_CURRENT_SOURCE_DIR}/UtilitiesActuator.C
    )
 
 if(ENABLE_OPENFAST)
    target_sources(nalu PRIVATE
-      ${CMAKE_CURRENT_SOURCE_DIR}/UtilitiesActuator.C
       ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorFAST.C
       ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorLineFAST.C
       ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorDiskFAST.C
@@ -18,4 +18,4 @@ if(ENABLE_OPENFAST)
       ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorExecutorsFASTNgp.C
       ${CMAKE_CURRENT_SOURCE_DIR}/ActuatorBulkDiskFAST.C
    )
-endif()
+endif()