Changeset 108 for palm/trunk/SOURCE/time_integration.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/time_integration.f90 (modified) (4 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -9 +9 @@
 ! random perturbation has to be added to the velocity fields also after the
 ! first substep
+! modifications to terminate coupled runs
+! 
 !
 ! Former revisions:
@@ -78 +80 @@
     CALL run_control
 
+!
+!-- Data exchange between coupled models in case that a call has been omitted 
+!-- at the end of the previous run of a job chain.
+    IF ( coupling_mode /= 'uncoupled' )  THEN
+!
+!--    In case of model termination initiated by the local model the coupler 
+!--    must not be called because this would again cause an MPI hang. 
+       DO WHILE ( time_coupling >= dt_coupling .AND. terminate_coupled == 0 )
+          CALL surface_coupler
+          time_coupling = time_coupling - dt_coupling
+       ENDDO
+    ENDIF
+
+
 #if defined( __dvrp_graphics )
 !
@@ -306 +322 @@
        IF ( coupling_mode /= 'uncoupled' )  THEN
           time_coupling = time_coupling + dt_3d
-          DO WHILE ( time_coupling >= dt_coupling )
+!
+!--       In case of model termination initiated by the local model 
+!--       (terminate_coupled > 0), the coupler must be skipped because it would 
+!--       cause an MPI intercomminucation hang.
+!--       If necessary, the coupler will be called at the beginning of the 
+!--       next restart run.
+          DO WHILE ( time_coupling >= dt_coupling .AND. terminate_coupled == 0 )
              CALL surface_coupler
              time_coupling = time_coupling - dt_coupling
@@ -327 +349 @@
 !--    Check, if restart is necessary (because cpu-time is expiring or
 !--    because it is forced by user) and set stop flag
-       CALL check_for_restart
+!--    This call is skipped if the remote model has already initiated a restart.
+       IF ( .NOT. terminate_run )  CALL check_for_restart
 
 !