DOI-USGS · krlberry · Mar 4, 2020 · Mar 3, 2020 · Mar 3, 2020 · Mar 3, 2020
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
               def build_ok = true
               def condaPath = ""
               def isisEnv = [
-                "ISIS3DATA=/isisData/data",
+                "ISISDATA=/isisData/isis_data",
                 "ISIS3TESTDATA=/isisData/testData",
                 "ISIS3MGRSCRIPTS=/isisData/data/isis3mgr_scripts",
                 "MALLOC_CHECK_=1"

diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt
@@ -65,7 +65,7 @@ set(BUILD_SHARED_LIBS ON)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # Specify user options that can be passed in with the initial CMake command.
-option(isis3Data       "Directory containing Isis3Data"                 OFF )
+option(isisData        "Directory containing IsisData"                  OFF )
 option(isis3TestData   "Directory containing Isis3TestData"             OFF )
 option(testOutputDir   "Directory to store app test output folders"     OFF )
 option(buildCore       "Build the core ISIS modules"                    ON  )
@@ -82,18 +82,18 @@ if(DEFINED ENV{CONDA_PREFIX} AND CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
 endif()
 
 # Prioritize passed in variables over env vars, probably a better way to do this
-if(DEFINED ENV{ISIS3DATA} AND NOT isis3Data)
- set(isis3Data $ENV{ISIS3DATA})
+if(DEFINED ENV{ISISDATA} AND NOT isisData)
+ set(isisData $ENV{ISISDATA})
 endif()
 if(DEFINED ENV{ISIS3TESTDATA} AND NOT isis3TestData)
  set(isis3TestData $ENV{ISIS3TESTDATA})
 endif()
 
-if(EXISTS ${isis3Data})
- set(ENV{ISIS3DATA} "${isis3Data}")
+if(EXISTS ${isisData})
+ set(ENV{ISISDATA} "${isisData}")
 else()
- message(WARNING "Isis3Data directory ${isis3Data} not found, unit tests will fail.")
- set(isis3Data OFF)
+ message(WARNING "Isis Data directory ${isisData} not found, unit tests will fail.")
+ set(isisData OFF)
 endif()
 
 if(EXISTS ${isis3TestData})
@@ -124,7 +124,7 @@ message("\tBUILD CORE: ${buildCore}")
 message("\tBUILD MISSIONS: ${buildMissions}")
 message("\tJP2K SUPPORT: ${JP2KFLAG}")
 message("\tPYTHON BINDINGS: ${pybindings}")
-message("\tISIS3DATA: ${isis3Data}")
+message("\tISISDATA: ${isisData}")
 message("\tISISTESTDATA: ${isis3TestData}")
 message("\tTEST OUTPUT DIR: ${testOutputDir}")
 message("\tINSTALL PREFIX: ${CMAKE_INSTALL_PREFIX}")

diff --git a/isis/IsisPreferences b/isis/IsisPreferences
@@ -175,42 +175,42 @@ EndGroup
 ########################################################
 
 Group = DataDirectory
-  Apollo15     = $ISIS3DATA/apollo15
-  Apollo16     = $ISIS3DATA/apollo16
-  Apollo17     = $ISIS3DATA/apollo17
-  Base         = $ISIS3DATA/base
-  Cassini      = $ISIS3DATA/cassini
-  Chan1        = $ISIS3DATA/chan1
-  Chandrayaan1 = $ISIS3DATA/chandrayaan1
-  Clementine1  = $ISIS3DATA/clementine1
-  Clipper      = $ISIS3DATA/../datalocal/clipper
-  Control      = $ISIS3DATA/control
-  Dawn         = $ISIS3DATA/dawn
-  Galileo      = $ISIS3DATA/galileo
-  Hayabusa     = $ISIS3DATA/hayabusa
-  Hayabusa2    = $ISIS3DATA/hayabusa2
-  Juno         = $ISIS3DATA/juno
-  Kaguya       = $ISIS3DATA/kaguya
-  Lo           = $ISIS3DATA/lo
-  Lro          = $ISIS3DATA/lro
-  Mariner10    = $ISIS3DATA/mariner10
-  Mer          = $ISIS3DATA/mer
-  Mex          = $ISIS3DATA/mex
-  Messenger    = $ISIS3DATA/messenger
-  Mgs          = $ISIS3DATA/mgs
-  Mro          = $ISIS3DATA/mro
-  Near         = $ISIS3DATA/near
-  NewHorizons  = $ISIS3DATA/newhorizons
-  Odyssey      = $ISIS3DATA/odyssey
-  OsirisRex    = $ISIS3DATA/../datalocal/osirisrex
-  Rolo         = $ISIS3DATA/rolo
-  Rosetta      = $ISIS3DATA/rosetta
-  Smart1       = $ISIS3DATA/smart1
-  Tgo          = $ISIS3DATA/tgo
-  Viking1      = $ISIS3DATA/viking1
-  Viking2      = $ISIS3DATA/viking2
-  Voyager1     = $ISIS3DATA/voyager1
-  Voyager2     = $ISIS3DATA/voyager2
+  Apollo15     = $ISISDATA/apollo15
+  Apollo16     = $ISISDATA/apollo16
+  Apollo17     = $ISISDATA/apollo17
+  Base         = $ISISDATA/base
+  Cassini      = $ISISDATA/cassini
+  Chan1        = $ISISDATA/chan1
+  Chandrayaan1 = $ISISDATA/chandrayaan1
+  Clementine1  = $ISISDATA/clementine1
+  Clipper      = $ISISDATA/../datalocal/clipper
+  Control      = $ISISDATA/control
+  Dawn         = $ISISDATA/dawn
+  Galileo      = $ISISDATA/galileo
+  Hayabusa     = $ISISDATA/hayabusa
+  Hayabusa2    = $ISISDATA/hayabusa2
+  Juno         = $ISISDATA/juno
+  Kaguya       = $ISISDATA/kaguya
+  Lo           = $ISISDATA/lo
+  Lro          = $ISISDATA/lro
+  Mariner10    = $ISISDATA/mariner10
+  Mer          = $ISISDATA/mer
+  Mex          = $ISISDATA/mex
+  Messenger    = $ISISDATA/messenger
+  Mgs          = $ISISDATA/mgs
+  Mro          = $ISISDATA/mro
+  Near         = $ISISDATA/near
+  NewHorizons  = $ISISDATA/newhorizons
+  Odyssey      = $ISISDATA/odyssey
+  OsirisRex    = $ISISDATA/../datalocal/osirisrex
+  Rolo         = $ISISDATA/rolo
+  Rosetta      = $ISISDATA/rosetta
+  Smart1       = $ISISDATA/smart1
+  Tgo          = $ISISDATA/tgo
+  Viking1      = $ISISDATA/viking1
+  Viking2      = $ISISDATA/viking2
+  Voyager1     = $ISISDATA/voyager1
+  Voyager2     = $ISISDATA/voyager2
   Temporary    = .
 EndGroup
 

diff --git a/isis/TestPreferences b/isis/TestPreferences
@@ -175,42 +175,42 @@ EndGroup
 ########################################################
 
 Group = DataDirectory
-  Apollo15     = $ISIS3DATA/apollo15
-  Apollo16     = $ISIS3DATA/apollo16
-  Apollo17     = $ISIS3DATA/apollo17
-  Base         = $ISIS3DATA/base
-  Cassini      = $ISIS3DATA/cassini
-  Chan1        = $ISIS3DATA/chan1
-  Chandrayaan1 = $ISIS3DATA/chandrayaan1
-  Clementine1  = $ISIS3DATA/clementine1
-  Clipper      = $ISIS3DATA/../datalocal/clipper
-  Control      = $ISIS3DATA/control
-  Dawn         = $ISIS3DATA/dawn
-  Galileo      = $ISIS3DATA/galileo
-  Hayabusa     = $ISIS3DATA/hayabusa
-  Hayabusa2    = $ISIS3DATA/hayabusa2
-  Juno         = $ISIS3DATA/juno
-  Kaguya       = $ISIS3DATA/kaguya
-  Lo           = $ISIS3DATA/lo
-  Lro          = $ISIS3DATA/lro
-  Mariner10    = $ISIS3DATA/mariner10
-  Mer          = $ISIS3DATA/mer
-  Mex          = $ISIS3DATA/mex
-  Messenger    = $ISIS3DATA/messenger
-  Mgs          = $ISIS3DATA/mgs
-  Mro          = $ISIS3DATA/mro
-  Near         = $ISIS3DATA/near
-  NewHorizons  = $ISIS3DATA/newhorizons
-  Odyssey      = $ISIS3DATA/odyssey
-  OsirisRex    = $ISIS3DATA/../datalocal/osirisrex
-  Rolo         = $ISIS3DATA/rolo
-  Rosetta      = $ISIS3DATA/rosetta
-  Smart1       = $ISIS3DATA/smart1
-  Tgo          = $ISIS3DATA/tgo
-  Viking1      = $ISIS3DATA/viking1
-  Viking2      = $ISIS3DATA/viking2
-  Voyager1     = $ISIS3DATA/voyager1
-  Voyager2     = $ISIS3DATA/voyager2
+  Apollo15     = $ISISDATA/apollo15
+  Apollo16     = $ISISDATA/apollo16
+  Apollo17     = $ISISDATA/apollo17
+  Base         = $ISISDATA/base
+  Cassini      = $ISISDATA/cassini
+  Chan1        = $ISISDATA/chan1
+  Chandrayaan1 = $ISISDATA/chandrayaan1
+  Clementine1  = $ISISDATA/clementine1
+  Clipper      = $ISISDATA/../datalocal/clipper
+  Control      = $ISISDATA/control
+  Dawn         = $ISISDATA/dawn
+  Galileo      = $ISISDATA/galileo
+  Hayabusa     = $ISISDATA/hayabusa
+  Hayabusa2    = $ISISDATA/hayabusa2
+  Juno         = $ISISDATA/juno
+  Kaguya       = $ISISDATA/kaguya
+  Lo           = $ISISDATA/lo
+  Lro          = $ISISDATA/lro
+  Mariner10    = $ISISDATA/mariner10
+  Mer          = $ISISDATA/mer
+  Mex          = $ISISDATA/mex
+  Messenger    = $ISISDATA/messenger
+  Mgs          = $ISISDATA/mgs
+  Mro          = $ISISDATA/mro
+  Near         = $ISISDATA/near
+  NewHorizons  = $ISISDATA/newhorizons
+  Odyssey      = $ISISDATA/odyssey
+  OsirisRex    = $ISISDATA/../datalocal/osirisrex
+  Rolo         = $ISISDATA/rolo
+  Rosetta      = $ISISDATA/rosetta
+  Smart1       = $ISISDATA/smart1
+  Tgo          = $ISISDATA/tgo
+  Viking1      = $ISISDATA/viking1
+  Viking2      = $ISISDATA/viking2
+  Voyager1     = $ISISDATA/voyager1
+  Voyager2     = $ISISDATA/voyager2
   Temporary    = .
 EndGroup
 

diff --git a/isis/cmake/RunMakeFileTest.cmake b/isis/cmake/RunMakeFileTest.cmake
@@ -75,6 +75,6 @@ endfunction()
 # - Just redirect to the main function call.
 
 # Needed for IsisPreferences and other test data to be found
-set(ENV{ISIS3DATA} "${DATA_ROOT}")
+set(ENV{ISISDATA} "${DATA_ROOT}")
 
 run_app_makefile_test(${MAKEFILE} ${INPUT_DIR} ${OUTPUT_DIR} ${TRUTH_DIR} ${BIN_DIR})
diff --git a/isis/cmake/RunUnitTest.cmake b/isis/cmake/RunUnitTest.cmake
@@ -4,11 +4,11 @@
 #=========================================================================
 
 # Multiple ISIS files need to find things relative to ISISROOT
-#  and ISIS3DATA so make sure those are set.
-set(ENV{ISIS3DATA} "${DATA_ROOT}")
+#  and ISISDATA so make sure those are set.
+set(ENV{ISISDATA} "${DATA_ROOT}")
 
 message(STATUS "ISISROOT = $ENV{ISISROOT}")
-message(STATUS "ISIS3DATA = $ENV{ISIS3DATA}")
+message(STATUS "ISISDATA = $ENV{ISISDATA}")
 
 # Set up a file for program output
 set(outputFile "${TEST_PROG}.output")

diff --git a/isis/cmake/TestSetup.cmake b/isis/cmake/TestSetup.cmake
@@ -52,7 +52,7 @@ macro(add_makefile_test_target testName makeFile inputDir outputDir truthDir)
            -DMAKEFILE=${makeFile}
            -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}
            -DCODE_ROOT=${PROJECT_SOURCE_DIR}
-           -DDATA_ROOT=$ENV{ISIS3DATA}
+           -DDATA_ROOT=$ENV{ISISDATA}
            -DINPUT_DIR=${inputDir}
            -DOUTPUT_DIR=${outputDir}
            -DTRUTH_DIR=${truthDir}
@@ -76,7 +76,7 @@ macro(add_unit_test_target testFile truthFile labels)
            COMMAND ${CMAKE_COMMAND}
            -DTEST_PROG=${fullTestPath}
            -DTRUTH_FILE=${truthFile}
-           -DDATA_ROOT=$ENV{ISIS3DATA}
+           -DDATA_ROOT=$ENV{ISISDATA}
            -DCODE_ROOT=${PROJECT_SOURCE_DIR}
            -P ${thisFolder}/RunUnitTest.cmake)
   set_tests_properties(${testName} PROPERTIES LABELS "unit;${labels}")

