Changeset 2034 for branches/c08_branch/source/cpu.cpp

Timestamp:

05/10/08 09:03:02 (4 months ago)

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

• branches/c08_branch/source/cpu.cpp (modified) (5 diffs)

branches/c08_branch/source/cpu.cpp

@@ -256 +256 @@
         /* ~ is the unary bitwise complement - all bits flip */ 
         NewMask = ~NewMask;
-        /*lint -e534 ignore value returned by function (nothing to do with it)*/
         _controlfp( NewMask , _MCW_EM );
-        /*lint +e534 ignore value returned by function (nothing to do with it)*/
 
         /* this is the code for Linux PC (but not Linux alpha) to force crash */
@@ -426 +424 @@
 }
 
-/*lint -e740 unusual pointer cast */
 
 void t_cpu::printDataPath() const
@@ -483 +480 @@
         if( handle == NULL && lgAbort )
         {
-                if( cpu.nFileDone == 0 )
-                {
-                        // failed on very first open -> probably path is not correct
-                        fprintf( ioQQQ, "I Could not open the file %s\n", fname );
-                        fprintf( ioQQQ, "\n\nAlthough there may be other reasons you have received this error,\n");
-                        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 CLOUDY_DATA_PATH is set - ");
+                fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname );
+                if( cpu.nFileDone == 0 || scheme == AS_DATA_ONLY )
+                {
+                        // failed on very first open -> most likely path is not correct
+                        // failed on AS_DATA_ONLY -> CLOUDY_DATA_PATH may point to obsolete data dir
+                        fprintf( ioQQQ, "Although there may be other reasons you have received this error,\n");
+                        fprintf( ioQQQ, "the most likely are that the path has not been properly set\n");
+                        fprintf( ioQQQ, "or that the path points to an old version of the data.\n\n");
+                        fprintf( ioQQQ, "Please have a look at the file path.h in the source directory\n");
+                        fprintf( ioQQQ, "to check how the variable CLOUDY_DATA_PATH is set - \n");
                         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");
-                        fprintf( ioQQQ, "I bet that the path has not been set properly - ");
-                        fprintf( ioQQQ, "I could not find what I expected to find.\n");
+                        fprintf( ioQQQ, "These are the files in the data download from the web site.\n\n");
+                        fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n");
+                        fprintf( ioQQQ, "or use the shell command \"export CLOUDY_DATA_PATH=path\" to set the\n");
+                        fprintf( ioQQQ, "path from a bash command prompt.\n\n");
                         cpu.printDataPath();
-                        fprintf(ioQQQ, "Sorry.\n\n\n");
                 }
                 else
                 {
-                        fprintf( ioQQQ, " I Could not open the file %s on any of these paths:\n", fname );
+                        // failed on search including local directory -> most likely the file name
+                        // was mistyped on a compile command, or Cloudy is run in the wrong directory
+                        fprintf( ioQQQ, "These are all the paths I tried:\n" );
                         for( vector<string>::size_type i=begin; i < end; ++i )
                         {
@@ -508 +509 @@
                                         fprintf( ioQQQ, "   ==<local directory>==\n" );
                         }
-                }
+                        fprintf( ioQQQ, "\nAlthough there may be other reasons you have received this error,\n");
+                        fprintf( ioQQQ, "the most likely are that you mistyped the file name, or that you\n");
+                        fprintf( ioQQQ, "are running Cloudy in the wrong directory. If you are running a\n");
+                        fprintf( ioQQQ, "COMPILE command, this needs to be done in the data directory.\n\n");
+                        fprintf( ioQQQ, "Otherwise, please have a look at the file path.h in the source\n");
+                        fprintf( ioQQQ, "directory to check how the variable CLOUDY_DATA_PATH is set - \n");
+                        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\n");
+                        fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n");
+                        fprintf( ioQQQ, "or use the shell command \"export CLOUDY_DATA_PATH=path\" to set the\n");
+                        fprintf( ioQQQ, "path from a bash command prompt.\n\n");
+                }
+                fprintf(ioQQQ, "Sorry.\n\n\n");
                 cdEXIT(EXIT_FAILURE);
         }
@@ -640 +653 @@
                 return false;
 }
-
-/*lint +e740 unusual pointer cast */