Changeset 4008 for palm

Timestamp:

May 30, 2019 9:50:11 AM (5 years ago)

Author:

moh.hefny

Message:

Bugfix in check radiation related variables

Location:

palm/trunk/SOURCE

Files:

• module_interface.f90 (modified) (2 diffs)
• radiation_model_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/module_interface.f90

@@ -1231 +1231 @@
     ENDIF
 
+    IF ( .NOT. found  .AND.  radiation )  THEN
+       CALL radiation_data_output_2d(                                          &
+               av, variable, found, grid, mode, local_pf, two_d, nzb_do, nzt_do&
+            )
+    ENDIF
+
     IF ( .NOT. found  .AND.  salsa )  THEN
        CALL salsa_data_output_2d(                                              &
-               av, variable, found, grid, mode, local_pf, two_d, nzb_do, nzt_do&
-            )
-    ENDIF
-
-    IF ( .NOT. found  .AND.  radiation )  THEN
-       CALL radiation_data_output_2d(                                          &
                av, variable, found, grid, mode, local_pf, two_d, nzb_do, nzt_do&
             )
@@ -1313 +1313 @@
     ENDIF
 
+    IF ( .NOT. found  .AND.  radiation )  THEN
+       CALL radiation_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do )
+       resorted = .TRUE.
+    ENDIF
+
     IF ( .NOT. found  .AND.  salsa )  THEN
        CALL salsa_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do )
-       resorted = .TRUE.
-    ENDIF
-
-    IF ( .NOT. found  .AND.  radiation )  THEN
-       CALL radiation_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do )
        resorted = .TRUE.
     ENDIF

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! Bugfix in check variable when a variable's string is less than 3
+! characters is processed. All variables now are checked if they
+! belong to radiation
+!
+! 3992 2019-05-22 16:49:38Z suehring
 ! Bugfix in rrtmg radiation branch in a nested run when the lowest prognistic 
 ! grid points in a child domain are all inside topography 
@@ -1406 +1411 @@
        INTEGER(iwp) :: i, k
        INTEGER(iwp) :: ilen
-       CHARACTER(LEN=varnamelength) :: var          !< TRIM(variable)
+       CHARACTER(LEN=varnamelength) :: var  !< TRIM(variable)
 
        var = TRIM(variable)
+
+       IF ( len(var) < 3_iwp  )  THEN
+          unit = 'illegal'
+          RETURN
+       ENDIF
+
+       IF ( var(1:3) /= 'rad'  .AND.  var(1:3) /= 'rtm' )  THEN
+          unit = 'illegal'
+          RETURN
+       ENDIF
 
 !--    first process diractional variables
@@ -10533 +10548 @@
 
     found = .TRUE.
+    var = TRIM(variable)
+
+!-- check if variable belongs to radiation related variables (starts with rad or rtm)
+    IF ( len(var) < 3_iwp  )  THEN
+       found = .FALSE.
+       RETURN
+    ENDIF
+    
+    IF ( var(1:3) /= 'rad'  .AND.  var(1:3) /= 'rtm' )  THEN
+       found = .FALSE.
+       RETURN
+    ENDIF
 
     ids = -1
-    var = TRIM(variable)
     DO i = 0, nd-1
         k = len(TRIM(var))
         j = len(TRIM(dirname(i)))
-        IF ( TRIM(var(k-j+1:k)) == TRIM(dirname(i)) )  THEN
-            ids = i
-            idsint_u = dirint_u(ids)
-            idsint_l = dirint_l(ids)
-            var = var(:k-j)
-            EXIT
+        IF ( k-j+1 >= 1_iwp ) THEN
+           IF ( TRIM(var(k-j+1:k)) == TRIM(dirname(i)) )  THEN
+              ids = i
+              idsint_u = dirint_u(ids)
+              idsint_l = dirint_l(ids)
+              var = var(:k-j)
+              EXIT
+           ENDIF
         ENDIF
     ENDDO