Changeset 2079 for branches/newmole/source/atmdat_lamda.cpp

Timestamp:

05/17/08 09:51:43 (8 months ago)

Author:

rjrw

Message:

Merged from trunk r2022:2078

Files:

• branches/newmole/source/atmdat_lamda.cpp (modified) (2 diffs)

branches/newmole/source/atmdat_lamda.cpp

@@ -113 +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 )
@@ -342 +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 )
                 {