Changeset 3088 for branches

Timestamp:

06/03/11 17:45:51 (12 months ago)

Author:

pkwi

Message:

Fix of bugs related to change of type of ncount...

Location:

branches/mcstas-1.x

Files:

• CHANGES (modified) (2 diffs)
• lib/contrib/ISIS_moderator.comp (modified) (1 diff)
• lib/contrib/Source_multi_surfaces.comp (modified) (1 diff)
• lib/contrib/Virtual_mcnp_input.comp (modified) (2 diffs)
• lib/contrib/Virtual_tripoli4_input.comp (modified) (2 diffs)
• lib/contrib/Virtual_tripoli4_output.comp (modified) (1 diff)
• lib/misc/Progress_bar.comp (modified) (2 diffs)
• lib/share/monitor_nd-lib.c (modified) (2 diffs)
• lib/sources/ESS_moderator_long.comp (modified) (1 diff)
• lib/sources/ESS_moderator_short.comp (modified) (1 diff)
• lib/sources/Monitor_Optimizer.comp (modified) (1 diff)
• lib/sources/Source_Maxwell_3.comp (modified) (1 diff)
• lib/sources/Source_Optimizer.comp (modified) (4 diffs)
• lib/sources/Virtual_input.comp (modified) (2 diffs)

branches/mcstas-1.x/CHANGES

@@ -30 +30 @@
 * Modified by: PW, EF, EK April 2nd 2009: version 1.12a
 * Modified by: PW, EF, EK June/July 2010: version 1.12b
-* Modified by: PW May 2011: version 1.12c
+* Modified by: PW May-June 2011: version 1.12c (re-release)
 *
-* This file is part of McStas  version 1.12c, released May 24th, 2011.
+* This file is part of McStas  version 1.12c, released June 3rd, 2011.
 * It gives a 'changes' list from the beginning of the project
 *
 *******************************************************************************/
-Changes in McStas v1.12c, May 24rd, 2011
+Changes in McStas v1.12c, June 3rd, 2011
 
  McStas 1.12c is bugfix release.
@@ -45 +45 @@
   - Fix of a bug in the rectangular focusing routine, reported to mcstas-users by Markos Skoulatos, HZB
     (see http://mailman.mcstas.org/pipermail/mcstas-users/2010q4/000845.html)
-  - Introduction of --ncount as unsigned long long int in place of double. Could potentially lead simulations to "hang"
+  - Introduction of --ncount as unsigned long long int in place of double. Using double could potentially lead 
+    simulations to "hang". A re-release of McStas 1.12c was done due to bugs in components related to the new
+    type returned from mcget_ncount.
 
   Tools

branches/mcstas-1.x/lib/contrib/ISIS_moderator.comp

@@ -878 +878 @@
   }
   
-  Nsim=mcget_ncount();
+  Nsim=(double)mcget_ncount();
   Bcnt=0;
   // CH4 face 1 (north)

branches/mcstas-1.x/lib/contrib/Source_multi_surfaces.comp

@@ -287 +287 @@
 
   /*generate p_in*/
-  p_in = 1/mcget_ncount();
+  p_in = 1.0/mcget_ncount();
   
 %}

branches/mcstas-1.x/lib/contrib/Virtual_mcnp_input.comp

@@ -370 +370 @@
                n_count_extrapolated);
         if (n_count_extrapolated > mcget_ncount())
-          printf("    (will use only %.3g %% of file)\n", 100*mcget_ncount()/n_count_extrapolated);
+          printf("    (will use only %.3g %% of file)\n", 100.0*mcget_ncount()/n_count_extrapolated);
         else
           printf("    (limiting simulation to %g neutrons)\n", n_count_extrapolated*repeat_count);
@@ -527 +527 @@
     if (verbose) {
       printf("MCNP_input: %s: \n", NAME_CURRENT_COMP);
-      printf("                %g neutrons generated\n", mcget_ncount());
+      printf("                %g neutrons generated\n", (double)mcget_ncount());
     }
   }

branches/mcstas-1.x/lib/contrib/Virtual_tripoli4_input.comp

@@ -387 +387 @@
                n_count_extrapolated, (long)nbatch_extrapolated, nsize);
         if (n_count_extrapolated > mcget_ncount())
-          printf("    (will use only %.3g %% of file)\n", 100*mcget_ncount()/n_count_extrapolated);
+          printf("    (will use only %.3g %% of file)\n", 100.0*mcget_ncount()/n_count_extrapolated);
         else
           printf("    (limiting simulation to %g neutrons)\n", n_count_extrapolated*repeat_count);
