Changeset 7197 for anuga_core/source

Timestamp:

Jun 12, 2009, 3:33:59 PM (16 years ago)

Author:

rwilson

Message:

Changes to caching - use ANUGADATA environment variable, not INUNDATIONHOME.

File:

• anuga_core/source/anuga/caching/caching.py (modified) (1 diff)

anuga_core/source/anuga/caching/caching.py

@@ -55 +55 @@
 
 cache_dir = '.python_cache'
+
 # Make default caching directory name
-#
+# We are changing the 'data directory' environment variable from
+# INUNDATIONHOME to ANUGADATA - this gives a changeover.
 if unix:
-  homedir = getenv('INUNDATIONHOME')
-  if homedir is None:
-    homedir = '~'
-  else:
-    homedir = homedir + os.sep + '.cache'
-    # Since homedir will be a group area, individually label the caches
-    user = getenv('LOGNAME')
-    if user is not None:
-      cache_dir += '_' + user
-    
-  CR = '\n'
+    homedir = getenv('ANUGADATA')
+    if not homedir:
+        homedir = getenv('INUNDATIONHOME')
+
+    if not homedir:
+        homedir = '~'
+    else:
+        # Since homedir will be a group area, individually label the caches
+        user = getenv('LOGNAME')
+        if not user:
+            cache_dir += '_' + user
+    
+    CR = '\n'
 else:
-  homedir = 'c:'
-  CR = '\r\n'  #FIXME: Not tested under windows
-  
-cachedir = homedir + os.sep + cache_dir + os.sep
+    homedir = 'c:'
+    CR = '\r\n'  #FIXME: Not tested under windows
+  
+cachedir = os.path.join(homedir, cache_dir)
 
 # -----------------------------------------------------------------------------