Changeset 3614 for palm/trunk/UTIL/inifor

Timestamp:

Dec 10, 2018 7:05:46 AM (5 years ago)

Author:

raasch

Message:

unused variables removed, abort renamed inifor_abort to avoid intrinsic problem in Fortran

Location:

palm/trunk/UTIL/inifor/src

Files:

• inifor_control.f90 (modified) (6 diffs)
• inifor_grid.f90 (modified) (2 diffs)
• inifor_transform.f90 (modified) (2 diffs)

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! abort renamed inifor_abort to avoid intrinsic problem in Fortran
+! 
+! 3557 2018-11-22 16:01:22Z eckhard
 ! Updated documentation
 ! 
@@ -78 +81 @@
 !> You can use this routine to log events across INIFOR's code to log. For
 !> warnings and abort messages, you may use the dedicated routines warn() and
-!> abort() in this module. Both use report() and add specific behaviour to it.
+!> inifor_abort() in this module. Both use report() and add specific behaviour
+!> to it.
 !------------------------------------------------------------------------------!
     SUBROUTINE report(routine, message, debug)
@@ -138 +142 @@
 ! ------------
 !> 
-!> abort() prepends "ERROR:" the given 'message' and prints the result to the
-!> terminal, writes it to the INIFOR logfile, and exits INIFOR.
+!> inifor_abort() prepends "ERROR:" the given 'message' and prints the result to
+!> stdout, writes it to the INIFOR logfile, and exits INIFOR.
 !> 
 !> You can use this routine for messaging issues, that are critical and prevent
 !> INIFOR from continueing.
 !------------------------------------------------------------------------------!
-    SUBROUTINE abort(routine, message)
+    SUBROUTINE inifor_abort(routine, message)
 
        CHARACTER(LEN=*), INTENT(IN) ::  routine !< name of calling subroutine or function
@@ -152 +156 @@
        STOP
 
-    END SUBROUTINE abort
+    END SUBROUTINE inifor_abort
 
 
@@ -218 +222 @@
 
              CASE DEFAULT
-                CALL abort('run_control', "Time Budget '" // TRIM(mode) // "' is not supported.")
+                CALL inifor_abort('run_control', "Time Budget '" // TRIM(mode) // "' is not supported.")
 
           END SELECT
@@ -248 +252 @@
 
        CASE DEFAULT
-          CALL abort('run_control', "Mode '" // TRIM(mode) // "' is not supported.")
+          CALL inifor_abort('run_control', "Mode '" // TRIM(mode) // "' is not supported.")
 
        END SELECT

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! unused variables removed
+! 
+! 3613 2018-12-07 18:20:37Z eckhard
 ! Average initial profiles only over PALM domain region, not the
 !     geostrophic-wind averaging region
@@ -1520 +1523 @@
        LOGICAL                              :: level_based_averaging
 
-       INTEGER :: i, j
-
        ALLOCATE( avg_grid % x(1) )
        ALLOCATE( avg_grid % y(1) )

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! unused variables removed
+! 
+! 3613 2018-12-07 18:20:37Z eckhard
 ! Use averaged heights profile for level-based averaging instead of modified
 !    COSMO heights array
@@ -398 +401 @@
 
        REAL(dp) ::  drhodz, dz, zk, rhok
-       INTEGER  ::  k, k_min
+       INTEGER  ::  k_min
 
        k_min = avg_grid % k_min