Changeset 4558 for palm

Timestamp:

Jun 10, 2020 4:27:30 PM (4 years ago)

Author:

moh.hefny

Message:

Bugfix in RTM output average quantities

Location:

palm/trunk/SOURCE

Files:

• average_3d_data.f90 (modified) (2 diffs)
• radiation_model_mod.f90 (modified) (18 diffs)

palm/trunk/SOURCE/average_3d_data.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
+! bugfix: average_count_3d is set to integer 0
+! 
+! 4514 2020-04-30 16:29:59Z suehring
 ! Enable output of qsurf and ssurf
 ! 
@@ -463 +466 @@
 !
 !-- Reset the counter
-    average_count_3d = 0.0
+    average_count_3d = 0_iwp
 
     CALL cpu_log( log_point(35), 'average_3d_data', 'stop' )

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! Bugfix: - reset RTM output average values after each averaging timestep to zero
+!         - correct calculation of rtm_rad_net_av
+! 
+! 4555 2020-06-05 21:52:00Z moh.hefny
 ! Bugfix in averaging PC and MRT related quantities
 ! 
@@ -9982 +9986 @@
                  IF ( .NOT.  ALLOCATED(surfradnet_av) )  THEN
                      ALLOCATE( surfradnet_av(nsurfl) )
-                     surfradnet_av = 0.0_wp
                  ENDIF
+                 surfradnet_av = 0.0_wp
 
              CASE ( 'rtm_rad_insw' )
@@ -9989 +9993 @@
                  IF ( .NOT.  ALLOCATED(surfinsw_av) )  THEN
                      ALLOCATE( surfinsw_av(nsurfl) )
-                     surfinsw_av = 0.0_wp
                  ENDIF
+                 surfinsw_av = 0.0_wp
 
              CASE ( 'rtm_rad_inlw' )
@@ -9996 +10000 @@
                  IF ( .NOT.  ALLOCATED(surfinlw_av) )  THEN
                      ALLOCATE( surfinlw_av(nsurfl) )
-                     surfinlw_av = 0.0_wp
                  ENDIF
+                 surfinlw_av = 0.0_wp
 
              CASE ( 'rtm_rad_inswdir' )
@@ -10003 +10007 @@
                  IF ( .NOT.  ALLOCATED(surfinswdir_av) )  THEN
                      ALLOCATE( surfinswdir_av(nsurfl) )
-                     surfinswdir_av = 0.0_wp
                  ENDIF
+                 surfinswdir_av = 0.0_wp
 
              CASE ( 'rtm_rad_inswdif' )
@@ -10010 +10014 @@
                  IF ( .NOT.  ALLOCATED(surfinswdif_av) )  THEN
                      ALLOCATE( surfinswdif_av(nsurfl) )
-                     surfinswdif_av = 0.0_wp
                  ENDIF
+                 surfinswdif_av = 0.0_wp
 
              CASE ( 'rtm_rad_inswref' )
@@ -10017 +10021 @@
                  IF ( .NOT.  ALLOCATED(surfinswref_av) )  THEN
                      ALLOCATE( surfinswref_av(nsurfl) )
-                     surfinswref_av = 0.0_wp
                  ENDIF
+                 surfinswref_av = 0.0_wp
 
              CASE ( 'rtm_rad_inlwdif' )
@@ -10024 +10028 @@
                 IF ( .NOT.  ALLOCATED(surfinlwdif_av) )  THEN
                      ALLOCATE( surfinlwdif_av(nsurfl) )
-                     surfinlwdif_av = 0.0_wp
                  ENDIF
+                 surfinlwdif_av = 0.0_wp
 
              CASE ( 'rtm_rad_inlwref' )
@@ -10031 +10035 @@
                  IF ( .NOT.  ALLOCATED(surfinlwref_av) )  THEN
                      ALLOCATE( surfinlwref_av(nsurfl) )
