Merge pull request #14 from visit-dav/allen/2019_01_update_github_map

Allen/2019 01 update GitHub map
visit-dav · Jan 22, 2019 · 09ab499 · 09ab499
2 parents 8699a3c + 89bdc61
commit 09ab499
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/src/databases/Uintah/avtUintahOptions.h b/src/databases/Uintah/avtUintahOptions.h
@@ -48,7 +48,7 @@ class DBOptionsAttributes;
 namespace UintahDBOptions
 {
   // Read options
-  const char *const UINTAH_LOAD_EXTRA = "Load extra elements";
+  const char *const UINTAH_LOAD_EXTRA = "Load extra geometry";
   const char *const UINTAH_LOAD_EXTRA_NONE    = "None";
   const char *const UINTAH_LOAD_EXTRA_CELLS   = "Cells";
   const char *const UINTAH_LOAD_EXTRA_PATCHES = "Patches";

diff --git a/src/gui/QvisSimulationWindow.C b/src/gui/QvisSimulationWindow.C
@@ -850,6 +850,11 @@ QvisSimulationWindow::UpdateUIComponent(QWidget *window, const QString &name,
                   delete item;
               }
             }                                 
+            else if( text == std::string("CURRENT_ROW") &&
+                     row < lWidget->count() )
+            {
+              lWidget->setCurrentRow( row );
+            }                                 
             else if( text == std::string("REMOVE_ROW") &&
                      row < lWidget->count() )
             {

diff --git a/src/operators/Slice/Slice.xml b/src/operators/Slice/Slice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-  <Plugin name="Slice" type="operator" label="Slice" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="Slice.xpm" category="Slicing" category="Slicing">
+  <Plugin name="Slice" type="operator" label="Slice" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="Slice.xpm" category="Slicing">
     <Attribute name="SliceAttributes" purpose="This class contains attributes for the arbitrary slice." persistent="true" keyframe="true" exportAPI="" exportInclude="" codefile="SliceAttributes.code">
       <Enum name="AxisType">
         XAxis

diff --git a/src/tools/dev/scripts/bv_support/bv_p7zip.sh b/src/tools/dev/scripts/bv_support/bv_p7zip.sh
@@ -52,7 +52,7 @@ function bv_p7zip_host_profile
         echo "## P7ZIP" >> $HOSTCONF
         echo "##" >> $HOSTCONF
         echo \
-            "VISIT_OPTION_DEFAULT(VISIT_P7ZIP_DIR \${VISITHOME}/p7zip/$P7ZIP_VERSION/\${VISITARCH})" \
+            "VISIT_OPTION_DEFAULT(VISIT_SEVEN_ZIP_DIR \${VISITHOME}/p7zip/$P7ZIP_VERSION/\${VISITARCH})" \
             >> $HOSTCONF
     fi
 }
@@ -120,7 +120,7 @@ function build_p7zip
     #
     info "Installing P7ZIP"
     grep -v '^DEST_HOME=' install.sh > install2.sh
-    env DEST_HOME=$VISITDIR/p7zip sh install2.sh
+    env DEST_HOME="$VISITDIR/p7zip/$P7ZIP_VERSION/$VISITARCH" sh install2.sh
     if [[ $? != 0 ]] ; then
         warn "P7ZIP install failed.  Giving up"
         return 1

diff --git a/src/tools/dev/scripts/bv_support/bv_uintah.sh b/src/tools/dev/scripts/bv_support/bv_uintah.sh
@@ -1,4 +1,4 @@
-#svn import -m "added Uintah to the fold" Uintah-2.5.0_beta.tar.gz svn+ssh://allens@edison.nersc.gov/project/projectdirs/visit/svn/visit/trunk/third_party/Uintah-2.5.0_beta.tar.gz
+#svn import -m "added Uintah to the fold" Uintah-2.6.0_beta.tar.gz svn+ssh://allens@edison.nersc.gov/project/projectdirs/visit/svn/visit/trunk/third_party/Uintah-2.6.0_beta.tar.gz
 
 function bv_uintah_initialize
 {
@@ -64,9 +64,9 @@ function bv_uintah_initialize_vars
 
 function bv_uintah_info
 {
-    export UINTAH_VERSION=${UINTAH_VERSION:-"2.5.0"}
+    export UINTAH_VERSION=${UINTAH_VERSION:-"2.6.0"}
     export UINTAH_FILE=${UINTAH_FILE:-"Uintah-${UINTAH_VERSION}_beta.tar.gz"}
-    export UINTAH_COMPATIBILITY_VERSION=${UINTAH_COMPATIBILITY_VERSION:-"2.5"}
+    export UINTAH_COMPATIBILITY_VERSION=${UINTAH_COMPATIBILITY_VERSION:-"2.6"}
     export UINTAH_BUILD_DIR=${UINTAH_BUILD_DIR:-"Uintah-${UINTAH_VERSION}/optimized"}
     export UINTAH_URL=${UINTAH_URL:-"http://www.sci.utah.edu/releases/uintah_v${UINTAH_VERSION}"}
 
@@ -97,8 +97,8 @@ function bv_uintah_host_profile
         echo "##" >> $HOSTCONF
 
         if [[ "$USE_SYSTEM_UINTAH" == "yes" ]]; then
-            warn "Assuming version 2.5.1 for Uintah"
-            echo "SETUP_APP_VERSION(UINTAH 2.5.1)" >> $HOSTCONF
+            warn "Assuming version 2.6.1 for Uintah"
+            echo "SETUP_APP_VERSION(UINTAH 2.6.1)" >> $HOSTCONF
             echo "VISIT_OPTION_DEFAULT(VISIT_UINTAH_DIR $UINTAH_INSTALL_DIR)" >> $HOSTCONF 
             echo "SET(VISIT_USE_SYSTEM_UINTAH TRUE)" >> $HOSTCONF
         else
@@ -356,13 +356,13 @@ function build_uintah
         rm -rf $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/* || error "Can't remove old UINTAH install dir."
     fi
 
-    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/lib || error "Can't make UINTAH install dir."
-    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include || error "Can't make UINTAH install dir."
-    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include/VisIt || error "Can't make UINTAH install dir."
-    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include/VisIt/uda2vis || error "Can't make UINTAH install dir."
+    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/lib || error "Can't make UINTAH install lib dir."
+    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include || error "Can't make UINTAH install include dir."
+    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include/VisIt || error "Can't make UINTAH install include/VisIt dir."
+    mkdir $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include/VisIt/interfaces || error "Can't make UINTAH install include/VisIt/interfaces dir."
 
     cp lib/* $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/lib
-    cp ../src/VisIt/uda2vis/udaData.h $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include/VisIt/uda2vis
+    cp ../src/VisIt/interfaces/datatypes.h $VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH/include/VisIt/interfaces/datatypes.h
 
     #    $MAKE install
     if [[ $? != 0 ]] ; then