Changeset 1921

Timestamp:

04/07/08 04:06:42 (9 months ago)

Author:

gary

Message:

merge R1920, LOCAL_DATA_PATH changed to CLOUDY_DATA_PATH

Location:

branches/c08_branch/source

Files:

• cpu.cpp (modified) (2 diffs)
• Makefile (modified) (1 diff)
• path.h (modified) (4 diffs)
• vs.txt (modified) (3 diffs)

branches/c08_branch/source/cpu.cpp

@@ -208 +208 @@
 
         /* if the environment variable was not set, the default set in path.h takes effect */
-        string chSearchPathRaw = ( path != NULL ) ? string( path ) : string( LOCAL_DATA_PATH );
+        string chSearchPathRaw = ( path != NULL ) ? string( path ) : string( CLOUDY_DATA_PATH );
 
 #       ifdef _WIN32
@@ -490 +490 @@
                         fprintf( ioQQQ, "the most likely reason is that the path has not been properly set.\n");
                         fprintf( ioQQQ, "Please have a look at the file path.h in the source directory.\n");
-                        fprintf( ioQQQ, "Check how the variable LOCAL_DATA_PATH is set - ");
+                        fprintf( ioQQQ, "Check how the variable CLOUDY_DATA_PATH is set - ");
                         fprintf( ioQQQ, "it should give the location of the data files I need.\n");
                         fprintf( ioQQQ, "These are the files in the data download from the web site.\n");

branches/c08_branch/source/Makefile

@@ -113 +113 @@
 
 cpu.o:
-        ${CXX} ${CXXFLAGS} -c -DLOCAL_DATA_PATH=\"${CDP}\" $<
+        ${CXX} ${CXXFLAGS} -c -DCLOUDY_DATA_PATH=\"${CDP}\" $<
 
 # an explicit -O0 is needed for some compilers like icc

branches/c08_branch/source/path.h

@@ -11 +11 @@
  * The location of these data on your system is specified by 
  *
- * #define LOCAL_DATA_PATH "XXXX" 
+ * #define CLOUDY_DATA_PATH "XXXX" 
  *
  * below, so the code is set up so that data will be automatically
@@ -22 +22 @@
  * The data path can also be set by the CLOUDY_DATA_PATH environment
  * variable, but it is generally easier to provide the permanent
- * location at compile time by editing LOCAL_DATA_PATH below.
+ * location at compile time by editing CLOUDY_DATA_PATH below.
  */
 
 /* The value below will be superseded if
  * specified by a compiler argument */
-#ifndef LOCAL_DATA_PATH 
+#ifndef CLOUDY_DATA_PATH 
 
 /* 
@@ -36 +36 @@
  * can enter as many paths as you like. One example could be: */
 
-#define LOCAL_DATA_PATH "/usr/local/cloudy/data:/home/user/cloudy/data"
+#define CLOUDY_DATA_PATH "/usr/local/cloudy/data:/home/user/cloudy/data"
 
 
@@ -44 +44 @@
  * NB - note that the backslash "\" always needs to be typed twice, as shown below: */
 
-// #define LOCAL_DATA_PATH "c:\\projects\\cloudy\\data;c:\\users\\gary\\data"
+// #define CLOUDY_DATA_PATH "c:\\projects\\cloudy\\data;c:\\users\\gary\\data"
 
 /* The // makes the above line of code a comment

branches/c08_branch/source/vs.txt

@@ -3 +3 @@
 set path
 project / trunk properties / c/c++ / preprocessor / preprocessor definiation - at after ;   
-LOCAL_DATA_PATH="\"c:\\projects\\cloudy\\trunk\\data\\\\\""
+CLOUDY_DATA_PATH="\"c:\\projects\\cloudy\\trunk\\data\\\\\""
 
 inline functions - use even in debug - factor of 2 speedup:
@@ -27 +27 @@
 in an error and a failed compile. You can also manage this from your code by 
 including a header file listing all the rules and their default state. You 
-can then upgrade warnings to errors or disable warnings using the #pragma directive.
+can then upgrade warnings to errors or disable warnings using the #pragma 
+directive.
 
 ================================
@@ -42 +43 @@
 and how it was called. Instrumentation involves inserting new code that 
 reports back the state of the application as it executes. As such it is much 
-more intrusive, but instrumentation profiling does illicit more information than sampling.
+more intrusive, but instrumentation profiling does illicit more information 
+than sampling.
 
 Application performance has become a major issue today. To help developers get an