Changeset 4404 for palm

Timestamp:

Feb 12, 2020 5:01:53 PM (5 years ago)

Author:

suehring

Message:

Fix misplaced preprocessor directives in netcdf data input

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Fix misplaced preprocessor directives.
+! 
+! 4401 2020-02-11 16:19:09Z suehring
 ! Define a default list of coordinate reference system variables used when
 ! no static driver input is available
@@ -3900 +3903 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE close_input_file( id )
+
+       USE pegrid
+
+       IMPLICIT NONE
+
+       INTEGER(iwp), INTENT(INOUT)        ::  id        !< file id
+
 #if defined( __netcdf )
-
-       USE pegrid
-
-       IMPLICIT NONE
-
-       INTEGER(iwp), INTENT(INOUT)        ::  id        !< file id
-
        nc_stat = NF90_CLOSE( id )
        CALL handle_error( 'close', 540 )
@@ -3919 +3922 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE open_read_file( filename, id )
-#if defined( __netcdf )
 
        USE pegrid
@@ -3927 +3929 @@
        CHARACTER (LEN=*), INTENT(IN) ::  filename  !< filename
        INTEGER(iwp), INTENT(INOUT)   ::  id        !< file id
+
+#if defined( __netcdf )
 
 #if defined( __netcdf4_parallel )
@@ -4166 +4170 @@
 
     SUBROUTINE get_variable_string( id, variable_name, var_string, names_number )
-#if defined( __netcdf )
 
        USE indices
@@ -4191 +4194 @@
                                                                                             ! the number of the components of the first dimensions
                                                                                             ! (rows)
-
+#if defined( __netcdf )
 
        ALLOCATE(tmp_var_string(max_string_length,names_number))
@@ -4418 +4421 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_pr( id, variable_name, t, var )
-#if defined( __netcdf )
 
        USE pegrid
@@ -4434 +4436 @@
        REAL(wp), DIMENSION(:), INTENT(INOUT) ::  var  !< variable to be read
 
+#if defined( __netcdf )
 !
 !--    First, inquire variable ID
@@ -4461 +4464 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE get_variable_surf( id, variable_name, surf )
-#if defined( __netcdf )
 
        USE pegrid
@@ -4473 +4475 @@
        USE grid_variables,                                     &
            ONLY: dx, dy
-       
+
        USE basic_constants_and_equations_mod,                  &
            ONLY: pi
@@ -4506 +4508 @@
        REAL(wp)                                  ::  oro_max_l     !< maximum terrain height under building
 
+#if defined( __netcdf )
 !
 !--    First, inquire variable ID
@@ -5599 +5602 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE inquire_fill_value_int( id, var_name, nofill, fill_value )
-#if defined( __netcdf )
+
        CHARACTER(LEN=*), INTENT(IN) ::  var_name    !< variable name
 
@@ -5607 +5610 @@
        INTEGER(iwp)              ::  id_var      !< netCDF variable id (varid)
 
+#if defined( __netcdf )
        nc_stat = NF90_INQ_VARID( id, TRIM( var_name ), id_var )
        nc_stat = NF90_INQ_VAR_FILL(id, id_var, no_fill, fill_value )
@@ -5623 +5627 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE inquire_fill_value_real( id, var_name, nofill, fill_value )
-#if defined( __netcdf )
+
        CHARACTER(LEN=*), INTENT(IN) ::  var_name    !< variable name
 
@@ -5632 +5636 @@
        REAL(wp), INTENT(OUT)     ::  fill_value  !< fill value
 
+#if defined( __netcdf )
        nc_stat = NF90_INQ_VARID( id, TRIM( var_name ), id_var )
        nc_stat = NF90_INQ_VAR_FILL(id, id_var, no_fill, fill_value )