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

Timestamp:

05/14/08 07:09:15 (8 months ago)

Author:

peter

Message:

Merging r2051 from mainline - improve error message for missing stellar grid.

Files:

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

branches/c08_branch/source/cpu.cpp

@@ -443 +443 @@
         string FileName( fname );
         vector<string>::size_type begin, end;
-        bool lgAbort = ( scheme == AS_DATA_ONLY || scheme == AS_DATA_LOCAL ||
+        bool lgAbort = ( scheme == AS_DATA_ONLY || scheme == AS_DATA_OPTIONAL || scheme == AS_DATA_LOCAL ||
                          scheme == AS_LOCAL_DATA || scheme == AS_LOCAL_ONLY );
 
@@ -450 +450 @@
         case AS_DATA_ONLY:
         case AS_DATA_ONLY_TRY:
+        case AS_DATA_OPTIONAL:
                 begin = 1;
                 end = cpu.chSearchPath.size()-1;
@@ -484 +485 @@
         if( handle == NULL && lgAbort )
         {
-                fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname );
+                if( scheme == AS_DATA_OPTIONAL )
+                        // presence is optional -> make warning less scary...
+                        fprintf( ioQQQ, "\nI could not open the data file %s\n\n", fname );
+                else
+                        fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname );
                 if( cpu.nFileDone == 0 || scheme == AS_DATA_ONLY )
                 {
@@ -505 +510 @@
                         // 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
+                        // if scheme == AS_DATA_OPTIONAL, this most likely is a stellar grid that is not installed.
                         fprintf( ioQQQ, "These are all the paths I tried:\n" );
                         for( vector<string>::size_type i=begin; i < end; ++i )
@@ -513 +519 @@
                                         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");
+                        // AS_DATA_OPTIONAL files should provide their own message (currently only stellar grids)
+                        if( scheme != AS_DATA_OPTIONAL )
+                        {
+                                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");