Changeset 3079 for branches

Timestamp:

05/18/11 19:47:02 (12 months ago)

Author:

pkwi

Message:

Implementation of unsigned long long int for ncount instead of double. Suspected cause of problems with "hanging" simulations above apx. 1e11.

mcrun --test produces an OK on my machine, but please consider if this could cause breaks elsewhere?

Location:

branches/mcstas-1.x/lib/share

Files:

• mcstas-r.c (modified) (6 diffs)
• mcstas-r.h (modified) (1 diff)

branches/mcstas-1.x/lib/share/mcstas-r.c

@@ -742 +742 @@
 /* Number of neutron histories to simulate. */
 #ifndef DANSE
-mcstatic double mcncount             = 1e6;
-mcstatic double mcrun_num            = 0;
+mcstatic unsigned long long int mcncount             = 1e6;
+mcstatic unsigned long long int mcrun_num            = 0;
 #endif
 
@@ -923 +923 @@
 
 /* mcset_ncount: set total number of neutrons to generate */
-void mcset_ncount(double count)
+void mcset_ncount(unsigned long long int count)
 {
   mcncount = count;
@@ -929 +929 @@
 
 /* mcget_ncount: get total number of neutrons to generate */
-double mcget_ncount(void)
+unsigned long long int mcget_ncount(void)
 {
   return mcncount;
@@ -935 +935 @@
 
 /* mcget_run_num: get curent number of neutrons in TRACE */
-double mcget_run_num(void)
+unsigned long long int mcget_run_num(void)
 {
   return mcrun_num;
@@ -4872 +4872 @@
 mcsetn_arg(char *arg)
 {
-  mcset_ncount(strtod(arg, NULL));
+  mcset_ncount((long long int) strtod(arg, NULL));
 }
 
@@ -5281 +5281 @@
   else
   {
-    printf("%.2f %% (%10.1f/%10.1f)\n", 100*mcget_run_num()/mcget_ncount(), mcget_run_num(), mcget_ncount());
+    printf("%.2f %% (%10.1f/%10.1f)\n", 100.0*mcget_run_num()/mcget_ncount(), 1.0*mcget_run_num(), 1.0*mcget_ncount());
   }
   t0 = (time_t)mcstartdate;

branches/mcstas-1.x/lib/share/mcstas-r.h

@@ -517 +517 @@
  */
 
-void   mcset_ncount(double count);
-double mcget_ncount(void);
-double mcget_run_num(void);
+void   mcset_ncount(unsigned long long int count);
+unsigned long long int mcget_ncount(void);
+unsigned long long int mcget_run_num(void);
 double mcdetector_out(char *cname, double p0, double p1, double p2, char *filename);
 double mcdetector_out_0D(char *t, double p0, double p1, double p2, char *c, Coords pos);