Changeset 2030

Timestamp:

05/07/08 15:16:20 (1 week ago)

Author:

gary

Message:

Nemala's changes to chianti/lambda data base readd

Files:

• trunk/source/atmdat_chianti.cpp (modified) (4 diffs)
• trunk/source/atmdat_lamda.cpp (modified) (2 diffs)
• trunk/source/nemala2.cpp (modified) (3 diffs)

trunk/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;
-
+,*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;
-
+ProtonData=false,lg
-
-        /*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++ )
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                for( ipHi = 0; ipHi<nMolLevs; ipHi++ )
-                {
-intcollindex
+1
-                        for( ipLo = 0; ipLo<nMolLevs; ipLo++)
-                        {
-
-
-
-
-
+
+
+
+
-        /*Rewind the energy levels files*/
-        if( fseek( atmolLevDATA , 0 , SEEK_SET ) != 0 )

trunk/source/atmdat_lamda.cpp

@@ -113 +113 @@
-        for( intcollindex = 0; intcollindex <NUM_COLLIDERS; intcollindex++ )
-        {
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-        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 )
-                {

trunk/source/nemala2.cpp

@@ -162 +162 @@
-                                        if( lgSpeciesMolecule[i] )
-                                        {
-
-
-
+
+
+
+
+
+
-                                        }
-                                        /* atom or ion */
-                                        else
-                                        {
-
-
-
+
+
+
+
+
+
+
+
-                                        }
-
-                                        /* now get the corresponding excitation rate */
-
-
-
+
+
+
+
+
+
-                                }
-                        }
@@ -221 +232 @@
-                                for( intCollNo=0; intCollNo<NUM_COLLIDERS; intCollNo++ )
-                                {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                        }
@@ -369 +394 @@
-
-                                        /* population of lower level rel to ion, corrected for stim em */
+
-                                        atmolTrans[i][ipHi][ipLo].Emis->PopOpc =
-                                                atmolTrans[i][ipHi][ipLo].Lo->Pop - atmolTrans[i][ipHi][ipLo].Hi->Pop*