Changeset 3456 for palm/trunk/UTIL/inifor/src

Timestamp:

Oct 30, 2018 2:29:54 PM (6 years ago)

Author:

eckhard

Message:

inifor: Removed surface forcing and internal arrays from netCDF output

Location:

palm/trunk/UTIL/inifor/src

Files:

• inifor.f90 (modified) (3 diffs)
• inifor_defs.f90 (modified) (2 diffs)
• inifor_grid.f90 (modified) (4 diffs)
• inifor_io.f90 (modified) (5 diffs)

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! NetCDf output of internal arrays only with --debug option 
+! 
+! 
+! 3401 2018-10-23 09:33:31Z eckhard
 ! Re-compute geostrophic winds every time step
 ! 
@@ -125 +129 @@
 
     ! Add the output variables to the netCDF output file
-    CALL setup_netcdf_variables(output_file % name, output_var_table)
+    CALL setup_netcdf_variables(output_file % name, output_var_table,          &
+                                cfg % debug)
 
     CALL setup_io_groups()
@@ -424 +429 @@
                       message = "Writing variable '" // TRIM(output_var%name) // "'."
                       CALL report('main loop', message)
-                      CALL update_output(output_var, output_arr, iter, output_file)
+                      CALL update_output(output_var, output_arr, iter,         &
+                                         output_file, cfg)
  CALL run_control('time', 'write')
                    END IF

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bumped version number
+! 
+! 
+! 3447 2018-10-29 15:52:54Z eckhard
 ! Renamed source files for compatibilty with PALM build system
 ! 
@@ -94 +98 @@
  INTEGER, PARAMETER          ::  FORCING_STEP = 1             !< Number of hours between forcing time steps [h]
  REAL(dp), PARAMETER         ::  NUDGING_TAU = 21600.0_dp     !< Nudging relaxation time scale [s]
- CHARACTER(LEN=*), PARAMETER ::  VERSION = '1.4.0'            !< INIFOR version number
+ CHARACTER(LEN=*), PARAMETER ::  VERSION = '1.4.1'            !< INIFOR version number
  CHARACTER(LEN=*), PARAMETER ::  COPYRIGHT = 'Copyright 2017-2018 Leibniz Universitaet Hannover' // &
      NEW_LINE(' ') // ' Copyright 2017-2018 Deutscher Wetterdienst Offenbach' !< Copyright notice

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Remove surface forcing from netCDF output (radiation + precipitation)
+! NetCDf output of internal arrays only with --debug option 
+! 
+! 
+! 3447 2018-10-29 15:52:54Z eckhard
 ! Renamed source files for compatibilty with PALM build system
 ! 
@@ -185 +190 @@
     LOGICAL ::  ls_forcing_variables_required
     LOGICAL ::  profile_grids_required
+    LOGICAL ::  surface_forcing_required
 
     TYPE(nc_var), ALLOCATABLE, TARGET ::  input_var_table(:)  !< table of input variables
@@ -371 +377 @@
        boundary_variables_required = TRIM( cfg % bc_mode ) == 'real'
        ls_forcing_variables_required = TRIM( cfg % bc_mode ) == 'ideal'
+       surface_forcing_required = .FALSE.
 
        IF ( ls_forcing_variables_required )  THEN
@@ -3270 +3277 @@
           var % dimvarids(3)    = output_file % dimvarid_time
           var % dimvarids(1:2)  = output_file % dimvarids_soil(1:2)
-          var % to_be_processed = boundary_variables_required
+          var % to_be_processed = surface_forcing_required
           var % is_internal     = .FALSE.
           var % task            = "interpolate_2d"

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! NetCDf output of internal arrays only with --debug option 
+! 
+! 
+! 3447 2018-10-29 15:52:54Z eckhard
 ! Removed INCLUDE statement for get_netcdf_variable()
 ! Renamed source files for compatibilty with PALM build system
@@ -711 +715 @@
 
 
-    SUBROUTINE setup_netcdf_variables(filename, output_variable_table)
+    SUBROUTINE setup_netcdf_variables(filename, output_variable_table, debug)
 
        CHARACTER (LEN=*), INTENT(IN)        ::  filename
        TYPE(nc_var), INTENT(INOUT), TARGET  ::  output_variable_table(:)
+       LOGICAL, INTENT(IN)                  ::  debug
+
        TYPE(nc_var), POINTER                ::  var
        INTEGER                              ::  i, ncid
+       LOGICAL                              ::  to_be_written
 
        message = "Defining variables in dynamic driver '" // TRIM(filename) // "'."
@@ -728 +735 @@
           var => output_variable_table(i)
 
-          IF ( var % to_be_processed )  THEN
+          to_be_written = ( var % to_be_processed  .AND. .NOT. var % is_internal) .OR.                        &
+                          ( var % is_internal  .AND.  debug )
+
+          IF ( to_be_written )  THEN
              message = "  variable #" // TRIM(str(i)) // " '" // TRIM(var%name) // "'."
              CALL report('setup_netcdf_variables', message)
@@ -920 +930 @@
 
 
-    SUBROUTINE update_output(var, array, iter, output_file)
+    SUBROUTINE update_output(var, array, iter, output_file, cfg)
        TYPE(nc_var), INTENT(IN)  ::  var
        REAL(dp), INTENT(IN)      ::  array(:,:,:)
        INTEGER, INTENT(IN)       ::  iter
        TYPE(nc_file), INTENT(IN) ::  output_file
+       TYPE(inifor_config)       ::  cfg
 
        INTEGER ::  ncid, ndim, start(4), count(4)
@@ -1007 +1018 @@
                                    start=start(1:ndim+1) ) )
 
-       CASE ( 'constant scalar profile', 'geostrophic', 'internal profile' )
+       CASE ( 'constant scalar profile', 'geostrophic' )
 
           CALL check(nf90_put_var( ncid, var%varid, array(1,1,:),              &
                                    start=start(1:ndim+1),                      &
                                    count=count(1:ndim) ) )
+
+       CASE ( 'internal profile' )
+
+          IF ( cfg % debug )  THEN
+             CALL check(nf90_put_var( ncid, var%varid, array(1,1,:),           &
+                                      start=start(1:ndim+1),                   &
+                                      count=count(1:ndim) ) )
+          END IF
 
        CASE ( 'large-scale scalar forcing', 'large-scale w forcing' )