Index: palm/trunk/UTIL/inifor/tests/Makefile
===================================================================
--- palm/trunk/UTIL/inifor/tests/Makefile	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/Makefile	(revision 3618)
@@ -25,4 +25,8 @@
 # -----------------
 # $Id$
+# Prefixed INIFOR modules with inifor_
+# 
+# 
+# 2718 2018-01-02 08:49:38Z maronga
 # Initial revision
 #
@@ -43,5 +47,5 @@
 TESTS    = $(patsubst %.f90,%,$(wildcard test-*.f90))
 
-MODULES = util.mod $(SRC_PATH)/defs.mod $(SRC_PATH)/control.mod $(SRC_PATH)/util.mod $(SRC_PATH)/types.mod $(SRC_PATH)/transform.mod $(SRC_PATH)/io.mod $(SRC_PATH)/grid.mod
+MODULES = util.mod $(SRC_PATH)/inifor_defs.mod $(SRC_PATH)/inifor_control.mod $(SRC_PATH)/inifor_util.mod $(SRC_PATH)/inifor_types.mod $(SRC_PATH)/inifor_transform.mod $(SRC_PATH)/inifor_io.mod $(SRC_PATH)/inifor_grid.mod
 SOURCES = $(MODULES:%.mod=%.f90)
 OBJECTS = $(SOURCES:%.f90=%.o)
Index: palm/trunk/UTIL/inifor/tests/Makefile.gnu
===================================================================
--- palm/trunk/UTIL/inifor/tests/Makefile.gnu	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/Makefile.gnu	(revision 3618)
@@ -25,4 +25,8 @@
 # -----------------
 # $Id$
+# Prefixed INIFOR modules with inifor_
+# 
+# 
+# 2718 2018-01-02 08:49:38Z maronga
 # Initial revision
 #
@@ -44,5 +48,5 @@
 TESTS    = $(patsubst %.f90,%,$(wildcard test-*.f90))
 
-MODULES = util.mod $(SRC_PATH)/defs.mod $(SRC_PATH)/control.mod $(SRC_PATH)/util.mod $(SRC_PATH)/types.mod $(SRC_PATH)/transform.mod $(SRC_PATH)/io.mod $(SRC_PATH)/grid.mod
+MODULES = util.mod $(SRC_PATH)/inifor_defs.mod $(SRC_PATH)/inifor_control.mod $(SRC_PATH)/inifor_util.mod $(SRC_PATH)/inifor_types.mod $(SRC_PATH)/inifor_transform.mod $(SRC_PATH)/inifor_io.mod $(SRC_PATH)/inifor_grid.mod
 SOURCES = $(MODULES:%.mod=%.f90)
 OBJECTS = $(SOURCES:%.f90=%.o)
Index: palm/trunk/UTIL/inifor/tests/Makefile.ifort
===================================================================
--- palm/trunk/UTIL/inifor/tests/Makefile.ifort	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/Makefile.ifort	(revision 3618)
@@ -25,4 +25,8 @@
 # -----------------
 # $Id$
+# Prefixed INIFOR modules with inifor_
+# 
+# 
+# 2718 2018-01-02 08:49:38Z maronga
 # Initial revision
 #
@@ -44,5 +48,5 @@
 TESTS    = $(patsubst %.f90,%,$(wildcard test-*.f90))
 
-MODULES = util.mod $(SRC_PATH)/defs.mod $(SRC_PATH)/control.mod $(SRC_PATH)/util.mod $(SRC_PATH)/types.mod $(SRC_PATH)/transform.mod $(SRC_PATH)/io.mod $(SRC_PATH)/grid.mod
+MODULES = util.mod $(SRC_PATH)/inifor_defs.mod $(SRC_PATH)/inifor_control.mod $(SRC_PATH)/inifor_util.mod $(SRC_PATH)/inifor_types.mod $(SRC_PATH)/inifor_transform.mod $(SRC_PATH)/inifor_io.mod $(SRC_PATH)/inifor_grid.mod
 SOURCES = $(MODULES:%.mod=%.f90)
 OBJECTS = $(SOURCES:%.f90=%.o)
Index: palm/trunk/UTIL/inifor/tests/test-boundaries.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-boundaries.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-boundaries.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_
+! 
+! 
+! 3183 2018-07-27 14:25:55Z suehring
 ! Updated test for new PALM grid strechting
 ! 
@@ -45,6 +49,8 @@
  PROGRAM test_boundaries
 
-    USE grid, ONLY  :  init_grid_definition
-    USE types, ONLY :  grid_definition
+    USE inifor_grid,                                                           &
+        ONLY  :  init_grid_definition
+    USE inifor_types,                                                          &
+        ONLY :  grid_definition
     USE test_utils
     