-                     surfinlwref_av = 0.0_wp
                  ENDIF
+                 surfinlwref_av = 0.0_wp
 
              CASE ( 'rtm_rad_outsw' )
@@ -10038 +10042 @@
                  IF ( .NOT.  ALLOCATED(surfoutsw_av) )  THEN
                      ALLOCATE( surfoutsw_av(nsurfl) )
-                     surfoutsw_av = 0.0_wp
                  ENDIF
+                 surfoutsw_av = 0.0_wp
 
              CASE ( 'rtm_rad_outlw' )
@@ -10051 +10055 @@
                  IF ( .NOT.  ALLOCATED(surfins_av) )  THEN
                      ALLOCATE( surfins_av(nsurfl) )
-                     surfins_av = 0.0_wp
                  ENDIF
+                 surfins_av = 0.0_wp
 
              CASE ( 'rtm_rad_reslw' )
@@ -10058 +10062 @@
                  IF ( .NOT.  ALLOCATED(surfinl_av) )  THEN
                      ALLOCATE( surfinl_av(nsurfl) )
-                     surfinl_av = 0.0_wp
                  ENDIF
+                 surfinl_av = 0.0_wp
 
              CASE ( 'rtm_rad_pc_inlw' )
@@ -10072 +10076 @@
                  IF ( .NOT.  ALLOCATED(pcbinsw_av) )  THEN
                      ALLOCATE( pcbinsw_av(1:npcbl) )
-                     pcbinsw_av = 0.0_wp
                  ENDIF
+                 pcbinsw_av = 0.0_wp
 
              CASE ( 'rtm_rad_pc_inswdir' )
@@ -10079 +10083 @@
                  IF ( .NOT.  ALLOCATED(pcbinswdir_av) )  THEN
                      ALLOCATE( pcbinswdir_av(1:npcbl) )
-                     pcbinswdir_av = 0.0_wp
                  ENDIF
+                 pcbinswdir_av = 0.0_wp
 
              CASE ( 'rtm_rad_pc_inswdif' )
@@ -10086 +10090 @@
                  IF ( .NOT.  ALLOCATED(pcbinswdif_av) )  THEN
                      ALLOCATE( pcbinswdif_av(1:npcbl) )
-                     pcbinswdif_av = 0.0_wp
                  ENDIF
+                 pcbinswdif_av = 0.0_wp
 
              CASE ( 'rtm_rad_pc_inswref' )
@@ -10093 +10097 @@
                  IF ( .NOT.  ALLOCATED(pcbinswref_av) )  THEN
                      ALLOCATE( pcbinswref_av(1:npcbl) )
-                     pcbinswref_av = 0.0_wp
                  ENDIF
+                 pcbinswref_av = 0.0_wp
 
              CASE ( 'rtm_mrt_sw' )
@@ -10334 +10338 @@
               DO isurf = dirstart(ids), dirend(ids)
                  IF ( surfl(id,isurf) == idsint_u  .OR.  surfl(id,isurf) == idsint_l )  THEN
-                    surfradnet_av(isurf) = surfinsw(isurf) - surfoutsw(isurf) +  surfinlw(isurf) - surfoutlw(isurf)
+                    surfradnet_av(isurf) = surfradnet_av(isurf) +               &
+                                           surfinsw(isurf) - surfoutsw(isurf) + &
+                                           surfinlw(isurf) - surfoutlw(isurf)
                  ENDIF
               ENDDO
@@ -10629 +10635 @@
               DO isurf = dirstart(ids), dirend(ids)
                   IF ( surfl(id,isurf) == idsint_u  .OR.  surfl(id,isurf) == idsint_l )  THEN
-                      surfradnet_av(isurf) = surfinsw_av(isurf) / REAL( average_count_3d, kind=wp )
+                      surfradnet_av(isurf) = surfradnet_av(isurf) / REAL( average_count_3d, kind=wp )
                   ENDIF
               ENDDO