Changeset 38d77eb for mklist.f

Timestamp:

11/19/09 11:29:48 (14 years ago)

Author:

baerbaer <baerbaer@…>

Branches:

master

Children:

7137e5d

Parents:

32289cd

Message:

Redirected standard out to logString.

SMMP produced a lot of log messages. This became an issue when run in massively
parallel environments. I replaced all writes to standard out to a write to logString.
The next step is to pass this string to a function that writes the messages to a log
file according to their importance and the chosen log level.

git-svn-id: ​svn+ssh://svn.berlios.de/svnroot/repos/smmp/trunk@34 26dc1dd8-5c4e-0410-9ffe-d298b4865968

File:

• mklist.f (modified) (13 diffs)

mklist.f

@@ -45 +45 @@
       ntlms=nmsml(nml)
       if (ntlms.eq.0) then
-        write (*,'(a,i4)')
+        write (logString, '(a,i4)')
      &           ' mklist> No mov. sets defined in molecule #',nml
         nvwml(nml)=0
@@ -107 +107 @@
                 n2i=n2i+1
                 if (n2i.gt.mx2) then
-                  write (*,'(a,i3,2a)')  ' mklist> Molecule # ',nml,
+                  write(logString, '(a,i3,2a)')  ' mklist> Molecule # ',
+     &                nml,
      &                ': too many atoms bound to ',nmat(iob)
                   stop
@@ -125 +126 @@
                     n2i=n2i+1
                     if (n2i.gt.mx2) then
-                      write (*,'(a,i3,a)')  ' mklist> Molecule # '
+                      write (logString, '(a,i3,a)')  
+     &                         ' mklist> Molecule # '
      &                         ,nml,': too many atoms in list L2I'
                       stop
@@ -141 +143 @@
                 n2i=n2i+1
                 if (n2i.gt.mx2) then
-                  write (*,'(a,i3,2a)')  ' mklist> Molecule # '
+                  write (logString, '(a,i3,2a)')  ' mklist> Molecule # '
      &             ,nml,': too many atoms bound to ',nmat(iob)
                   stop
@@ -165 +167 @@
               n1i=n1i+1
               if (n1i.gt.mxbd) then
-                write (*,'(a,i3,2a)')  ' mklist> Molecule # ',nml,
+                write (logString, '(a,i3,2a)')  ' mklist> Molecule # ',
+     &              nml,
      &             ': too many atoms bound to ',nmat(ib)
                 stop
@@ -177 +180 @@
                   n2i=n2i+1
                   if (n2i.gt.mx2) then
-                    write (*,'(a,i3,2a)')  ' mklist> Molecule # ',nml,
-     &              ': too many atoms bound to branches of ',nmat(ib)
+                    write (logString, '(a,i3,2a)')  
+     &                 ' mklist> Molecule # ',nml,
+     &                 ': too many atoms bound to branches of ',nmat(ib)
                     stop
                   endif
@@ -194 +198 @@
                 n2i=n2i+1
                 if (n2i.gt.mx2) then
-                  write (*,'(a,i3,a)')  ' mklist> Molecule # ',nml,
-     &            ': too many atoms n list L2I '
+                  write (logString, '(a,i3,a)')  ' mklist> Molecule # ',
+     &               nml,
+     &               ': too many atoms n list L2I '
                   stop
                 endif
@@ -207 +212 @@
 ! ________________________________________ Current 2ND list -> VdW-interact.
               if ((nvw+n2nd).gt.mxvw) then
-                write (*,'(a,i4,a,i5)') ' mklist> Molecule # ',nml,
+                write (logString, '(a,i4,a,i5)') ' mklist> Molecule # ',
+     &            nml,
      &            ': Number of vdw-domains > ',mxvw
                 stop
@@ -273 +279 @@
 ! ____________________________________________ Summary
 !      do i=ifiat,ilaat
-!        write (*,'(3a,i5,a)') ' ######## atom ',nmat(i),'(',i,')'
+!        write (logString, '(3a,i5,a)') ' ######## atom ',nmat(i),'(',i,')'
 !        iv1=ivwat1(i)
 !        iv2=ivwat2(i)
 !        if (iv1.le.iv2) then
-!          write(*,'(a)') ' ---> vdW :'
+!          write (logString, '(a)') ' ---> vdW :'
 !          do j=iv1,iv2
-!            write (*,'(i5,a,i5)') lvwat1(j),'-',lvwat2(j)
+!            write (logString, '(i5,a,i5)') lvwat1(j),'-',lvwat2(j)
 !          enddo
 !        endif
@@ -285 +291 @@
 !        i42=i14at2(i)
 !        if (i41.le.i42) then
-!          write(*,'(a)') ' ---> 1-4 :'
-!          write(*,'(10i5)') (l14at(j),j=i41,i42)
+!          write (logString, '(a)') ' ---> 1-4 :'
+!          write (logString, '(10i5)') (l14at(j),j=i41,i42)
 !        endif
 !      enddo
@@ -292 +298 @@
       return
 
-    1 write (*,'(a,i4,a,i5)') ' mklist> Molecule # ',nml,
+    1 write (logString, '(a,i4,a,i5)') ' mklist> Molecule # ',nml,
      &                     ': Number of 1-4 interactions > ',mx14
       stop
@@ -312 +318 @@
       implicit none
       integer mx, j, n, j1, l1, j2, l2, i1, i2, ja, k
-
+      character(255) logString
       dimension l1(mx),l2(mx)
 
@@ -334 +340 @@
               n=n+1
               if (n.gt.mx) then
-                write (*,'(a)') ' quench> too many sets'
+                write (logString, '(a)') ' quench> too many sets'
                 stop
               endif