Changeset 130 for palm/trunk/SOURCE

Timestamp:

Nov 13, 2007 2:08:40 PM (16 years ago)

Author:

letzel

Message:

DVRP output modifications:

• The user can now visualize user-defined quantities using dvrp.

data_output_dvrp calls the new user_interface subroutine
user_data_output_dvrp in case of unknown variables (CASE DEFAULT).

• Two instead of one digit are allowed to specify isosurface and slicer

variables with the parameter mode_dvrp.

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (3 diffs)
• data_output_dvrp.f90 (modified) (3 diffs)
• header.f90 (modified) (3 diffs)
• init_dvrp.f90 (modified) (3 diffs)
• user_interface.f90 (modified) (2 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -1 +1 @@
 New:
 ---
+
+For unknown variables (CASE DEFAULT) call new subroutine user_data_output_dvrp
 
 Pressure boundary conditions for vertical walls added to the multigrid solver.
@@ -11 +13 @@
 advec_particles after the end of this loop.
 
-advec_particles, check_parameters, header, init_grid, init_particles, init_pegrid, modules, package_parin, read_var_list, user_interface, write_var_list
+advec_particles, check_parameters, data_output_dvrp, header, init_grid, init_particles, init_pegrid, modules, package_parin, read_var_list, user_interface, write_var_list
 
 
 Changed:
 -------
+
+Allow two instead of one digit to specify isosurface and slicer variables.
 
 Status of 3D-volume NetCDF data file only depends on switch netcdf_64bit_3d (check_open)
@@ -29 +33 @@
 humidity/scalar/salinity in a future release.
 
-check_open, diffusion_s, modules, prognostic_equations
+check_open, data_output_dvrp, diffusion_s, header, init_dvrp, modules, prognostic_equations
 
 

palm/trunk/SOURCE/data_output_dvrp.f90

@@ -32 +32 @@
 ! Actual revisions:
 ! -----------------
+! allow two instead of one digit to specify isosurface and slicer variables
+! for unknown variables (CASE DEFAULT) call new subroutine 
+! user_data_output_dvrp
 ! TEST: different colours for isosurfaces
 ! TEST: write statements
@@ -116 +119 @@
 !--    isosurfaces)
        IF ( mode_dvrp(m)(1:10) == 'isosurface' )  THEN
-          READ ( mode_dvrp(m), '(10X,I1)' )  vn
+          READ ( mode_dvrp(m), '(10X,I2)' )  vn
           output_variable = do3d(0,vn)
           tv = tv + 1
        ELSEIF ( mode_dvrp(m)(1:6) == 'slicer' )  THEN
-          READ ( mode_dvrp(m), '(6X,I1)' )  vn
+          READ ( mode_dvrp(m), '(6X,I2)' )  vn
           output_variable = do2d(0,vn)
           l = MAX( 2, LEN_TRIM( do2d(0,vn) ) )
@@ -410 +413 @@
 
              CASE DEFAULT
-                IF ( myid == 0 )  THEN
-                   PRINT*,'+++ data_output_dvrp: no output possible for: ', &
-                          output_variable
-                ENDIF
+!
+!--             The DEFAULT case is reached either if output_variable contains
+!--             unsupported variable or if the user has coded a special case in
+!--             the user interface. There, the subroutine user_data_output_dvrp 
+!--             checks which of these two conditions applies.
+                CALL user_data_output_dvrp( output_variable, local_pf )
+
 
           END SELECT

palm/trunk/SOURCE/header.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! allow two instead of one digit to specify isosurface and slicer variables
 ! Output of sorting frequency of particles
 !
@@ -866 +867 @@
        DO WHILE ( mode_dvrp(i) /= ' ' )
           IF ( mode_dvrp(i)(1:10) == 'isosurface' )  THEN
-             READ ( mode_dvrp(i), '(10X,I1)' )  j
+             READ ( mode_dvrp(i), '(10X,I2)' )  j
              l = l + 1
              IF ( do3d(0,j) /= ' ' )  THEN
@@ -872 +873 @@
              ENDIF
           ELSEIF ( mode_dvrp(i)(1:6) == 'slicer' )  THEN
-             READ ( mode_dvrp(i), '(6X,I1)' )  j
+             READ ( mode_dvrp(i), '(6X,I2)' )  j
              IF ( do2d(0,j) /= ' ' )  WRITE ( io, 362 )  TRIM( do2d(0,j) )
           ELSEIF ( mode_dvrp(i)(1:9) == 'particles' )  THEN

palm/trunk/SOURCE/init_dvrp.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! allow two instead of one digit to specify isosurface and slicer variables
 ! Test output of isosurface on camera file
 ! TEST: print* statements
@@ -395 +396 @@
              IF ( mode_dvrp(pn)(1:10) == 'isosurface' )  THEN
 
-                READ ( mode_dvrp(pn), '(10X,I1)' )  vn
+                READ ( mode_dvrp(pn), '(10X,I2)' )  vn
                 steering_dvrp(pn)%name = do3d(0,vn)
                 tv = tv + 1
@@ -417 +418 @@
              ELSEIF ( mode_dvrp(pn)(1:6) == 'slicer' )  THEN
 
-                READ ( mode_dvrp(pn), '(6X,I1)' )  vn
+                READ ( mode_dvrp(pn), '(6X,I2)' )  vn
                 steering_dvrp(pn)%name = do2d(0,vn)
                 name_c = TRIM( do2d(0,vn) )

palm/trunk/SOURCE/user_interface.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! new subroutine user_data_output_dvrp
 ! +argument gls in user_init_grid
 !
@@ -833 +834 @@
 
 
+ SUBROUTINE user_data_output_dvrp( output_variable, local_pf )
+
+!------------------------------------------------------------------------------!
+!
+! Description:
+! ------------
+! Execution of user-defined dvrp output
+!------------------------------------------------------------------------------!
+
+    USE control_parameters
+    USE indices
+    USE pegrid
+    USE user
+
+    IMPLICIT NONE
+
+    CHARACTER (LEN=*) ::  output_variable
+
+    INTEGER ::  i, j, k
+
+    REAL, DIMENSION(nxl:nxr+1,nys:nyn+1,nzb:nz_do3d) ::  local_pf
+
+!
+!-- Here the user-defined DVRP output follows:
+
+!
+!-- Move original array to intermediate array
+    SELECT CASE ( output_variable )
+
+!       CASE ( 'u2', 'u2_xy', 'u2_xz', 'u2_yz',  )
+!!
+!!--       Here the user can add user_defined output quantities. 
+!!--       Uncomment and extend the following lines, if necessary.
+!          DO  i = nxl, nxr+1
+!             DO  j = nys, nyn+1
+!                DO  k = nzb, nz_do3d
+!                   local_pf(i,j,k) = u2(k,j,i)
+!                ENDDO
+!             ENDDO
+!          ENDDO
+
+
+       CASE DEFAULT
+!
+!--       The DEFAULT case is reached if output_variable contains a
+!--       wrong character string that is neither recognized in data_output_dvrp
+!--       nor here in user_data_output_dvrp.
+          IF ( myid == 0 )  THEN
+             PRINT*,'+++ (user_)data_output_dvrp: no output possible for: ', &
+                  output_variable
+          ENDIF
+
+    END SELECT
+
+
+ END SUBROUTINE user_data_output_dvrp
+
+
+
  SUBROUTINE user_data_output_2d( av, variable, found, grid, local_pf )