Changeset 2139 for branches/newmole/source/atmdat_readin.cpp

Timestamp:

06/29/08 09:04:54 (6 months ago)

Author:

rjrw

Message:

Merged from trunk r2124:2137

Files:

• branches/newmole/source/atmdat_readin.cpp (modified) (5 diffs)

branches/newmole/source/atmdat_readin.cpp

@@ -538 +538 @@
 
                         /* this is new in c94.01 and returns nothing (0.) for most lines */
-                        TauLines[i].Coll.cs = (realnum)FFmtRead(chLine,&j,INPUT_LINE_LENGTH,&lgEOL);
+                        TauLines[i].Coll.col_str = (realnum)FFmtRead(chLine,&j,INPUT_LINE_LENGTH,&lgEOL);
 
                         /* finally increment i */
@@ -956 +956 @@
 
                         /*ASSERT( UTALines[i].Emis->Aul / sum_spon_auto <= 1. && UTALines[i].Aul / sum_spon_auto >= 0. );*/
-                        UTALines[i].Coll.cs = (realnum)MIN2(0., UTALines[i].Emis->Aul / sum_spon_auto - 1. );
+                        UTALines[i].Coll.col_str = (realnum)MIN2(0., UTALines[i].Emis->Aul / sum_spon_auto - 1. );
 
                         /* option to print UTAs */
@@ -1028 +1028 @@
                                 double frac_ioniz = Aauto/(Aul + Aauto);
                                 ASSERT( frac_ioniz >=0. &&  frac_ioniz <=1. );
-                                UTALines[i].Coll.cs = -(realnum)frac_ioniz;
+                                UTALines[i].Coll.col_str = -(realnum)frac_ioniz;
 
                                 /* save gf scanned from line */
@@ -1130 +1130 @@
                                 /* >>chng 03 feb 18, cs to negative of branching ratio */
                                 ASSERT( frac_relax >=0. &&  frac_relax <=1. );
-                                UTALines[i].Coll.cs = (realnum)(frac_relax-1.);
+                                UTALines[i].Coll.col_str = (realnum)(frac_relax-1.);
 #                               if 0
                                 fprintf(ioQQQ,"data set %li line %li %2s%2li\t%.4f\t%.3e\t%.3e\n",
@@ -1214 +1214 @@
                         /* >>chng 03 feb 18, cs to negative of br */
                         ASSERT( frac_relax >=0. &&  frac_relax <=1. );
-                        UTALines[i].Coll.cs = (realnum)(frac_relax-1.);
+                        UTALines[i].Coll.col_str = (realnum)(frac_relax-1.);
 
                         /* finally increment i */