Changeset 2034 for branches/c08_branch/source/atmdat_lamda.cpp

Timestamp:

05/10/08 09:03:02 (6 months ago)

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

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

branches/c08_branch/source/atmdat_lamda.cpp

@@ -52 +52 @@
         ipLo = 0;
         j = 0;
-        while(intlnct < 5)
+        while(intlnct < 3)
         {
                 intlnct++;
@@ -61 +61 @@
                 }
         }
-
+        /*Extracting out the molecular weight*/
+        if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
+        {
+                fprintf( ioQQQ, " The data file %s is corrupted .\n",chEFilename);
+                cdEXIT(EXIT_FAILURE);
+        }
+        Species[intNS].fmolweight = (realnum)atof(chLine);
+
+        /*Discard this line*/
+        if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
+        {
+                fprintf( ioQQQ, " The data file %s is corrupted .\n",chEFilename);
+                cdEXIT(EXIT_FAILURE);
+        }
+        /*Reading in the number of energy levels*/
         if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
         {
@@ -99 +113 @@
         for( intcollindex = 0; intcollindex <NUM_COLLIDERS; intcollindex++ )
         {
-                CollRatesArray[intNS][intcollindex] = (double**)MALLOC((unsigned long)(ngMolLevs) * sizeof(double*));
-                for( ipHi = 0; ipHi<ngMolLevs; ipHi++ )
-                {
-                        CollRatesArray[intNS][intcollindex][ipHi] = (double*)MALLOC((unsigned long)(ngMolLevs) * sizeof(double));
-                        for( ipLo = 0; ipLo<ngMolLevs; ipLo++ )
-                        {
-                                CollRatesArray[intNS][intcollindex][ipHi][ipLo] = 0.0;
-                        }
-                }
-        }
+                CollRatesArray[intNS][intcollindex] = NULL;
+        }
+
 
         if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
@@ -224 +231 @@
                 /* don't need the energy in GHz, so throw it away. */
                 FFmtRead( chLine, &i, sizeof(chLine), &lgEOL );
-                fenergyK = (realnum)FFmtRead( chLine, &i, sizeof(chLine), &lgEOL );
-
+                fenergyK = (realnum)(((atmolStates[intNS][ipHi].energy) -(atmolStates[intNS][ipLo].energy))*T1CM);
                 ASSERT( index == intrtct + 1 );
 
@@ -329 +335 @@
                         TotalInsanity();
                 }
+                /*This is where we allocate memory if the collider exists*/
+                /*Needed to take care of the he collisions*/
+                CollRatesArray[intNS][intCollIndex] = (double**)MALLOC((unsigned long)(ngMolLevs) * sizeof(double*));
+                for( ipHi = 0; ipHi<ngMolLevs; ipHi++ )
+                {
+                        CollRatesArray[intNS][intCollIndex][ipHi] = (double*)MALLOC((unsigned long)(ngMolLevs) * sizeof(double));
+                        for( ipLo = 0; ipLo<ngMolLevs; ipLo++ )
+                        {
+                                CollRatesArray[intNS][intCollIndex][ipHi][ipLo] = 0.0;
+                        }
+                }
                 if(read_whole_line( chLine , (int)sizeof(chLine)  , atmolLevDATA ) == NULL )
                 {