Changeset 3204

Timestamp:

11/04/11 14:19:04 (7 months ago)

Author:

farhi

Message:

Iso_Sqw: fixed error when save_sqw=1 under Windows. Inactivate for this system.

Files:

• trunk/nlib/samples/Isotropic_Sqw.comp (modified) (4 diffs)

trunk/nlib/samples/Isotropic_Sqw.comp

@@ -195 +195 @@
 *                     of the next component/detector). Use 0 for full space.
 *                     This is only relevant for single scattering (order=1).
-* save_sqw:     [1] When set to 1, saves S(q), S(w) and S(q,w) as monitors.
+* save_sqw:     [1] When set to 1, saves S(q), S(w) and S(q,w) as monitors. This option 
+*                     is not available under Windows platforms.
 * weight:   [g/mol] atomic/molecular weight of material
 * density: [g/cm^3] density of material. V_rho=density/weight/1e24*N_A
@@ -1385 +1386 @@
   VarSqw.q_max     = (qmax > 0 ? qmax : 0);
   VarSqw.q_min     = (qmin > 0 ? qmin : 0);
+  
+#ifdef WIN32
+  save_sqw=0; /* SAVE Sqw generates mem error under windows (probably dynamic memory allocation) */
+#endif
 /* end INITIALIZE */
 %}
@@ -1979 +1984 @@
 %{
   int  k;
+  
+  /* save_sqw=0 forced under Windows 
+     SAVE Sqw generates mem error under windows (probably dynamic memory allocation) */
 
   if (VarSqw.s_coh > 0 || VarSqw.s_inc > 0)
@@ -1993 +2001 @@
     Data_sqw =  (k == 0 ? VarSqw.Data_coh : VarSqw.Data_inc);
 
-    if (save_sqw && Data_sqw.intensity) {
+    if (save_sqw && Data_sqw.intensity && Data_sqw.nb_q && Data_sqw.nb_w) {
       double SW[Data_sqw.nb_w];
       double SQW[Data_sqw.nb_q][Data_sqw.nb_w];