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

Timestamp:

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

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

• branches/c08_branch/source/helike_cs.cpp (modified) (2 diffs)

branches/c08_branch/source/helike_cs.cpp

@@ -10 +10 @@
-#include "conv.h"
-#include "dense.h"
-#include "heavy.h"
-#include "helike.h"
-#include "helike_cs.h"
-#include "hydro_vs_rates.h"
-#include "ionbal.h"
-#include "iso.h"
-#include "opacity.h"
@@ -1154 +1152 @@
-        global_s = s;
-        global_temp = temp;
-        global_collider_charge = 1.;
-        global_Collider = Collider;
+        global_collider_charge = ColliderCharge[Collider];
+        ASSERT( global_collider_charge > 0. );
-
-        /* no need to do this for h-like */