Changeset 2698 for palm/trunk/SOURCE/radiation_model_mod.f90

Timestamp:

Dec 14, 2017 6:46:24 PM (7 years ago)

Author:

suehring

Message:

Particle reflections at downward-facing walls; revision of particle speed interpolations at walls; bugfixes in get_topography_index and in date constants

File:

• palm/trunk/SOURCE/radiation_model_mod.f90 (modified) (17 diffs)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix in get_topography_top_index
 ! 
 ! Former revisions:
@@ -272 +272 @@
 
     USE surface_mod,                                                           &
-        ONLY:  get_topography_top_index, surf_def_h, surf_def_v, surf_lsm_h,   &
+        ONLY:  get_topography_top_index, get_topography_top_index_ji,          &
+               surf_def_h, surf_def_v, surf_lsm_h,                             &
                surf_lsm_v, surf_type, surf_usm_h, surf_usm_v
 
@@ -3244 +3245 @@
 !
 !--             Obtain topography top index (lower bound of RRTMG)
-                k_topo = get_topography_top_index( j, i, 's' )
+                k_topo = get_topography_top_index_ji( j, i, 's' )
 
                 IF ( lw_radiation )  THEN
@@ -4411 +4412 @@
                   pc_heating_rate, lad_s, prototype_lad, usm_lad_rma       
        
-       USE surface_mod,                                                        &
-           ONLY:  get_topography_top_index, surf_lsm_h, surf_lsm_v, surf_usm_h,&
-                  surf_usm_v
-
        IMPLICIT NONE
 
@@ -4448 +4445 @@
 !
 !--                Find topography top index
-                   k_topo = get_topography_top_index( j, i, 's' )
+                   k_topo = get_topography_top_index_ji( j, i, 's' )
 
                    DO k = nzt+1, 0, -1
@@ -4553 +4550 @@
                 DO  j = ijdb(3,ids), ijdb(4,ids)
 
-                   k_topo  = get_topography_top_index( j, i, 's' )
-                   k_topo2 = get_topography_top_index( j-jdir(ids), i-idir(ids), 's' )
+                   k_topo  = get_topography_top_index_ji( j, i, 's' )
+                   k_topo2 = get_topography_top_index_ji( j-jdir(ids), i-idir(ids), 's' )
 
 
@@ -4572 +4569 @@
              DO j = nys, nyn
 !--              Find topography top index
-                 k_topo = get_topography_top_index( j, i, 's' )
+                 k_topo = get_topography_top_index_ji( j, i, 's' )
                  k = nzut - k_topo
                  nsurfl = nsurfl + 6 * k
@@ -4593 +4590 @@
 !
 !--                Find topography top index
-                   k_topo = get_topography_top_index( j, i, 's' )
+                   k_topo = get_topography_top_index_ji( j, i, 's' )
 
                    DO k = k_topo + 1, pct(j,i)
@@ -4709 +4706 @@
                DO i = ijdb(1,ids), ijdb(2,ids)
                    DO j = ijdb(3,ids), ijdb(4,ids)
-                       k_topo  = get_topography_top_index( j, i, 's' )
-                       k_topo2 = get_topography_top_index( j-jdir(ids), i-idir(ids), 's' )
+                       k_topo  = get_topography_top_index_ji( j, i, 's' )
+                       k_topo2 = get_topography_top_index_ji( j-jdir(ids), i-idir(ids), 's' )
 
                        DO k = MAX(k_topo,k_topo2)+1, nzut
@@ -4727 +4724 @@
           DO i = nxl, nxr
              DO j = nys, nyn
-                k_topo = get_topography_top_index( j, i, 's' )
+                k_topo = get_topography_top_index_ji( j, i, 's' )
 
 !--             add upward surface
@@ -4746 +4743 @@
           DO i = nxl, nxr
              DO j = nys, nyn
-                k_topo = get_topography_top_index( j, i, 's' )
+                k_topo = get_topography_top_index_ji( j, i, 's' )
 !--             north
                 IF ( j /= ny ) THEN
@@ -4752 +4749 @@
                    jr = min(max(j-jdir(ids),0),ny)
                    ir = min(max(i-idir(ids),0),nx)
-                   k_topo2 = get_topography_top_index( jr, ir, 's' )
+                   k_topo2 = get_topography_top_index_ji( jr, ir, 's' )
                    DO k = MAX(k_topo,k_topo2)+1, nzut
                       isurf = isurf + 1
@@ -4763 +4760 @@
                    jr = min(max(j-jdir(ids),0),ny)
                    ir = min(max(i-idir(ids),0),nx)
-                   k_topo2 = get_topography_top_index( jr, ir, 's' )
+                   k_topo2 = get_topography_top_index_ji( jr, ir, 's' )
 
                    DO k = MAX(k_topo,k_topo2)+1, nzut
@@ -4775 +4772 @@
                    jr = min(max(j-jdir(ids),0),ny)
                    ir = min(max(i-idir(ids),0),nx)
-                   k_topo2 = get_topography_top_index( jr, ir, 's' )
+                   k_topo2 = get_topography_top_index_ji( jr, ir, 's' )
 
                    DO k = MAX(k_topo,k_topo2)+1, nzut
@@ -4787 +4784 @@
                    jr = min(max(j-jdir(ids),0),ny)
                    ir = min(max(i-idir(ids),0),nx)
-                   k_topo2 = get_topography_top_index( jr, ir, 's' )
+                   k_topo2 = get_topography_top_index_ji( jr, ir, 's' )
 
                    DO k = MAX(k_topo,k_topo2)+1, nzut
@@ -5255 +5252 @@
 !
 !--             Following expression equals former kk = k - nzb_s_inner(j,i) 
-                kk = k - get_topography_top_index( j, i, 's' )  !- lad arrays are defined flat
+                kk = k - get_topography_top_index_ji( j, i, 's' )  !- lad arrays are defined flat
                 pc_heating_rate(kk, j, i) = (pcbinsw(ipcgb) + pcbinlw(ipcgb)) &
                     * pchf_prep(k) * pt(k, j, i) !-- = dT/dt
@@ -5856 +5853 @@
             DO i = nxl, nxr
                 DO j = nys, nyn
-                    k = get_topography_top_index( j, i, 's' )
+                    k = get_topography_top_index_ji( j, i, 's' )
 
                     usm_lad(k:nzut, j, i) = lad_s(0:nzut-k, j, i)