Changeset 2874 for palm/trunk

Timestamp:

Mar 13, 2018 10:55:42 AM (7 years ago)

Author:

knoop

Message:

Bugfix: wrong placement of netcdf cpp-macros fixed

File:

• palm/trunk/SOURCE/netcdf_data_input_mod.f90 (modified) (35 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: wrong placement of netcdf cpp-macros fixed
+! 
+! 2794 2018-02-07 14:09:43Z knoop
 ! Check if 3D building input is consistent to numeric grid.
 ! 
@@ -1635 +1638 @@
        DO  ii = 0, io_blocks-1
           IF ( ii == io_group )  THEN
-#if defined ( __netcdf )
 !
 !--          Input via palm-input data standard 
              IF ( input_pids_static )  THEN
+#if defined ( __netcdf )
 !
 !--             Open file in read-only mode
@@ -1774 +1777 @@
 !--             Close topography input file
                 CALL close_input_file( id_topo )
+#else
+                CONTINUE
 #endif
 !
@@ -3455 +3460 @@
      SUBROUTINE get_attribute_int32( id, attribute_name, value, global,        &
                                      variable_name )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3469 +3473 @@
 
        LOGICAL, INTENT(IN) ::  global                   !< flag indicating global attribute
+#if defined( __netcdf )
 
 !
@@ -3494 +3499 @@
      SUBROUTINE get_attribute_int8( id, attribute_name, value, global,         &
                                     variable_name )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3508 +3512 @@
 
        LOGICAL, INTENT(IN) ::  global                   !< flag indicating global attribute
+#if defined( __netcdf )
 
 !
@@ -3533 +3538 @@
      SUBROUTINE get_attribute_real( id, attribute_name, value, global,         &
                                     variable_name )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3548 +3552 @@
 
        REAL(wp), INTENT(INOUT)     ::  value            !< read value
+#if defined( __netcdf )
 
 
@@ -3576 +3581 @@
      SUBROUTINE get_attribute_string( id, attribute_name, value, global,       &
                                       variable_name )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3590 +3594 @@
 
        LOGICAL, INTENT(IN) ::  global                   !< flag indicating global attribute
+#if defined( __netcdf )
 
 !
@@ -3649 +3654 @@
 !------------------------------------------------------------------------------!
      SUBROUTINE get_variable_1d_int( id, variable_name, var )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3661 +3665 @@
 
        INTEGER(iwp), DIMENSION(:), INTENT(INOUT) ::  var  !< variable to be read
+#if defined( __netcdf )
 
 !
@@ -3680 +3685 @@
 !------------------------------------------------------------------------------!
      SUBROUTINE get_variable_1d_real( id, variable_name, var )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3692 +3696 @@
 
        REAL(wp), DIMENSION(:), INTENT(INOUT) ::  var  !< variable to be read
+#if defined( __netcdf )
 
 !
@@ -3712 +3717 @@
 !------------------------------------------------------------------------------! 
     SUBROUTINE get_variable_2d_real( id, variable_name, i, var )
-#if defined( __netcdf )
 
        USE indices
@@ -3726 +3730 @@
 
        REAL(wp), DIMENSION(nys:nyn), INTENT(INOUT) ::  var  !< variable to be read
+#if defined( __netcdf )
 !
 !--    Inquire variable id
@@ -3746 +3751 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_2d_int32( id, variable_name, i, var )
-#if defined( __netcdf )
 
        USE indices
@@ -3759 +3763 @@
        INTEGER(iwp)                  ::  id_var          !< variable id
        INTEGER(iwp), DIMENSION(nys:nyn), INTENT(INOUT) ::  var  !< variable to be read
+#if defined( __netcdf )
 !
 !--    Inquire variable id
@@ -3779 +3784 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_2d_int8( id, variable_name, i, var )
-#if defined( __netcdf )
 
        USE indices
@@ -3792 +3796 @@
        INTEGER(iwp)                  ::  id_var          !< variable id
        INTEGER(KIND=1), DIMENSION(nys:nyn), INTENT(INOUT) ::  var  !< variable to be read
+#if defined( __netcdf )
 !
 !--    Inquire variable id
@@ -3811 +3816 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_3d_int8( id, variable_name, i, j, var )
-#if defined( __netcdf )
 
        USE indices
@@ -3829 +3833 @@
 
        INTEGER( KIND = 1 ), DIMENSION(nzb:nzt+1), INTENT(INOUT) ::  var  !< variable to be read
+#if defined( __netcdf )
 
 !
@@ -3855 +3860 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_3d_real( id, variable_name, i, j, var )
-#if defined( __netcdf )
 
        USE indices
@@ -3873 +3877 @@
 
        REAL(wp), DIMENSION(:), INTENT(INOUT) ::  var     !< variable to be read
+#if defined( __netcdf )
 
 !
@@ -3900 +3905 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_4d_real( id, variable_name, i, j, var, n3, n4 )
-#if defined( __netcdf )
 
        USE indices
@@ -3919 +3923 @@
 
        REAL(wp), DIMENSION(:,:), INTENT(INOUT) ::  var     !< variable to be read
+#if defined( __netcdf )
 
 !
@@ -3942 +3947 @@
     SUBROUTINE get_variable_bc( id, variable_name, t_start,                    &
                                 i2_s, count_2, i3_s, count_3,  var )
-#if defined( __netcdf )
 
        USE indices
@@ -3960 +3964 @@
 
        REAL(wp), DIMENSION(:), INTENT(INOUT) ::  var     !< input variable 
+#if defined( __netcdf )
 
 !
@@ -3982 +3987 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE inquire_num_variables( id, num_vars )
-#if defined( __netcdf )
 
        USE indices
@@ -3991 +3995 @@
        INTEGER(iwp), INTENT(IN)      ::  id              !< file id
        INTEGER(iwp), INTENT(INOUT)   ::  num_vars        !< number of variables in a file
+#if defined( __netcdf )
 
        nc_stat = NF90_INQUIRE( id, NVARIABLES = num_vars )
@@ -4005 +4010 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE inquire_variable_names( id, var_names )
-#if defined( __netcdf )
 
        USE indices
@@ -4017 +4021 @@
        INTEGER(iwp)                                  ::  num_vars    !< number of variables (unused return parameter)
        INTEGER(iwp), DIMENSION(:), ALLOCATABLE       ::  varids      !< dummy array to strore variable ids temporarily
+#if defined( __netcdf )
 
        ALLOCATE( varids(1:SIZE(var_names)) )
@@ -4037 +4042 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE handle_error( routine_name, errno )
-#if defined( __netcdf )
 
        USE control_parameters,                                                 &
@@ -4048 +4052 @@
 
        INTEGER(iwp) ::  errno
+#if defined( __netcdf )
 
        IF ( nc_stat /= NF90_NOERR )  THEN