diff --git a/isis/scripts/isis3Startup.csh b/isis/scripts/isis3Startup.csh
@@ -39,11 +39,11 @@ if ($?ISISROOT == 0) then
   setenv ISISROOT /usgs/pkgs/isis3/install
 endif
 
-# Initialize the ISIS3DATA environment variable
+# Initialize the ISISDATA environment variable
 if (-d $ISISROOT/../data) then
-  setenv ISIS3DATA $ISISROOT/../data
+  setenv ISISDATA $ISISROOT/../isis_data
 else
-  setenv ISIS3DATA /usgs/cpkgs/isis3/data
+  setenv ISISDATA /usgs/cpkgs/isis3/isis_data
 endif
 
 # Initialize the ISIS3TESTDATA environment variable

diff --git a/isis/scripts/isis3Startup.py b/isis/scripts/isis3Startup.py
@@ -15,11 +15,11 @@ def setisis():
     ISISROOT = "/usgs/pkgs/isis3/install"
     os.environ['ISISROOT'] = ISISROOT
 
-  #Check for the ISIS3DATA directory. If it does not exist use a default
+  #Check for the ISISDATA directory. If it does not exist use a default
   if os.path.exists("%s/../data" % (ISISROOT)):
-    os.environ['ISIS3DATA'] = "%s/../data" % (ISISROOT)
+    os.environ['ISISDATA'] = "%s/../isis_data" % (ISISROOT)
   else:
