fmk - updating makeMac

Author: fmckenna

makeMac.sh

@@ -30,10 +30,10 @@ while [[ $# -gt 0 ]]; do
                 exit 1
             fi
 
-            if [[ "$ARCH" != "x86_64" ]]; then
+            if [[ "$ARCH" == "x86_64" ]]; then
 		CMAKE_DAKOTA_VERSION=619
 	    else
-		CMAKE_DAKOTA_VERSION=620		
+		CMAKE_DAKOTA_VERSION=623		
             fi	    
 
             # 3. If valid, set the variables

modules/performUQ/dakota/dakotaProcedures.cpp

@@ -441,7 +441,7 @@ writeInterface(std::ostream &dakotaFile, json_t *uqData, std::string &workflowDr
   dakotaFile << "   parameters_file = 'paramsDakota.in'\n";
   dakotaFile << "   results_file = 'results.out' \n";
 
-#if defined(DAKOTA_VERSION) && DAKOTA_VERSION >= 622                                                                                           
+#if defined(DAKOTA_VERSION) && DAKOTA_VERSION >= 619
   dakotaFile << "   parameters_format\n     aprepro \n";
 #else
   dakotaFile << "   aprepro \n";