Changeset 4475

Timestamp:

Mar 26, 2020 4:28:19 PM (5 years ago)

Author:

gronemeier

Message:

bugfixes/changes to INIFOR:

• c: revise output format in routine report (inifor_control)
• b: check if namelist file was opened (inifor_grid)
• b: use explicit loop in routine reverse (inifor_util)

Location:

palm/trunk/UTIL/inifor/src

Files:

• inifor_control.f90 (modified) (2 diffs)
• inifor_grid.f90 (modified) (2 diffs)
• inifor_util.f90 (modified) (2 diffs)

palm/trunk/UTIL/inifor/src/inifor_control.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Change output format in routine report to allow for better message formatting
+! 
+! 3997 2019-05-23 12:35:57Z eckhard
 ! Added warnings counter
 ! 
@@ -126 +129 @@
 
     IF ( .NOT. suppress_message )  THEN
-       PRINT *, "inifor: " // TRIM(message) // "  [ " // TRIM(routine) // " ]"
-       WRITE(u, *)  TRIM(message) // "  [ " // TRIM(routine) // " ]"
+       WRITE(*, '(A)') "inifor: " // TRIM(message) // "  [ " // TRIM(routine) // " ]"
+       WRITE(u, '(A)')  TRIM(message) // "  [ " // TRIM(routine) // " ]"
     ENDIF
 

palm/trunk/UTIL/inifor/src/inifor_grid.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bugfix: check if namelist file could be opened without error
+! 
+! 4074 2019-07-05 13:05:19Z eckhard
 ! Changed default initialization mode from 'volume' to 'profile'
 ! Pass hhl_file to cosmo_grid() instead of entire INIFOR configuration
@@ -491 +494 @@
 !
 !-- Read in namelist parameters
-    OPEN(10, FILE=cfg%namelist_file, STATUS='old')
+    OPEN(10, FILE=cfg%namelist_file, STATUS='old', IOSTAT=iostat)
+    IF ( iostat /= 0 )  THEN
+       message = "Failed to open file '" //             &
+                 TRIM( cfg%namelist_file ) // "'. "
+       CALL inifor_abort( 'setup_parameters', message )
+    ENDIF
+
     READ(10, NML=inipar, IOSTAT=iostat) ! nx, ny, nz, dx, dy, dz    
     IF ( iostat > 0 )  THEN      

palm/trunk/UTIL/inifor/src/inifor_util.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bugfix: use explicit loop in 'reverse' subroutine instead of implicit loop
+! 
+! 3866 2019-04-05 14:25:01Z eckhard
 ! Use PALM's working precision
 ! Improved coding style
@@ -269 +272 @@
  SUBROUTINE reverse(input_arr)
 
+    INTEGER ::  i
+    INTEGER ::  lbound_3rd_dimension
+    INTEGER ::  ubound_3rd_dimension
+
     REAL(wp), INTENT(INOUT) ::  input_arr(:,:,:)
 
-    input_arr = input_arr(:,:,size(input_arr, 3):1:-1)
+    lbound_3rd_dimension = LBOUND(input_arr, 3)
+    ubound_3rd_dimension = UBOUND(input_arr, 3)
+
+    DO  i = lbound_3rd_dimension, ubound_3rd_dimension
+       input_arr(:,:,i) = input_arr(:,:,                    &
+         ubound_3rd_dimension - ( i - lbound_3rd_dimension ))
+    ENDDO
 
  END SUBROUTINE reverse