Changeset 2088

Timestamp:

Dec 19, 2016 4:30:25 PM (8 years ago)

Author:

suehring

Message:

Bugfixes in initial salinity profile and generic topography definition in case of ocean simulations

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (3 diffs)
• init_grid.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix in initial salinity profile
 ! 
 ! Former revisions:
@@ -503 +503 @@
     LOGICAL     ::  found                            !< 
     
+    REAL(wp)    ::  dum                              !< 
     REAL(wp)    ::  gradient                         !< 
     REAL(wp)    ::  remote = 0.0_wp                  !< 
@@ -1465 +1466 @@
           CALL init_vertical_profiles( sa_vertical_gradient_level_ind,          &
                                        sa_vertical_gradient_level,              &
-                                       sa_vertical_gradient, s_init,            &
-                                       sa_surface, -999.0_wp )
+                                       sa_vertical_gradient, sa_init,           &
+                                       sa_surface, dum )
        ENDIF
 

palm/trunk/SOURCE/init_grid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix in generic topography in case of ocean simulations
 ! 
 ! Former revisions:
@@ -574 +574 @@
           blx = NINT( building_length_x / dx )
           bly = NINT( building_length_y / dy )
-          bh  = MINLOC( ABS( zw - building_height ), 1 ) - 1
+          IF ( .NOT. ocean )  THEN
+             bh  = MINLOC( ABS( zw - building_height ), 1 ) - 1
+          ELSE
+             bh  = MINLOC( ABS( zw - zw(0) - building_height ), 1 ) - 1
+          ENDIF
+
           IF ( ABS( zw(bh  ) - building_height ) == &
                ABS( zw(bh+1) - building_height )    )  bh = bh + 1
@@ -640 +645 @@
           ENDIF
 
-          ch  = MINLOC( ABS( zw - canyon_height ), 1 ) - 1
+          IF ( .NOT. ocean )  THEN
+             ch  = MINLOC( ABS( zw - canyon_height ), 1 ) - 1
+          ELSE
+             ch  = MINLOC( ABS( zw - zw(0) - canyon_height ), 1 ) - 1
+          ENDIF
+
           IF ( ABS( zw(ch  ) - canyon_height ) == &
                ABS( zw(ch+1) - canyon_height )    )  ch = ch + 1