Changeset 2232 for palm/trunk/SOURCE/buoyancy.f90

Timestamp:

May 30, 2017 5:47:52 PM (6 years ago)

Author:

suehring

Message:

Adjustments according new topography and surface-modelling concept implemented

File:

• palm/trunk/SOURCE/buoyancy.f90 (modified) (8 diffs)

palm/trunk/SOURCE/buoyancy.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Adjustments to new topography concept
 ! 
 ! Former revisions:
@@ -131 +131 @@
        USE indices,                                                            &
            ONLY:  nxl, nxlg, nxlu, nxr, nxrg, nyn, nyng, nys, nysg, nzb,       &
-                  nzb_s_inner, nzt
+                  nzt, wall_flags_0
 
        USE kinds
@@ -157 +157 @@
           DO  i = nxl, nxr
              DO  j = nys, nyn
-                DO  k = nzb_s_inner(j,i)+1, nzt-1
-                   tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5_wp * &
-                          (                                                    &
+                DO  k = nzb+1, nzt-1
+                   tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5_wp *  &
+                          (                                                     &
                              ( var(k,j,i)   - ref_state(k) )   / ref_state(k) + &
                              ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) &
-                          )
+                          ) * MERGE( 1.0_wp, 0.0_wp,                            &
+                                     BTEST( wall_flags_0(k,j,i), 0 ) )
                 ENDDO
              ENDDO
@@ -178 +179 @@
              DO  i = nxlu, nxr
                 DO  j = nys, nyn
-                   DO  k = nzb_s_inner(j,i)+1, nzt-1
-                      tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface *      &
+                   DO  k = nzb+1, nzt-1
+                      tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface *         &
                            0.5_wp * ( ( pt(k,j,i-1)         + pt(k,j,i)         ) &
                                     - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &
-                                    ) / pt_surface
+                                    ) / pt_surface                                &
+                                      * MERGE( 1.0_wp, 0.0_wp,                    &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
                    ENDDO
                 ENDDO
@@ -191 +194 @@
              DO  i = nxl, nxr
                 DO  j = nys, nyn
-                   DO  k = nzb_s_inner(j,i)+1, nzt-1
-                      tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface *      &
+                   DO  k = nzb+1, nzt-1
+                      tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface *         &
                            0.5_wp * ( ( pt(k,j,i)         + pt(k+1,j,i)         ) &
                                     - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &
-                                    ) / pt_surface
+                                    ) / pt_surface                                &
+                                      * MERGE( 1.0_wp, 0.0_wp,                    &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
                    ENDDO
                 ENDDO
@@ -231 +236 @@
 
        USE indices,                                                            &
-           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt
+           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt, wall_flags_0
 
        USE kinds
@@ -256 +261 @@
 !
 !--       Normal case: horizontal surface
-          DO  k = nzb_s_inner(j,i)+1, nzt-1
+          DO  k = nzb+1, nzt-1
               tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5_wp * (    &
                         ( var(k,j,i)   - ref_state(k)   ) / ref_state(k)   +   &
                         ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1)     &
-                                                                          )
+                                                                          )    &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
           ENDDO
 
@@ -272 +279 @@
           IF ( wind_component == 1 )  THEN
 
-             DO  k = nzb_s_inner(j,i)+1, nzt-1
-                tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface *            &
+             DO  k = nzb+1, nzt-1
+                tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface *               &
                            0.5_wp * ( ( pt(k,j,i-1)         + pt(k,j,i)         ) &
                                     - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &
-                                    ) / pt_surface
+                                    ) / pt_surface                                &
+                                      * MERGE( 1.0_wp, 0.0_wp,                    &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
              ENDDO
 
           ELSEIF ( wind_component == 3 )  THEN
 
-             DO  k = nzb_s_inner(j,i)+1, nzt-1
-                tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface *            &
+             DO  k = nzb+1, nzt-1
+                tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface *               &
                            0.5_wp * ( ( pt(k,j,i)         + pt(k+1,j,i)         ) &
                                     - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &
-                                    ) / pt_surface
+                                    ) / pt_surface                                &
+                                      * MERGE( 1.0_wp, 0.0_wp,                    &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
              ENDDO