Changeset 38d77eb for partem_p.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:

• partem_p.f (modified) (8 diffs)

partem_p.f

@@ -95 +95 @@
       trackID = 1
       odd = 1
-      write (*,*) 'Starting parallel tempering.'
-      write (*,*) 'parameters, ',switch,newsta,nmes,nswp,nmes,
+      write (logString, *) 'Starting parallel tempering.'
+      write (logString, *) 'parameters, ',switch,newsta,nmes,nswp,nmes,
      &            rep_id, num_rep, partem_comm, myrank
       call flush(6)
@@ -167 +167 @@
             do i=1,num_rep
                read(13,*) j,inode(i),intem(i),yol(i),e_minp(i),h_maxp(i)
-               write (*,*) "par_R.in:",i,j
+               write (logString, *) "par_R.in:",i,j
             end do
             jold=(iold/nmes)*num_rep
@@ -178 +178 @@
      &              ,idum1, idum2, idum3, e_min
      &              ,dummy, dummy
-               write (*,*) i
+               write (logString, *) i
                call flush(6)
             end do
@@ -197 +197 @@
       e_min = e_minp(rep_id+1)
       h_max = h_maxp(rep_id+1)
-      write (*,*) "E_min=",e_min," for ", rep_id + 1 
+      write (logString, *) "E_min=",e_min," for ", rep_id + 1 
       eol=energy()
       if(.not.newsta.and.abs(yol(rep_id + 1) - eol).gt.0.1) then
-         write(*,*) rep_id, ' Warning: yol(rep_id).ne.eol:'
-         write(*,*) rep_id, yol(rep_id + 1), eol
+         write (logString, *) rep_id, ' Warning: yol(rep_id).ne.eol:'
+         write (logString, *) rep_id, yol(rep_id + 1), eol
       endif
 !     Start of simulation
-      write (*,*) '[',rep_id, myrank, beta, partem_comm,
+      write (logString, *) '[',rep_id, myrank, beta, partem_comm,
      &            '] Energy before equilibration:', eol
 !     =====================Equilibration by canonical Metropolis
@@ -211 +211 @@
       end do
       CALL MPI_BARRIER(MPI_COMM_WORLD,IERR)
-      write (*,*) '[',rep_id,'] Energy after equilibration:', eol
+      write (logString, *) '[',rep_id,'] Energy after equilibration:', 
+     &   eol
       call flush(6)
 !     
@@ -222 +223 @@
          eol0 = eol
          if (myrank.eq.0.and.rep_id.eq.0) then
-            write (*,*) "Finished sweep", nsw
+            write (logString, *) "Finished sweep", nsw
             call flush(6)
          endif
@@ -494 +495 @@
      &                IERR)
                if (myrank.ne.0) then
-!                  write (*,*) '[', myrank,'] Missed', randomCount, 
+!                  write (logString, *) '[', myrank,'] Missed', randomCount, 
 !     &                            'random numbers.'
                   do i = 1, randomCount
                      rd = grnd()
-!                     write (*,*) '[', myrank,'] rd=', rd
+!                     write (logString, *) '[', myrank,'] rd=', rd
                   enddo
                endif
@@ -519 +520 @@
       e_final=energy()
       if (partem_comm.ne.MPI_COMM_NULL) then
-         write (*,*) rep_id, ' E_final', e_final
+         write (logString, *) rep_id, ' E_final', e_final
       endif
       eol0 = eol