Changeset 4074 for palm/trunk/UTIL/inifor/src/inifor_io.f90

Timestamp:

Jul 5, 2019 1:05:19 PM (5 years ago)

Author:

eckhard

Message:

inifor: Changed initialization mode from 'volume' to 'profile'

File:

• palm/trunk/UTIL/inifor/src/inifor_io.f90 (modified) (5 diffs)

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Pass hhl_file directly instead of entire INIFOR configuration
+! 
+! 
+! 3997 2019-05-23 12:35:57Z eckhard
 ! Added boolean indicator for --elevation option invocation
 ! Stop INIFOR if no command-line options given
@@ -759 +763 @@
 
 
- SUBROUTINE get_cosmo_grid( cfg, soil_file, rlon, rlat, hhl, hfl, depths, &
+ SUBROUTINE get_cosmo_grid( hhl_file, soil_file, rlon, rlat, hhl, hfl, depths, &
                             d_depth, d_depth_rho_inv, phi_n, lambda_n,       &
                             phi_equat,                                       &
@@ -766 +770 @@
                             nlon, nlat, nlev, ndepths )
 
-    TYPE(inifor_config), INTENT(IN)                      ::  cfg
-    CHARACTER(LEN=PATH), INTENT(IN)                      ::  soil_file !< list of soil input files (temperature, moisture, <prefix>YYYYMMDDHH-soil.nc)
+    CHARACTER(LEN=PATH), INTENT(IN)                      ::  hhl_file  !< path to file containing the HHL variable (height of half layers)
+    CHARACTER(LEN=PATH), INTENT(IN)                      ::  soil_file !< path to one of the soil input files for reading soil layer depths
     REAL(wp), DIMENSION(:), ALLOCATABLE, INTENT(OUT)     ::  rlon      !< longitudes of COSMO-DE's rotated-pole grid
     REAL(wp), DIMENSION(:), ALLOCATABLE, INTENT(OUT)     ::  rlat      !< latitudes of COSMO-DE's rotated-pole grid
@@ -790 +794 @@
 !-- Read in COSMO's heights of half layers (vertical cell faces)
     cosmo_var%name = NC_HHL_NAME
-    CALL get_netcdf_variable( cfg%hhl_file, cosmo_var, hhl )
-    CALL get_netcdf_dim_vector( cfg%hhl_file, NC_RLON_NAME, rlon )
-    CALL get_netcdf_dim_vector( cfg%hhl_file, NC_RLAT_NAME, rlat )
+    CALL get_netcdf_variable( hhl_file, cosmo_var, hhl )
+    CALL get_netcdf_dim_vector( hhl_file, NC_RLON_NAME, rlon )
+    CALL get_netcdf_dim_vector( hhl_file, NC_RLAT_NAME, rlat )
     CALL get_netcdf_dim_vector( soil_file, NC_DEPTH_NAME, depths)
     CALL log_runtime( 'time', 'read' )
@@ -820 +824 @@
 !-- COSMO rotated pole coordinates
     phi_n = TO_RADIANS                                                       &
-          * get_netcdf_variable_attribute( cfg%hhl_file,                   &
+          * get_netcdf_variable_attribute( hhl_file,                         &
                                            NC_ROTATED_POLE_NAME,             &
                                            NC_POLE_LATITUDE_NAME )
 
     lambda_n = TO_RADIANS                                                    &
-             * get_netcdf_variable_attribute( cfg%hhl_file,                &
+             * get_netcdf_variable_attribute( hhl_file,                      &
                                               NC_ROTATED_POLE_NAME,          &
                                               NC_POLE_LONGITUDE_NAME )