Changeset 108 for palm/trunk/SOURCE/timestep.f90

Timestamp:

Aug 24, 2007 3:10:38 PM (17 years ago)

Author:

letzel

Message:

• Improved coupler: evaporation - salinity-flux coupling for humidity = .T.,

avoid MPI hangs when coupled runs terminate, add DOC/app/chapter_3.8;

• Optional calculation of km and kh from initial TKE e_init;
• Default initialization of km,kh = 0.00001 for ocean = .T.;
• Allow data_output_pr= q, wq, w"q", w*q* for humidity = .T.;
• Bugfix: Rayleigh damping for ocean fixed.

File:

• palm/trunk/SOURCE/timestep.f90 (modified) (3 diffs)

palm/trunk/SOURCE/timestep.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! modifications to terminate coupled runs
 ! 
 !
@@ -192 +193 @@
        IF ( dt_3d < ( 0.00001 * dt_max ) )  THEN
           stop_dt = .TRUE.
+
           IF ( myid == 0 )  THEN
              PRINT*,'+++ time_step: Time step has reached minimum limit.'
@@ -207 +209 @@
                     '  j=', w_max_ijk(2), '  i=', w_max_ijk(3)
           ENDIF
+!
+!--       In case of coupled runs inform the remote model of the termination 
+!--       and its reason, provided the remote model has not already been 
+!--       informed of another termination reason (terminate_coupled > 0) before.
+          IF ( coupling_mode /= 'uncoupled' .AND. terminate_coupled == 0 )  THEN
+             terminate_coupled = 2
+             CALL MPI_SENDRECV( &
+                  terminate_coupled,        1, MPI_INTEGER, myid,  0, &
+                  terminate_coupled_remote, 1, MPI_INTEGER, myid,  0, &
+                  comm_inter, status, ierr )
+          ENDIF
+
        ENDIF