make suggested code improvements

GNUmakefile

@@ -180,8 +180,9 @@ endif
 #DEFINES += -DSCROLLBARERROR
 #DEFINES += -DFIXDENORMALS
 
-DEFINES += -DAMRVIS_CONFIG_FILEPATH='"${CONFIG_FILEPATH}"'
-
+ifdef CONFIG_FILEPATH
+  DEFINES += -DAMRVIS_CONFIG_FILEPATH='"${CONFIG_FILEPATH}"'
+endif
 ############################################### float fix
 # if we are using float override FOPTF which sets -real_size 64
 ifeq ($(PRECISION), FLOAT)

GlobalUtilities.H

@@ -8,8 +8,6 @@
 #include <AMReX_Box.H>
 #include <AMReX_Vector.H>
 
-#define CONFIG_FILE_PATH
-
 #include <list>
 #include <string>
 using std::list;
@@ -100,16 +98,5 @@ namespace AVGlobals {
   #define VSHOWVAL(verbose, val) { if(verbose) { \
 		   cout << #val << " = " << val << endl; } }
 
-  //std::string ConfigFilePath (){
-  //#ifdef CONFIG_FILE_PATH
-  //    return std::string(CONFIG_FILE_PATH);
-  //#else
-  //    return std::string("Unknown");
-  //#endif
-//}
-
-
 }  // end namespace AVGlobals
-
-
 #endif

GlobalUtilities.cpp

@@ -280,9 +280,11 @@ void AVGlobals::GetDefaults(const string &defaultsFile) {
 
   string fullDefaultsFile;
 
-  const char *homePath = getenv("HOME");
-  int homePathLen = strlen(getenv("HOME"));
-  string homePathStr(homePath, homePathLen);
+  //const char *homePath = getenv("HOME");
+  //int homePathLen = strlen(getenv("HOME"));
+  //string homePathStr(homePath, homePathLen);
+
+  const string homePathStr = getenv("HOME");
 
   std::vector<string> fullDefaultsFileList;
 #ifdef AMRVIS_CONFIG_FILEPATH
@@ -298,7 +300,6 @@ void AVGlobals::GetDefaults(const string &defaultsFile) {
   bool fileFound = false;
 
   for ( int i=0; i< fullDefaultsFileList.size(); ++i){
-      cout << fullDefaultsFileList[i] << "\n";
 
       defs.clear();  // must do this to clear the fail bit
       defs.open(fullDefaultsFileList[i].c_str());