@@ -582 +582 @@
     if (verbose) {
       printf("Tripoli4_input: %s: \n", NAME_CURRENT_COMP);
-      printf("                %g neutrons generated\n", mcget_ncount());
+      printf("                %g neutrons generated\n", (double)mcget_ncount());
       printf("                %d read batch (B) of intial %d neutrons (N)\n",nbatch, nsize);
       if (nbatch && nsize && intensity && !intensity_extrapolated)

branches/mcstas-1.x/lib/contrib/Virtual_tripoli4_output.comp

@@ -117 +117 @@
   fprintf(hfile,"TAILLE     Unknown\n");
   fprintf(hfile,"PARTICULE  NEUTRON\n");
-  fprintf(hfile,"INTENSITE  %g\n",mcget_ncount());
+  fprintf(hfile,"INTENSITE  %g\n",(double)mcget_ncount());
   fprintf(hfile,"SIMULATION PROTECTION\n");
   fprintf(hfile,"Following lines are: type, energy in MeV, position = (x,y,z) in cm, direction = (u,v,w), statistical weight\n");

branches/mcstas-1.x/lib/misc/Progress_bar.comp

@@ -80 +80 @@
     if (difftime(NowTime,StartTime) > 10) { /* wait 10 sec before writing ETA */
       EndTime = StartTime + (time_t)(difftime(NowTime,StartTime)
-                           *mcget_ncount()/ncount);
+                                     *(double)mcget_ncount()/ncount);
       IntermediateCnts = 0;
       fprintf(stdout, "\nTrace ETA ");
@@ -97 +97 @@
       || (percent && !minutes && ncount >= IntermediateCnts))   )
   {
-    fprintf(stdout, "%d ", (int)(ncount*100/mcget_ncount())); fflush(stdout);
+    fprintf(stdout, "%d ", (int)(ncount*100.0/mcget_ncount())); fflush(stdout);
     CurrentTime = NowTime;
     IntermediateCnts = ncount + percent*mcget_ncount()/100;

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

@@ -799 +799 @@
     if (mc_mn_Vars->Intermediate < 0) mc_mn_Vars->Intermediate = 0;
     if (mc_mn_Vars->Intermediate > 1) mc_mn_Vars->Intermediate /= 100;
-    mc_mn_Vars->IntermediateCnts = mc_mn_Vars->Intermediate*mcget_ncount();
+    mc_mn_Vars->IntermediateCnts = mc_mn_Vars->Intermediate*(double)mcget_ncount();
 
     if (mc_mn_Vars->Flag_Verbose)
@@ -1119 +1119 @@
     double  mc_mn_ratio;
 
-    mc_mn_ratio = 100*mcget_run_num()/mcget_ncount();
+    mc_mn_ratio = 100.0*mcget_run_num()/mcget_ncount();
     if (mc_mn_Vars->Flag_per_cm2 && mc_mn_Vars->area && mc_mn_Vars->Flag_Verbose)
       printf("Monitor_nD: %s: detector area is %g [cm2]\n",

branches/mcstas-1.x/lib/sources/ESS_moderator_long.comp

@@ -139 +139 @@
   w_mult = size*size*1.0e4;     /* source area correction */
   w_mult *= l_range;            /* wavelength range correction */
-  w_mult *= 1/mcget_ncount();   /* Correct for number of rays */
+  w_mult *= 1.0/mcget_ncount();   /* Correct for number of rays */
   w_mult *= 50.0/3.0;           /* Correct for baseline frequency setting */
 %}

branches/mcstas-1.x/lib/sources/ESS_moderator_short.comp

@@ -130 +130 @@
   w_mult = size*size*1.0e4;     /* source area correction */
   w_mult *= l_range;            /* wavelength range correction */
-  w_mult *= 1/mcget_ncount();  /* Flux value */
+  w_mult *= 1.0/mcget_ncount();  /* Flux value */
 %}
 

branches/mcstas-1.x/lib/sources/Monitor_Optimizer.comp