Index: palm/trunk/UTIL/inifor/tests/test-centre-velocities.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-centre-velocities.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-centre-velocities.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_
+! 
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Initial revision
 !
@@ -40,7 +44,7 @@
  PROGRAM test_centre_velocities
 
+    USE inifor_transform,                                                      &
+        ONLY :  centre_velocities
     USE test_utils
-    USE transform, &
-        ONLY :  centre_velocities
     
     IMPLICIT NONE
Index: palm/trunk/UTIL/inifor/tests/test-grid.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-grid.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-grid.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_
+! 
+! 
+! 3183 2018-07-27 14:25:55Z suehring
 ! Updated test for new PALM grid strechting
 ! 
@@ -45,5 +49,6 @@
  PROGRAM test_grid
 
-    USE grid, ONLY :  grid_definition, init_grid_definition, dx, dy, dz
+    USE inifor_grid,                                                           &
+        ONLY :  grid_definition, init_grid_definition, dx, dy, dz
     USE test_utils
     
Index: palm/trunk/UTIL/inifor/tests/test-input-files.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-input-files.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-input-files.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_
+! 
+! 
+! 3183 2018-07-27 14:25:55Z suehring
 ! New test for negative start_hour and greater-than-one step_hour
 !
@@ -45,7 +49,7 @@
  PROGRAM test_input_files
 
-    USE defs,                                                                  &
+    USE inifor_defs,                                                           &
         ONLY :  PATH
-    USE grid,                                                                  & 
+    USE inifor_grid,                                                           &
         ONLY :  get_input_file_list
     USE test_utils
Index: palm/trunk/UTIL/inifor/tests/test-interpolation.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-interpolation.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-interpolation.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_
+! 
+! 
+! 3183 2018-07-27 14:25:55Z suehring
 ! Updated test for new grid_definition
 !
@@ -44,8 +48,8 @@
  PROGRAM test_interpolation
 
-    USE grid, &
-        ONLY:  grid_definition, init_grid_definition, TO_RADIANS, TO_DEGREES, &
+    USE inifor_grid,                                                           &
+        ONLY:  grid_definition, init_grid_definition, TO_RADIANS, TO_DEGREES,  &
                linspace, hhl
-    USE transform, &
+    USE inifor_transform,                                                      &
         ONLY:  find_horizontal_neighbours, compute_horizontal_interp_weights
     USE test_utils
Index: palm/trunk/UTIL/inifor/tests/test-stretching.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-stretching.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-stretching.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_
+! 
+! 
+! 
 ! Initial revision
 ! 
@@ -43,8 +47,8 @@
  PROGRAM test_stretching
 
-    USE defs, &
+    USE inifor_defs,                                                           &
         ONLY :  dp
 
-    USE grid, &
+    USE inifor_grid,                                                           &
         ONLY :  stretched_z
 
Index: palm/trunk/UTIL/inifor/tests/test-transform.f90
===================================================================
--- palm/trunk/UTIL/inifor/tests/test-transform.f90	(revision 3396)
+++ palm/trunk/UTIL/inifor/tests/test-transform.f90	(revision 3618)
@@ -26,4 +26,8 @@
 ! -----------------
 ! $Id$
+! Prefixed all modules with inifor_
+! 
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Initial revision
 !
@@ -40,7 +44,10 @@
  PROGRAM test_transform
 
-    USE defs, ONLY :  TO_RADIANS, TO_DEGREES
-    USE grid, ONLY :  grid_definition, init_grid_definition
-    USE transform, ONLY :  phi2phirot, rla2rlarot, phirot2phi, rlarot2rla
+    USE inifor_defs,                                                           &
+        ONLY :  TO_RADIANS, TO_DEGREES
+    USE inifor_grid,                                                           &
+        ONLY :  grid_definition, init_grid_definition
+    USE inifor_transform,                                                      &
+        ONLY :  phi2phirot, rla2rlarot, phirot2phi, rlarot2rla
     USE test_utils
     
@@ -68,5 +75,5 @@
     lambda_c  = rla2rlarot(phi,   lambda, phi_n, lambda_n, 0.)
 
-    phi2      = phirot2phi(phi_c, lambda_c, phi_n, lambda_n, 0.)
+    phi2      = phirot2phi(phi_c, lambda_c, phi_n, 0.)
     lambda2   = rlarot2rla(phi_c, lambda_c, phi_n, lambda_n, 0.)
 
@@ -91,5 +98,5 @@
     lambda_c  = rla2rlarot(phi,   lambda, phi_n, lambda_n, 0.)
 
-    phi2      = phirot2phi(phi_c, lambda_c, phi_n, lambda_n, 0.)
+    phi2      = phirot2phi(phi_c, lambda_c, phi_n, 0.)
     lambda2   = rlarot2rla(phi_c, lambda_c, phi_n, lambda_n, 0.)
 
