Changeset 2061

Timestamp:

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

Author:

peter

Message:

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

Location:

branches/c08_branch/source

Files:

• cpu.cpp (modified) (5 diffs)
• cpu.h (modified) (2 diffs)
• stars.cpp (modified) (15 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");

branches/c08_branch/source/cpu.h

@@ -132 +132 @@
 /** flag used as third parameter for open_data, indicates how data files are searched
  *  AS_DATA_ONLY: search only in the data directories, not in the current working directory (default)
+ *  AS_DATA_OPTIONAL: same as AS_DATA_ONLY, except that the precense of the file is optional
  *  AS_DATA_LOCAL: search in data directories first, then in the current working directory
  *  AS_LOCAL_DATA: search in the current working directory first, then in the data directories
@@ -137 +138 @@
  *  versions with _TRY appended have the same meaning, except that they don't abort */
 typedef enum { AS_DATA_ONLY_TRY, AS_DATA_LOCAL_TRY, AS_LOCAL_DATA_TRY, AS_LOCAL_ONLY_TRY,
-               AS_DATA_ONLY, AS_DATA_LOCAL, AS_LOCAL_DATA, AS_LOCAL_ONLY } access_scheme;
+               AS_DATA_ONLY, AS_DATA_OPTIONAL, AS_DATA_LOCAL, AS_LOCAL_DATA, AS_LOCAL_ONLY } access_scheme;
 
 FILE* open_data( const char* fname, const char* mode, access_scheme scheme=AS_DATA_ONLY );

branches/c08_branch/source/stars.cpp

@@ -78 +78 @@
  *               * char names[MDIM][MNAM+1] *
  *               * mpp telg[nmods]          *
- *               * realnum anu[ngrid]         *
- *               * realnum mod1[ngrid]        *
+ *               * realnum anu[ngrid]       *
+ *               * realnum mod1[ngrid]      *
  *               *    ...                   *
- *               * realnum modn[ngrid]        *
+ *               * realnum modn[ngrid]      *
  *               ============================
  *
@@ -506 +506 @@
         grid.name += chODFNew;
         grid.name += ".mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -603 +603 @@
 
         grid.name = ( lgHalo ? "Sc1_costar_halo.mod" : "Sc1_costar_solar.mod" );
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -720 +720 @@
 
         grid.name = FileName;
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -773 +773 @@
 
         grid.name = "kurucz79.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -823 +823 @@
 
         grid.name = "mihalas.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1179 +1179 @@
         else
                 grid.name = ( lgHalo ? "rauch_h-ca_halo.mod" : "rauch_h-ca_solar.mod" );
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1213 +1213 @@
         else
                 grid.name = ( lgHalo ? "rauch_h-ni_halo.mod" : "rauch_h-ni_solar.mod" );
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1243 +1243 @@
 
         grid.name = "rauch_pg1159.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1273 +1273 @@
 
         grid.name = "rauch_hydr.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1303 +1303 @@
 
         grid.name = "rauch_helium.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1333 +1333 @@
 
         grid.name = "rauch_h+he_3d.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1646 +1646 @@
                 grid.name += chMetalicity;
         grid.name += ".mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1753 +1753 @@
 
         grid.name = "kwerner.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */
@@ -1827 +1827 @@
 
         grid.name = "wmbasic.mod";
-        grid.scheme = AS_DATA_ONLY;
+        grid.scheme = AS_DATA_OPTIONAL;
         /* identification of this atmosphere set, used in
          * the Cloudy output, *must* be 12 characters long */