r23256 - /branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py -- May 20, 2014 - 13:47

Author: bugman
Date: Tue May 20 13:47:33 2014
New Revision: 23256

URL: http://svn.gna.org/viewcvs/relax?rev=23256&view=rev
Log:
Reverted r23252 as this uses far, far too much RAM, and there is a better 
solution.

The command used was:
svn merge -r23252:r23251 .

.....
  r23252 | bugman | 2014-05-20 11:48:11 +0200 (Tue, 20 May 2014) | 7 lines
  Changed paths:
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
  
  Large increase in accuracy of the RDC and PCS averaging.
  
  This is for the CaM frame order test data generation base script.  By 
storing the RDCs and PCSs in
  numpy.float128 arrays, a 64-bit system is required, and then using 
numpy.average(), the average
  value can be calculated with a much higher accuracy.  As N becomes larger, 
the averaging introduces
  greater and greater amounts of truncation artifacts.  So this change 
alleviates this.  However a lot
  more RAM is now required.
.....


Modified:
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py?rev=23256&r1=23255&r2=23256&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
        (original)
+++ 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
        Tue May 20 13:47:33 2014
@@ -24,13 +24,13 @@
 
 # Python module imports.
 from math import pi
-from numpy import array, average, cross, dot, eye, float32, float64, inner, 
tensordot, transpose, zeros
+from numpy import array, cross, dot, eye, float32, float64, inner, 
tensordot, transpose, zeros
 from numpy.linalg import norm
 from os import getcwd, sep
 import sys
 
 # relax module imports.
-from lib.check_types import float128, is_float
+from lib.check_types import is_float
 from lib.frame_order.format import print_frame_order_2nd_degree
 from lib.geometry.angles import wrap_angles
 from lib.geometry.coord_transform import cartesian_to_spherical
@@ -134,9 +134,8 @@
 
             # Initialise the PCS structure.
             spin.pcs = {}
-            spin.pcs_array = {}
             for tag in self._tensors:
-                spin.pcs_array[tag] = zeros(self.N, float128)
+                spin.pcs[tag] = 0.0
 
             # Pack the spin containers and positions.
             spins.append(spin)
@@ -192,7 +191,7 @@
 
                 # Store the values.
                 for j in range(len(spins)):
-                    spins[j].pcs_array[self._tensors[i]][global_index] = 
pcss[j, j]
+                    spins[j].pcs[self._tensors[i]] += pcss[j, j]
 
         # Print out.
         sys.stdout.write('\n\n')
@@ -204,14 +203,10 @@
         for tag in self._tensors:
             # Average.
             for spin in spin_loop():
-                spin.pcs[tag] = average(spin.pcs_array[tag])
+                spin.pcs[tag] = spin.pcs[tag] / self.N
 
             # Save.
             self.interpreter.pcs.write(align_id=tag, file='pcs_%s.txt'%tag, 
dir=self.save_path, force=True)
-
-        # Delete the large data structures to save RAM.
-        for spin in spin_loop():
-            del spin.pcs_array
 
 
     def _calculate_rdc(self):
@@ -238,9 +233,8 @@
 
             # Initialise the RDC structure.
             interatom.rdc = {}
-            interatom.rdc_array = {}
             for tag in self._tensors:
-                interatom.rdc_array[tag] = zeros(self.N, float128)
+                interatom.rdc[tag] = 0.0
 
             # Pack the interatomic containers and vectors.
             interatoms.append(interatom)
@@ -301,7 +295,7 @@
 
                 # Store the values.
                 for j in range(len(interatoms)):
-                    interatoms[j].rdc_array[self._tensors[i]][global_index] 
= rdcs[j, j]
+                    interatoms[j].rdc[self._tensors[i]] += rdcs[j, j]
 
             # The frame order matrix component.
             self.daeg += kron_prod(total_R, total_R)
@@ -323,14 +317,10 @@
         for tag in self._tensors:
             # Average.
             for interatom in interatomic_loop():
-                interatom.rdc[tag] = average(interatom.rdc_array[tag])
+                interatom.rdc[tag] = interatom.rdc[tag] / self.N
 
             # Save.
             self.interpreter.rdc.write(align_id=tag, file='rdc_%s.txt'%tag, 
dir=self.save_path, force=True)
-
-        # Delete the large data structures to save RAM.
-        for interatom in interatomic_loop():
-            del interatom.rdc_array
 
 
     def _create_distribution(self):