Changeset 2024 for trunk/source/cpu.cpp

Timestamp:

05/05/08 08:48:31 (8 months ago)

Author:

peter

Message:

source/cpu.cpp:

Improve diagnostic of failure to open data file.

Files:

• trunk/source/cpu.cpp (modified) (1 diff)

trunk/source/cpu.cpp

@@ -480 +480 @@
         if( handle == NULL && lgAbort )
         {
-                // failed on very first open -> probably path is not correct
                 fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname );
-                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\n");
-                fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n");
-                fprintf( ioQQQ, "or use the shell command \"set CLOUDY_DATA_PATH=path\" to set the\n");
-                fprintf( ioQQQ, "path from a command prompt.\n\n");
-                cpu.printDataPath();
-
-                fprintf( ioQQQ, " These are all the paths I tried:\n", fname );
-                for( vector<string>::size_type i=begin; i < end; ++i )
-                {
-                        if( cpu.chSearchPath[i].length() > 0 )
-                                fprintf( ioQQQ, "   ==%s==\n", cpu.chSearchPath[i].c_str() );
-                        else
-                                fprintf( ioQQQ, "   ==<local directory>==\n" );
+                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\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();
+                }
+                else
+                {
+                        // 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 )
+                        {
+                                if( cpu.chSearchPath[i].length() > 0 )
+                                        fprintf( ioQQQ, "   ==%s==\n", cpu.chSearchPath[i].c_str() );
+                                else
+                                        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");