Changeset 2061 for branches/c08_branch/source/stars.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/stars.cpp (modified) (15 diffs)

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 */