@@ -107 +107 @@
     && (Vars->Phase == DEFS->PHASE_GET_REF))
       {
-      if (((Vars->Reference_Counts > mcget_ncount()*Vars->dstep) && (Vars->Monitor_Counts >= Vars->nbins*10))
-      || (Vars->Monitor_Counts >= Vars->nbins*100) || (Vars->Reference_Counts > 2*mcget_ncount()*Vars->dstep))
+        if (((Vars->Reference_Counts > (double)mcget_ncount()*Vars->dstep) && (Vars->Monitor_Counts >= Vars->nbins*10))
+      || (Vars->Monitor_Counts >= Vars->nbins*100) || (Vars->Reference_Counts > 2.0*mcget_ncount()*Vars->dstep))
       {
         Vars->Phase_Counts_R = 0;        /* enough counts on monitor */

branches/mcstas-1.x/lib/sources/Source_Maxwell_3.comp

@@ -86 +86 @@
   w_mult = w_source*h_source*1.0e4;     /* source area correction */
   w_mult *= l_range;            /* wavelength range correction */
-  w_mult *= 1/mcget_ncount();   /* correct for # neutron rays */
+  w_mult *= 1.0/mcget_ncount();   /* correct for # neutron rays */
 
   if (w_source <0 || h_source < 0 || l_low <= 0 || l_high <= 0 || dist <= 0 || T1 <= 0 || T2 <= 0|| T3 <= 0) {

branches/mcstas-1.x/lib/sources/Source_Optimizer.comp

@@ -540 +540 @@
     if (Vars.nbins*10 < Vars.Phase_Counts) Vars.Phase_Counts_L = Vars.nbins*100;        /* need at least 10 counts per bin for Limits */
     else Vars.Phase_Counts_L = (long)(mcget_ncount() * Vars.dstep / 4);
-    Vars.Phase_Counts_R   = mcget_ncount();
-    Vars.Phase_Counts     = mcget_ncount();
+    Vars.Phase_Counts_R   = (double)mcget_ncount();
+    Vars.Phase_Counts     = (double)mcget_ncount();
     Vars.keep_target = Vars.dkeep;
     Vars.dkeep = 0.5;
@@ -1425 +1425 @@
       printf("Source_Optimizer: Vars.Normal_Monitor_Counts = %i, Vars.Total_Monitor_Counts = %i \n",Vars.Normal_Monitor_Counts, Vars.Total_Monitor_Counts);
       if (Vars.Normal_Monitor_Counts != 0)
-         printf("Source_Optimizer: Optimizer speedup : %.3g \n", (double)(Vars.Total_Monitor_Counts/(Vars.Normal_Monitor_Counts*mcget_ncount()/Vars.Phase_Counts)));
+        printf("Source_Optimizer: Optimizer speedup : %.3g \n", (double)(Vars.Total_Monitor_Counts/(Vars.Normal_Monitor_Counts*(double)mcget_ncount()/Vars.Phase_Counts)));
       printf("Source_Optimizer: Number of redirections : %i\n",Vars.n_redirect);
       printf("Counts : reference = %i, passing = %i, monitor = %.1f\n", Vars.Reference_Counts, Vars.Passing_Counts, Vars.Monitor_Counts);
@@ -1470 +1470 @@
        fprintf(hfile,"# ylabel: 'Counts'\n");
        if (Vars.Normal_Monitor_Counts != 0)
-                 fprintf(hfile,"# Optimizer speedup estimate: %.3g [Monitor Normal counts %i (extrapolated), Optimized %i ]\n", (double)(Vars.Total_Monitor_Counts/(Vars.Normal_Monitor_Counts*mcget_ncount()/Vars.Phase_Counts)),(long)ceil(Vars.Normal_Monitor_Counts*mcget_ncount()/Vars.Phase_Counts), Vars.Total_Monitor_Counts);
+         fprintf(hfile,"# Optimizer speedup estimate: %.3g [Monitor Normal counts %i (extrapolated), Optimized %i ]\n", (double)(Vars.Total_Monitor_Counts/(Vars.Normal_Monitor_Counts*(double)mcget_ncount()/Vars.Phase_Counts)),(long)ceil(Vars.Normal_Monitor_Counts*(double)mcget_ncount()/Vars.Phase_Counts), Vars.Total_Monitor_Counts);
 
        fprintf(hfile,"# Optimizer options: ");
@@ -1486 +1486 @@
        fprintf(hfile,"\n");
 
-       fprintf(hfile,"# Redirected neutrons: %i (%.2f %%)\n",Vars.n_redirect,(double)(100*Vars.n_redirect/mcget_ncount()));
+       fprintf(hfile,"# Redirected neutrons: %i (%.2f %%)\n",Vars.n_redirect,(double)(100.0*Vars.n_redirect/mcget_ncount()));
        fprintf(hfile,"# data: Optimized Source (%.1f Counts, Flux %.4g)\n", Vars.Monitor_Counts, Vars.Monitor_Flux);
        for (Vars.index = 0; Vars.index < Vars.nbins; Vars.index++)

branches/mcstas-1.x/lib/sources/Virtual_input.comp

@@ -312 +312 @@
   } else {
     double tmp;
-    tmp = mcget_ncount()/file_ncount;
+    tmp = (double)mcget_ncount()/file_ncount;
     if (fabs(rint(tmp)/tmp-1) > 0.02)
       printf("Warning: Virtual_input: %s: simulation finished in the middle of file '%s'\n"
@@ -318 +318 @@
              "               Intensities may be wrong.\n"
              "               Increase ncount value to %g or higher.\n",
-           NAME_CURRENT_COMP, file, mcget_ncount(), file_ncount, file_ncount*repeat_cnt);
+             NAME_CURRENT_COMP, file, (double)mcget_ncount(), file_ncount, file_ncount*repeat_cnt);
     if (mcget_ncount() < file_ncount*repeat_cnt)
       printf("Warning: Virtual_input: %s: not all source %s repetitions were generated.\n"