-    os.environ['ISIS3DATA'] = "/usgs/cpkgs/isis3/data"
+    os.environ['ISISDATA'] = "/usgs/cpkgs/isis3/isis_data"
 
   #Check for the ISIS3TESTDATA directory. If it does not exist use a default
   if os.path.exists("%s/../testData" % (ISISROOT)):

diff --git a/isis/scripts/isis3Startup.sh b/isis/scripts/isis3Startup.sh
@@ -17,11 +17,11 @@ if [ ! "$ISISROOT" ]; then
 fi
 
 if [ -d $ISISROOT/../data ]; then
-  ISIS3DATA=$ISISROOT/../data
+  ISISDATA=$ISISROOT/../isis_data
 else
-  ISIS3DATA=/usgs/cpkgs/isis3/data
+  ISISDATA=/usgs/cpkgs/isis3/isis_data
 fi
-export ISIS3DATA
+export ISISDATA
 
 # Do not export when used by outside groups
 if [ -d $ISISROOT/../testData ]; then

diff --git a/isis/scripts/isis3VarInit.py b/isis/scripts/isis3VarInit.py
@@ -17,7 +17,7 @@
 #
 #
 #   Description:  This program builds the shell scripts that define the
-#       ISISROOT/ISIS3DATA/ISIS3TESTDATA environment variables for the user
+#       ISISROOT/ISISDATA/ISIS3TESTDATA environment variables for the user
 #       when the ISIS3 conda environment is activated, and clean up when it is
 #       deactivated.
 #
