Changeset 3618 for palm/trunk/UTIL/inifor/src/inifor_grid.f90

Timestamp:

Dec 10, 2018 1:25:22 PM (5 years ago)

Author:

eckhard

Message:

inifor: Prefixed all INIFOR modules with inifor_ and removed unused variables

File:

• palm/trunk/UTIL/inifor/src/inifor_grid.f90 (modified) (9 diffs)

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Prefixed all INIFOR modules with inifor_, removed unused variables
+! 
+! 
+! 3615 2018-12-10 07:21:03Z raasch
 ! bugfix: abort replaced by inifor_abort
 ! 
@@ -97 +101 @@
 !------------------------------------------------------------------------------!
 
- MODULE grid
-
-    USE control
-    USE defs,                                                                  &
+ MODULE inifor_grid
+
+    USE inifor_control
+    USE inifor_defs,                                                           &
         ONLY:  DATE, EARTH_RADIUS, TO_RADIANS, TO_DEGREES, PI, dp, hp, sp,     &
                SNAME, LNAME, PATH, FORCING_STEP, WATER_ID, FILL_ITERATIONS,    &
                BETA, P_SL, T_SL, BETA, RD, RV, G, P_REF, RD_PALM, CP_PALM,     &
                RHO_L, OMEGA, HECTO
-    USE io,                                                                    &
+    USE inifor_io,                                                             &
         ONLY:  get_netcdf_attribute, get_netcdf_dim_vector,                    &
                get_netcdf_variable, parse_command_line_arguments,              &
                validate_config
-    USE netcdf,                                                                &
-        ONLY:  NF90_MAX_NAME, NF90_MAX_VAR_DIMS
-    USE transform,                                                             &
+    USE inifor_transform,                                                      &
         ONLY:  average_2d, rotate_to_cosmo, find_horizontal_neighbours,&
                compute_horizontal_interp_weights,                              &
@@ -119 +121 @@
                project, centre_velocities, phi2phirot, rla2rlarot, uv2uvrot,   &
                phirot2phi, rlarot2rla
-    USE types
-    USE util
+    USE inifor_types
+    USE inifor_util
+    USE netcdf,                                                                &
+        ONLY:  NF90_MAX_NAME, NF90_MAX_VAR_DIMS
     
     IMPLICIT NONE
@@ -628 +632 @@
        phirot = project(0.5_dp*ly, y0, EARTH_RADIUS) * TO_DEGREES,             &
        rlarot = project(0.5_dp*lx, x0, EARTH_RADIUS) * TO_DEGREES,             &
-       polphi = phi_cn * TO_DEGREES, pollam = lambda_cn * TO_DEGREES,          &
+       polphi = phi_cn * TO_DEGREES,                                           &
        polgam = gam * TO_DEGREES                                               &
     ) * TO_RADIANS
@@ -660 +664 @@
     f3 = 2.0_dp * OMEGA * SIN(                                                 &
        TO_RADIANS*phirot2phi( phi_centre * TO_DEGREES, lam_centre * TO_DEGREES,&
-                              phi_n * TO_DEGREES, lambda_n * TO_DEGREES,       &
+                              phi_n * TO_DEGREES,                              &
                               gam * TO_DEGREES )                               &
        )
@@ -1825 +1829 @@
        IF ( number_stretch_level_end >= 1 ) THEN 
           CALL calculate_stretching_factor( number_stretch_level_end, dz,      & 
-                                            dz_stretch_factor,                 &
                                             dz_stretch_factor_array,           &   
                                             dz_stretch_level_end,              &
@@ -1903 +1906 @@
 !> results into an overdetermined system. 
 !------------------------------------------------------------------------------!
- SUBROUTINE calculate_stretching_factor( number_end, dz, dz_stretch_factor,    &
+ SUBROUTINE calculate_stretching_factor( number_end, dz,                       &
                                          dz_stretch_factor_array,              &   
                                          dz_stretch_level_end,                 &
@@ -1911 +1914 @@
     REAL(dp), DIMENSION(:), INTENT(INOUT) ::  dz_stretch_factor_array
     REAL(dp), DIMENSION(:), INTENT(IN)    ::  dz_stretch_level_end, dz_stretch_level_start
-    REAL(dp)                              ::  dz_stretch_factor
   
     INTEGER ::  iterations  !< number of iterations until stretch_factor_lower/upper_limit is reached  
@@ -4117 +4119 @@
     END SUBROUTINE get_soil_layer_thickness
 
- END MODULE grid
+ END MODULE inifor_grid