Changeset 3259

Timestamp:

01/26/12 21:06:42 (4 months ago)

Author:

erkn

Message:

mccode-r: fixed MPI8sum(mcrun_num)
monitor_nD: minor stuff

Location:

branches/mcxtrace-1.0

Files:

• lib/share/mccode-r.c (modified) (2 diffs)
• lib/share/monitor_nd-lib.c (modified) (2 diffs)
• nlib/monitors/Monitor_nD.comp (modified) (1 diff)

branches/mcxtrace-1.0/lib/share/mccode-r.c

@@ -783 +783 @@
       "info [ \"URL:    http://www.mccode.org/\"\n"
       "       \"Editor: %USR\"\n"
-      "       \"Creator:%SRC simulation (McStas)\"\n"
+      "       \"Creator:%SRC simulation (" MCCODE_STRING ")\"\n"
       "       \"Date:   Simulation started (%DATL) %DAT\"\n"
       "       \"File:   %FIL\" ]\n}\n"
@@ -4898 +4898 @@
  /* merge run_num from MPI nodes */
   if (mpi_node_count > 1) {
-    double ncount=(double)mcrun_num;
-    mc_MPI_Sum(&ncount, 1);
-    mcrun_num = (long long)ncount;
+  double mcrun_num_double = (double)mcrun_num;
+  mc_MPI_Sum(&mcrun_num_double, 1);
+  mcrun_num = (unsigned long long)mcrun_num_double;
   }
 #endif

branches/mcxtrace-1.0/lib/share/monitor_nd-lib.c

@@ -358 +358 @@
             if (Vars->Flag_per_st) {
               if (Vars->Flag_Auto_Limits)
-                strncat(Set_Vars_Coord_Label, "/st", 30);
+                strncat(Set_Vars_Coord_Label, "/sr", 30);
             }
             if (XY > 1 && Vars->Coord_Number)
@@ -573 +573 @@
       if (Vars->Flag_per_st) {
         if (Vars->Flag_Auto_Limits)
-          strncat(Vars->Coord_Label[0], "/st", 30);
+          strncat(Vars->Coord_Label[0], "/sr", 30);
         else
           printf("Monitor_nD: %s: Flux per steradian requires Auto limits mode\n"

branches/mcxtrace-1.0/nlib/monitors/Monitor_nD.comp

@@ -288 +288 @@
   if (strstr(Vars.option, "auto") && mpi_node_count > 1)
     printf("Monitor_nD: %s is using automatic limits option 'auto' together with MPI.\n"
-           "WARNING     this will probably create incorrect output\n", NAME_CURRENT_COMP);
+           "WARNING     this may create incorrect distributions (but integrated flux will be right).\n", NAME_CURRENT_COMP);
 #endif
 %}