@@ -116,14 +116,14 @@ def mkdir(p):
 activate_scripts = ["""
                     #!/usr/bin/env sh
                     export ISISROOT={}
-                    export ISIS3DATA={}
+                    export ISISDATA={}
                     export ISIS3TESTDATA={}
                     export ALESPICEROOT={}
                     """,
                     """
                     #!/usr/bin/env csh
                     setenv ISISROOT {}
-                    setenv ISIS3DATA {}
+                    setenv ISISDATA {}
                     setenv ISIS3TESTDATA {}
                     setenv ALESPICEROOT {}
 
@@ -132,7 +132,7 @@ def mkdir(p):
                     """
                     #!/usr/bin/env fish
                     set -gx ISISROOT {}
-                    set -gx ISIS3DATA {}
+                    set -gx ISISDATA {}
                     set -gx ISIS3TESTDATA {}
                     set -gx ALESPICEROOT {}
                     """]
@@ -141,21 +141,21 @@ def mkdir(p):
 deactivate_scripts = ["""
                       #!/usr/bin/env sh
                       unset ISISROOT
-                      unset ISIS3DATA
+                      unset ISISDATA
                       unset ISIS3TESTDATA
                       unset ALESPICEROOT
                       """,
                       """
                       #!/usr/bin/env csh
                       unsetenv ISISROOT
-                      unsetenv ISIS3DATA
+                      unsetenv ISISDATA
                       unsetenv ISIS3TESTDATA
                       unsetenv ALESPICEROOT
                       """,
                       """
                       #!/usr/bin/env fish
                       set -e ISISROOT
-                      set -e ISIS3DATA
+                      set -e ISISDATA
                       set -e ISIS3TESTDATA
                       set -e ALESPICEROOT
                       """]