Changeset 1418


Ignore:
Timestamp:
Jun 6, 2014 1:05:08 PM (9 years ago)
Author:
fricke
Message:

Bugfixes concerning grid stretching for the ocean and calculation of the salinity flux in routine surface_coupler

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/init_grid.f90

    r1410 r1418  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! Bugfix: Change if-condition for stretched grid in the ocean, with the old
     23!          condition and a negative value for dz_stretch_level the condition
     24!          was always true for the whole model domain
    2325!
    2426! Former revisions:
     
    272274       dz_stretched = dz
    273275       DO  k = nzt-1, 0, -1
    274           IF ( dz_stretch_level <= ABS( zu(k+1) )  .AND.  &
    275                dz_stretched < dz_max )  THEN
     276!
     277!--       The default value of dz_stretch_level is positive, thus the first
     278!--       condition is always true. Hence, the second condition is necessary.
     279          IF ( dz_stretch_level >= zu(k+1)  .AND.  dz_stretch_level <= 0.0  &
     280               .AND.  dz_stretched < dz_max )  THEN
    276281             dz_stretched = dz_stretched * dz_stretch_factor
    277282             dz_stretched = MIN( dz_stretched, dz_max )
  • palm/trunk/SOURCE/surface_coupler.f90

    r1354 r1418  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! Bugfix: For caluclation of the salinity flux at the sea surface,
     23!          the given value for salinity must be in percent and not in psu
    2324!
    2425! Former revisions:
     
    400401!--       following Steinhorn (1991), JPO 21, pp. 1681-1683:
    401402!--       S'w' = -S * evaporation / ( rho_water * ( 1 - S ) )
    402           saswst = -1.0_wp * sa(nzt,:,:) * qswst_remote /  &
    403                     ( rho(nzt,:,:) * ( 1.0_wp - sa(nzt,:,:) ) )
     403          saswst = -1.0_wp * sa(nzt,:,:) * 0.001 * qswst_remote /  &
     404                    ( rho(nzt,:,:) * ( 1.0_wp - sa(nzt,:,:) * 0.001 ) )
    404405       ENDIF
    405406
Note: See TracChangeset for help on using the changeset viewer.