Changeset 2042 for branches/newmole/source/molcol.cpp

Timestamp:

05/11/08 12:53:42 (8 months ago)

Author:

rjrw

Message:

Change molecule structure to class

Make molecular column table easier to navigate (after Nick Abel's
suggestion).

Files:

• branches/newmole/source/molcol.cpp (modified) (1 diff)

branches/newmole/source/molcol.cpp

@@ -47 +47 @@
                 /*  print the molecular column densities */
                 int j=0;
+                long heavy=-1, lastheavy=0;
                 for( i=0; i < mole.num_calc; i++ )
                 {
                         if(mole.list[i]->location == NULL)
                         {
+                                lastheavy = heavy;
+                                heavy = mole.list[i]->heavyElem();
+                                if(j == 8 || heavy != lastheavy)
+                                {
+                                        fprintf( ioMEAN, "\n" );
+                                        if (heavy != lastheavy)
+                                        {
+                                                fprintf ( ioMEAN, "==== %-2.2s compounds ====\n",element_list[heavy]->label);
+                                        }
+                                        j = 0;
+                                }
                                 fprintf( ioMEAN, "   %-6.6s:", mole.list[i]->label );
                                 fprintf( ioMEAN, "%7.3f",log10(MAX2(SMALLFLOAT,mole.list[i]->column )));
                                 j++; 
-                                fixit();  /* Separate elemental chem more clearly -- would need to refactor mole.nElem */
-                                if( j == 8 )
-                                {
-                                        fprintf( ioMEAN, "\n" );
-                                        j = 0;
-                                }
                         }
                 }