[Dart-dev] DART/branches Revision: 11676

[dart at ucar.edu]

nancy at ucar.edu
2017-05-26 15:39:02 -0600 (Fri, 26 May 2017)
239
add an option to build with whatever the quickbuild default is,
as opposed to forcing -mpi or -nompi.  call test_dart.csh with -default
to get this option.  with no command line argument the default
behavior remains to build without mpi.




Modified: DART/branches/rma_updates_nancy/developer_tests/test_dart.csh
===================================================================
--- DART/branches/rma_updates_nancy/developer_tests/test_dart.csh	2017-05-26 20:36:55 UTC (rev 11675)
+++ DART/branches/rma_updates_nancy/developer_tests/test_dart.csh	2017-05-26 21:39:02 UTC (rev 11676)
@@ -15,9 +15,11 @@
     setenv MPIFLAG '-mpi'
   else if ("$argv[1]" == "-nompi") then
     setenv MPIFLAG '-nompi'
+  else if ("$argv[1]" == "-default") then
+    setenv MPIFLAG '-default'
   else
     echo "Unrecognized argument to $0: $argv[1]"
-    echo "Usage: $0 [ -mpi | -nompi ]"
+    echo "Usage: $0 [ -mpi | -nompi | -default ]"
     echo " default is to run tests without using MPI."
     exit -1
   endif

Modified: DART/branches/rma_updates_nancy/models/buildall.csh
===================================================================
--- DART/branches/rma_updates_nancy/models/buildall.csh	2017-05-26 20:36:55 UTC (rev 11675)
+++ DART/branches/rma_updates_nancy/models/buildall.csh	2017-05-26 21:39:02 UTC (rev 11676)
@@ -7,20 +7,22 @@
 # DART $Id$
 #
 # build and test all the models given in the list.
-# usage: [ -mpi | -nompi]
+# usage: [ -mpi | -nompi | -default ]
 #
 #----------------------------------------------------------------------
 
-setenv usingmpi 0
+set usingmpi=no
 
 if ( $#argv > 0 ) then
-  if ("$argv[1]" == "-mpi") then
-    setenv usingmpi 1
-  else if ("$argv[1]" == "-nompi") then
-    setenv usingmpi 0
+  if ( "$argv[1]" == "-mpi" ) then
+    set usingmpi=yes
+  else if ( "$argv[1]" == "-default" ) then
+    set usingmpi=default
+  else if ( "$argv[1]" == "-nompi" ) then
+    set usingmpi=no
   else
     echo "Unrecognized argument to $0: $argv[1]"
-    echo "Usage: $0 [ -mpi | -nompi ]"
+    echo "Usage: $0 [ -mpi | -nompi | -default ]"
     echo " default is to run tests without MPI"
     exit -1
   endif
@@ -29,12 +31,18 @@
 # set the environment variable MPI to anything in order to enable the
 # MPI builds and tests.  set the argument to the build scripts so it
 # knows which ones to build.
-if ( $usingmpi ) then
+if ( "$usingmpi" == "yes" ) then
   echo "Will be building with MPI enabled"
-  setenv QUICKBUILD_ARG -mpi
+  set QUICKBUILD_ARG='-mpi'
+else if ( "$usingmpi" == "default" ) then
+  echo "Will be building with the default MPI settings"
+  set QUICKBUILD_ARG=''
+else if ( "$usingmpi" == "no" ) then
+  echo "Will NOT be building with MPI enabled"
+  set QUICKBUILD_ARG='-nompi'
 else
-  echo "Will NOT be building with MPI enabled"
-  setenv QUICKBUILD_ARG -nompi
+  echo "Internal error: unrecognized value of usingmpi; should not happen"
+  exit -1
 endif
 
 #----------------------------------------------------------------------