Changeset 3182 for palm/trunk/UTIL/inifor/src/inifor.f90

Timestamp:

Jul 27, 2018 1:36:03 PM (6 years ago)

Author:

suehring

Message:

New Inifor features: grid stretching, improved command-interface, support start dates in different formats in both YYYYMMDD and YYYYMMDDHH, Ability to manually control input file prefixes (--radiation-prefix, --soil-preifx, --flow-prefix, --soilmoisture-prefix) for compatiblity with DWD forcast naming scheme; GNU-style short and long option; Prepared output of large-scale forcing profiles (no computation yet); Added preprocessor flag netcdf4 to switch output format between netCDF 3 and 4; Updated netCDF variable names and attributes to comply with PIDS v1.9; Inifor bugfixes: Improved compatibility with older Intel Intel compilers by avoiding implicit array allocation; Added origin_lon/_lat values and correct reference time in dynamic driver global attributes; corresponding PALM changes: adjustments to revised Inifor; variables names in dynamic driver adjusted; enable geostrophic forcing also in offline nested mode; variable names in LES-LES and COSMO offline nesting changed; lateral boundary flags for nesting, in- and outflow conditions renamed

File:

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

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

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
+! Introduced new PALM grid stretching
+! Renamend initial-condition mode variable 'mode' to 'ic_mode'
+! Improved log messages
 ! 
 ! 
@@ -48 +51 @@
         ONLY:  setup_parameters, setup_grids, setup_variable_tables,           &
                setup_io_groups, fini_grids, fini_variables, fini_io_groups,    &
-               fini_file_lists, preprocess,                                    &
+               fini_file_lists, preprocess, origin_lon, origin_lat,            &
                output_file, io_group_list, output_var_table,                   &
-               cosmo_grid, palm_grid, nx, ny, nz, ug, vg, p0, mode,            &
-               imin, imax, jmin, jmax
+               cosmo_grid, palm_grid, nx, ny, nz, ug, vg, p0, cfg,             &
+               average_imin, average_imax, average_jmin, average_jmax
 
     USE io
@@ -84 +87 @@
 
     ! Initialize the netCDF output file and define dimensions
-    CALL setup_netcdf_dimensions(output_file, palm_grid)
+    CALL setup_netcdf_dimensions(output_file, palm_grid, cfg % start_date,    &
+                                 origin_lon, origin_lat)
  CALL run_control('time', 'write')
 
     ! Set up the tables containing the input and output variables and set
     ! the corresponding netCDF dimensions for each output variable
-    CALL setup_variable_tables(mode)
+    CALL setup_variable_tables(cfg % ic_mode)
  CALL run_control('time', 'write')
 
@@ -95 +99 @@
     CALL setup_netcdf_variables(output_file % name, output_var_table)
 
-    CALL setup_io_groups() 
+    CALL setup_io_groups()
  CALL run_control('time', 'init')
 
@@ -118 +122 @@
  CALL run_control('time', 'comp')
 
+             !TODO: move this assertion into 'preprocess'.
              IF ( .NOT. ALL(input_buffer(:) % is_preprocessed .AND. .TRUE.) )  THEN
                 message = "Input buffers for group '" // TRIM(group % kind) // &
@@ -159 +164 @@
                       CASE DEFAULT
 
-                          CALL abort("main loop", 'Not a soil variable')
+                          message = "'" // TRIM(output_var % kind) // "' is not a soil variable"
+                          CALL abort("main loop", message)
 
                       END SELECT
@@ -173 +179 @@
                       ALLOCATE( output_arr( 0:output_var % grid % nx,          &
                                             0:output_var % grid % ny,          &
-                                            0:output_var % grid % nz ) )
+                                            1:output_var % grid % nz ) )
 
  CALL run_control('time', 'alloc')
@@ -187 +193 @@
                       ALLOCATE( output_arr( 0:output_var % grid % nx,          &
                                             0:output_var % grid % ny,          &
-                                            0:output_var % grid % nz ) )
+                                            1:output_var % grid % nz ) )
  CALL run_control('time', 'alloc')
                       
@@ -193 +199 @@
                       CALL average_profile(                                    &
                          input_buffer(output_var % input_id) % array(:,:,:),   &
-                         output_arr(:,:,:), imin, imax, jmin, jmax,            &
+                         output_arr(:,:,:), average_imin, average_imax,        &
+                         average_jmin, average_jmax,                           &
                          output_var % intermediate_grid,                       &
                          output_var % grid)
@@ -205 +212 @@
  CALL run_control('time', 'comp')
 
-                   CASE ( 'profile' )
+                   CASE ( 'set profile' )
                       
-                      ALLOCATE( output_arr( 1, 1, 0:nz ) )
+                      ALLOCATE( output_arr( 1, 1, 1:nz ) )
  CALL run_control('time', 'alloc')
 
@@ -217 +224 @@
                       CASE('ls_forcing_vg')
                           output_arr(1, 1, :) = vg
+
+                      CASE('nudging_tau')
+                          output_arr(1, 1, :) = NUDGING_TAU
 
                       CASE DEFAULT
@@ -225 +235 @@
                       END SELECT
  CALL run_control('time', 'comp')
+
+                   CASE('average large-scale profile')
+                      message = "Averaging of large-scale forcing profiles " //&
+                                "has not been implemented, yet."
+                      CALL abort('main loop', message)
+                      !ALLOCATE( output_arr( 1, 1, 1:nz ) )
 
                    CASE DEFAULT
@@ -269 +285 @@
        ELSE 
 
-          message = "Skipping IO group '" // TRIM(group % kind) // "'"
+          message = "Skipping IO group " // TRIM(str(igroup)) // " '" // TRIM(group % kind) // "'"
           IF ( ALLOCATED(group % in_var_list) )  THEN
               message = TRIM(message) // " with input variable '" //           &
@@ -291 +307 @@
  CALL run_control('report', 'void')
 
-    message = "Finished writing forcing file '" // TRIM(output_file % name) // &
+    message = "Finished writing dynamic driver '" // TRIM(output_file % name) // &
               "' successfully."
     CALL report('main loop', message)