Changeset 109 for palm

Timestamp:

Aug 28, 2007 3:26:47 PM (17 years ago)

Author:

letzel

Message:

• Bugfix in surface_coupler
• mrun: completely remove workaround on lcfimm to propagate environment

variables out to the nodes in coupled mode

Location:

palm/trunk

Files:

• SCRIPTS/mrun (modified) (2 diffs)
• SOURCE/check_parameters.f90 (modified) (2 diffs)
• SOURCE/surface_coupler.f90 (modified) (2 diffs)

palm/trunk/SCRIPTS/mrun

@@ -128 +128 @@
      #                     variables out to the nodes in coupled mode -disabled-
      # 13/08/07 - Marcus - start local restart jobs per ssh on lcfimm
+     # 28/08/07 - Marcus - completely remove workaround on lcfimm to propagate
+     #                     environment variables out to the nodes in coupled mode
 
  
@@ -2743 +2745 @@
              then
                 printf "\n\n"
-#               if [[ $host = lcfimm ]]
-#               then
-#                  /usr/bin/mpiexec  -comm pmi  -n $ii  a.out  $ROPTS
-#               else
-                   mpiexec  -machinefile hostfile  -n $ii  a.out  $ROPTS
-#               fi
+                mpiexec  -machinefile hostfile  -n $ii  a.out  $ROPTS
              else
                 ((  iii = ii / 2 ))
                 printf "\n      coupled run ($iii atmosphere, $iii ocean)"
                 printf "\n\n"
-#               if [[ $host = lcfimm ]]
-#               then
-#                   /usr/bin/mpiexec  -comm pmi  -n $iii  run_atmosphere  a.out  $ROPTS  &
-#                   /usr/bin/mpiexec  -comm pmi  -n $iii  run_ocean       a.out  $ROPTS  &
-#               else
-                   mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode atmosphere_to_ocean  a.out  $ROPTS  &
-                   mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode ocean_to_atmosphere  a.out  $ROPTS  &
-#               fi
+                mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode atmosphere_to_ocean  a.out  $ROPTS  &
+                mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode ocean_to_atmosphere  a.out  $ROPTS  &
                 wait
              fi

palm/trunk/SOURCE/check_parameters.f90

@@ -13 +13 @@
 ! cloud_physics = .T.)
 ! Rayleigh damping for ocean fixed.
+! Check and, if necessary, set default value for dt_coupling
 !
 ! Former revisions:
@@ -129 +130 @@
           ENDIF
           CALL local_stop
+       ENDIF
+       IF ( dt_coupling <= 0.0 )  THEN
+          CALL MPI_SEND( dt_max, 1, MPI_REAL, myid, 19, comm_inter, ierr )
+          CALL MPI_RECV( remote, 1, MPI_REAL, myid, 19, comm_inter, status, &
+               ierr )
+          dt_coupling = MAX( dt_max, remote )
+          IF ( myid == 0 )  THEN
+             PRINT*, '+++ check_parameters:'
+             PRINT*, '    TRIM( coupling_mode ): dt_coupling <= 0.0'
+             PRINT*, '    is not allowed and is reset to MAX(dt_max(A,O)) = ', &
+                  dt_coupling
+          ENDIF
        ENDIF
        CALL MPI_SEND( restart_time, 1, MPI_REAL, myid, 12, comm_inter, ierr )

palm/trunk/SOURCE/surface_coupler.f90

@@ -144 +144 @@
           CALL local_flush( 9 )
 
-          tswst = tswst + qswst_remote * 2.2626108e6
-          !latent heat of vaporization in m2/s2, or 540 cal/g, or 40.65 kJ/mol
+          !here tswst is still the sum of atmospheric bottom heat fluxes
+          tswst = tswst + qswst_remote * 2.2626108e6 / 1005.0
+          !*latent heat of vaporization in m2/s2, or 540 cal/g, or 40.65 kJ/mol
+          !/(rho_atm(=1.0)*c_p)
 !
 !--    ...and convert it to a salinity flux at the sea surface (top)
@@ -157 +159 @@
 !--    Adjust the kinematic heat flux with respect to ocean density
 !--    (constants are the specific heat capacities for air and water)
+       !now tswst is the ocean top heat flux
        tswst = tswst / rho(nzt,:,:) * 1005.0 / 4218.0