Changeset 109


Ignore:
Timestamp:
Aug 28, 2007 3:26:47 PM (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mrun

    r108 r109  
    128128     #                     variables out to the nodes in coupled mode -disabled-
    129129     # 13/08/07 - Marcus - start local restart jobs per ssh on lcfimm
     130     # 28/08/07 - Marcus - completely remove workaround on lcfimm to propagate
     131     #                     environment variables out to the nodes in coupled mode
    130132
    131133 
     
    27432745             then
    27442746                printf "\n\n"
    2745 #               if [[ $host = lcfimm ]]
    2746 #               then
    2747 #                  /usr/bin/mpiexec  -comm pmi  -n $ii  a.out  $ROPTS
    2748 #               else
    2749                    mpiexec  -machinefile hostfile  -n $ii  a.out  $ROPTS
    2750 #               fi
     2747                mpiexec  -machinefile hostfile  -n $ii  a.out  $ROPTS
    27512748             else
    27522749                ((  iii = ii / 2 ))
    27532750                printf "\n      coupled run ($iii atmosphere, $iii ocean)"
    27542751                printf "\n\n"
    2755 #               if [[ $host = lcfimm ]]
    2756 #               then
    2757 #                   /usr/bin/mpiexec  -comm pmi  -n $iii  run_atmosphere  a.out  $ROPTS  &
    2758 #                   /usr/bin/mpiexec  -comm pmi  -n $iii  run_ocean       a.out  $ROPTS  &
    2759 #               else
    2760                    mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode atmosphere_to_ocean  a.out  $ROPTS  &
    2761                    mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode ocean_to_atmosphere  a.out  $ROPTS  &
    2762 #               fi
     2752                mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode atmosphere_to_ocean  a.out  $ROPTS  &
     2753                mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode ocean_to_atmosphere  a.out  $ROPTS  &
    27632754                wait
    27642755             fi
  • palm/trunk/SOURCE/check_parameters.f90

    r108 r109  
    1313! cloud_physics = .T.)
    1414! Rayleigh damping for ocean fixed.
     15! Check and, if necessary, set default value for dt_coupling
    1516!
    1617! Former revisions:
     
    129130          ENDIF
    130131          CALL local_stop
     132       ENDIF
     133       IF ( dt_coupling <= 0.0 )  THEN
     134          CALL MPI_SEND( dt_max, 1, MPI_REAL, myid, 19, comm_inter, ierr )
     135          CALL MPI_RECV( remote, 1, MPI_REAL, myid, 19, comm_inter, status, &
     136               ierr )
     137          dt_coupling = MAX( dt_max, remote )
     138          IF ( myid == 0 )  THEN
     139             PRINT*, '+++ check_parameters:'
     140             PRINT*, '    TRIM( coupling_mode ): dt_coupling <= 0.0'
     141             PRINT*, '    is not allowed and is reset to MAX(dt_max(A,O)) = ', &
     142                  dt_coupling
     143          ENDIF
    131144       ENDIF
    132145       CALL MPI_SEND( restart_time, 1, MPI_REAL, myid, 12, comm_inter, ierr )
  • palm/trunk/SOURCE/surface_coupler.f90

    r108 r109  
    144144          CALL local_flush( 9 )
    145145
    146           tswst = tswst + qswst_remote * 2.2626108e6
    147           !latent heat of vaporization in m2/s2, or 540 cal/g, or 40.65 kJ/mol
     146          !here tswst is still the sum of atmospheric bottom heat fluxes
     147          tswst = tswst + qswst_remote * 2.2626108e6 / 1005.0
     148          !*latent heat of vaporization in m2/s2, or 540 cal/g, or 40.65 kJ/mol
     149          !/(rho_atm(=1.0)*c_p)
    148150!
    149151!--    ...and convert it to a salinity flux at the sea surface (top)
     
    157159!--    Adjust the kinematic heat flux with respect to ocean density
    158160!--    (constants are the specific heat capacities for air and water)
     161       !now tswst is the ocean top heat flux
    159162       tswst = tswst / rho(nzt,:,:) * 1005.0 / 4218.0
    160163
Note: See TracChangeset for help on using the changeset viewer.