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

Timestamp:

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

Author:

rjrw

Message:

Merged from trunk r2022:2078

Files:

• branches/newmole/source/atmdat_chianti.cpp (modified) (4 diffs)

branches/newmole/source/atmdat_chianti.cpp

@@ -18 +18 @@
         /* type is set to 0 for non chianti and 1 for chianti*/
         long int i,j,nMolLevs,intCollTran,intcollindex,ipLo,ipHi;
-        FILE *atmolLevDATA , *atmolTraDATA=NULL,*atmolEleColDATA=NULL;
+        FILE *atmolLevDATA , *atmolTraDATA=NULL,*atmolEleColDATA=NULL,*atmolProColDATA=NULL;
         realnum  fstatwt,fenergyK,fenergyWN,fWLAng,fenergy,feinsteina;
         double fScalingParam,fEnergyDiff,fGF,*xs,*spl,*spl2;
@@ -40 +40 @@
         long int *intNewIndex=NULL,*intOldIndex=NULL;
         int interror;
-        bool lgEneLevOrder;
+        bool lgProtonData=false,lgEneLevOrder;
 
         /*This is to identify where the fields start */
@@ -99 +99 @@
         if( trace.lgTrace )
                 fprintf( ioQQQ," moldat_readin opening %s:",chProColFilename);
+        /*We will set a flag here to indicate if the proton collision strengths are available */
+        if( ( atmolProColDATA = fopen( chProColFilename , "r" ) ) != NULL )
+        {
+                lgProtonData = true;
+        }
+        else
+        {
+                lgProtonData = false;
+        }
 
         nMolLevs = 0;
@@ -146 +155 @@
         for( intcollindex = 0; intcollindex<NUM_COLLIDERS; intcollindex++ )
         {
-                CollRatesArray[intNS][intcollindex] = (double**)MALLOC((nMolLevs)*sizeof(double*));
+                CollRatesArray[intNS][intcollindex] = NULL;
+        }
+        /*Allocating space just for the electron*/
+        CollRatesArray[intNS][0] = (double**)MALLOC((nMolLevs)*sizeof(double*));
+        for( ipHi = 0; ipHi<nMolLevs; ipHi++ )
+        {
+                CollRatesArray[intNS][0][ipHi] = (double*)MALLOC((unsigned long)(nMolLevs)*sizeof(double));
+                for( ipLo = 0; ipLo<nMolLevs; ipLo++)
+                {
+                        CollRatesArray[intNS][0][ipHi][ipLo] = 0.0;
+                }
+        }
+        /*Allocating space for the proton*/
+        if(lgProtonData)
+        {
+                CollRatesArray[intNS][1] = (double**)MALLOC((nMolLevs)*sizeof(double*));
                 for( ipHi = 0; ipHi<nMolLevs; ipHi++ )
                 {
-                        CollRatesArray[intNS][intcollindex][ipHi] = (double*)MALLOC((unsigned long)(nMolLevs)*sizeof(double));
+                        CollRatesArray[intNS][1][ipHi] = (double*)MALLOC((unsigned long)(nMolLevs)*sizeof(double));
                         for( ipLo = 0; ipLo<nMolLevs; ipLo++)
                         {
-                                CollRatesArray[intNS][intcollindex][ipHi][ipLo] = 0.0;
-                        }
-                }
-        }
-
+                                CollRatesArray[intNS][1][ipHi][ipLo] = 0.0;
+                        }
+                }
+        }
         /*Rewind the energy levels files*/
         if( fseek( atmolLevDATA , 0 , SEEK_SET ) != 0 )