Changeset 1418 for palm/trunk/SOURCE

Timestamp:

Jun 6, 2014 1:05:08 PM (10 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:

• init_grid.f90 (modified) (2 diffs)
• surface_coupler.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: Change if-condition for stretched grid in the ocean, with the old
+!          condition and a negative value for dz_stretch_level the condition
+!          was always true for the whole model domain
 ! 
 ! Former revisions:
@@ -272 +274 @@
        dz_stretched = dz
        DO  k = nzt-1, 0, -1
-          IF ( dz_stretch_level <= ABS( zu(k+1) )  .AND.  &
-               dz_stretched < dz_max )  THEN
+!
+!--       The default value of dz_stretch_level is positive, thus the first 
+!--       condition is always true. Hence, the second condition is necessary.
+          IF ( dz_stretch_level >= zu(k+1)  .AND.  dz_stretch_level <= 0.0  &
+               .AND.  dz_stretched < dz_max )  THEN
              dz_stretched = dz_stretched * dz_stretch_factor
              dz_stretched = MIN( dz_stretched, dz_max )

palm/trunk/SOURCE/surface_coupler.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix: For caluclation of the salinity flux at the sea surface, 
+!          the given value for salinity must be in percent and not in psu
 ! 
 ! Former revisions:
@@ -400 +401 @@
 !--       following Steinhorn (1991), JPO 21, pp. 1681-1683:
 !--       S'w' = -S * evaporation / ( rho_water * ( 1 - S ) )
-          saswst = -1.0_wp * sa(nzt,:,:) * qswst_remote /  &
-                    ( rho(nzt,:,:) * ( 1.0_wp - sa(nzt,:,:) ) )
+          saswst = -1.0_wp * sa(nzt,:,:) * 0.001 * qswst_remote /  &
+                    ( rho(nzt,:,:) * ( 1.0_wp - sa(nzt,:,:) * 0.001 ) )
        ENDIF