Changeset 3483 for palm

Timestamp:

Nov 2, 2018 2:19:26 PM (5 years ago)

Author:

raasch

Message:

bugfix: misplaced positions of cpp-directives for netCDF and MPI fixed; output format limited to a maximum line length of 80

Location:

palm/trunk/SOURCE

Files:

• chem_emissions_mod.f90 (modified) (7 diffs)
• cpulog_mod.f90 (modified) (3 diffs)
• netcdf_data_input_mod.f90 (modified) (3 diffs)
• salsa_mod.f90 (modified) (6 diffs)
• surface_output_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/chem_emissions_mod.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! bugfix: wrong locations of netCDF directives fixed
+! 
+! 3467 2018-10-30 19:05:21Z suehring
 ! Enabled PARAMETRIZED mode for default surfaces when LSM is not applied but 
 ! salsa is used
@@ -85 +88 @@
 
 #if defined ( __netcdf )
+    USE NETCDF
+#endif
 
     USE netcdf_data_input_mod,                                                  &
        ONLY: chem_emis_att_type, chem_emis_val_type
-
-    USE NETCDF
-
-#endif
 
     USE date_and_time_mod,                                                      &
@@ -192 +193 @@
 
     !> Boltzmann constant:
-    REAL, PARAMETER        ::  kbolz = 1.38066e-23_wp    ! J/K
+    REAL(wp), PARAMETER     ::  kbolz = 1.38066e-23_wp    ! J/K
 
     !> Inverse Reference Pressure (1/Pa)    
@@ -758 +759 @@
  SUBROUTINE chem_emissions_init(emt_att,emt,nspec_out)
 
-#if defined( __netcdf )
-
     USE surface_mod,                                                           &
        ONLY:  surf_lsm_h,surf_def_h,surf_usm_h
@@ -868 +867 @@
   ENDIF    
 
-#endif
-
-
  END SUBROUTINE chem_emissions_init
 
@@ -899 +895 @@
 
  IMPLICIT NONE
-
-#if defined( __netcdf )
   
     !--- IN/OUT
@@ -1716 +1710 @@
 
 
-#endif
-
  END SUBROUTINE chem_emissions_setup
 

palm/trunk/SOURCE/cpulog_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! output format limited to a maximum line length of 80
+! 
+! 3229 2018-09-04 15:05:36Z sward
 ! Bugfix in maximum time spent per log point: PE 0 was beeing ignored.
 ! 
@@ -587 +590 @@
    101 FORMAT (/'special measures:'/ &
                &'-----------------------------------------------------------', &
-               &'------------------------')
-
-   102 FORMAT (A25,2X,F9.3,2X,F7.2,1X,I7,3(1X,F9.3))
+               &'---------------------')
+
+   102 FORMAT (A25,2X,F9.3,2X,F7.2,1X,I7,2(1X,F9.3),1X,F5.2)
    103 FORMAT (/'Barriers are set in front of collective operations')
    104 FORMAT (/'No barriers are set in front of collective operations')
@@ -595 +598 @@
    106 FORMAT (/'Exchange of ghostpoints via MPI_ISEND/MPI_IRECV')
    107 FORMAT (//)
-   110 FORMAT ('-------------------------------------------------------------',     &
-               &'---------'//&
-               &'place:                              mean        counts      min  ',&
-               &'     max       rms'/ &
-               &'                                sec.      %                sec. ', &
-               &'     sec.      sec.'/  &
-               &'-----------------------------------------------------------',      &
-               &'------------------------')
+   110 FORMAT ('------------------------------------------------------------', &
+               &'----------'//                                                 &
+               &'place:                              mean        counts     ', &
+               &' min       max    rms'/                                       &
+               &'                                sec.      %                ', &
+               &'sec.      sec.   sec.'/                                       &
+               &'-----------------------------------------------------------', &
+               &'---------------------')
    111 FORMAT (/'Barriers are set at beginning (start/continue) of measurements')
 

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: misplaced directives for netCDF fixed
+! 
+! 3474 2018-10-30 21:07:39Z kanani
 ! Add UV exposure model input (Schrempf)
 ! 
@@ -4944 +4947 @@
      SUBROUTINE netcdf_data_input_get_dimension_length( id, dim_len,           &
                                                         variable_name )
-#if defined( __netcdf )
-
        USE pegrid
 
@@ -4957 +4958 @@
        INTEGER(iwp)                ::  id_dim           !< dimension id
 
+#if defined( __netcdf )
 !
 !--    First, inquire dimension ID

palm/trunk/SOURCE/salsa_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: directives added to allow compilation without netCDF
+! 
+! 3481 2018-11-02 09:14:13Z raasch
 ! temporary variable cc introduced to circumvent a possible Intel18 compiler bug
 ! related to contiguous/non-contguous pointer/target attributes
@@ -1410 +1413 @@
         ONLY:  zu
  
-    USE NETCDF
+!    USE NETCDF
     
     USE netcdf_data_input_mod,                                                 &
@@ -1469 +1472 @@
 !
 !--    Read input profiles from PIDS_SALSA    
+#if defined( __netcdf )
 !    
 !--    Location-dependent size distributions and compositions.      
@@ -1560 +1564 @@
           CALL message( 'salsa_mod: aerosol_init', 'SA0032', 1, 2, 0, 6, 0 )                
        ENDIF   ! netcdf_extend   
+#endif
  
     ELSEIF ( isdtyp == 0 )  THEN
@@ -1610 +1615 @@
 !
 !--    Read input profiles from PIDS_CHEM    
+#if defined( __netcdf )
 !    
 !--    Location-dependent size distributions and compositions.      
@@ -1661 +1667 @@
           CALL message( 'salsa_mod: aerosol_init', 'SA0033', 1, 2, 0, 6, 0 )                
        ENDIF   ! netcdf_extend     
+#endif
+
     ENDIF
 

palm/trunk/SOURCE/surface_output_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: missed directives for MPI added
+! 
+! 3421 2018-10-24 18:39:32Z gronemeier
 ! Add output variables
 ! Write data into binary file
-! Initial implenentation from Klaus Ketelsen and Matthias Suehring
+! Initial implementation from Klaus Ketelsen and Matthias Suehring
 !
 ! 3420 2018-10-24 17:30:08Z gronemeier
@@ -796 +799 @@
                WRITE ( 25+av )  surfaces%polygons
             ENDIF
+#if defined( __parallel )
             CALL MPI_BARRIER( comm2d, ierr )
+#endif
             first_output(av) = .TRUE.
          ENDDO
@@ -808 +813 @@
             WRITE ( 25+av )  simulated_time
          ENDIF
+#if defined( __parallel )
          CALL MPI_BARRIER( comm2d, ierr )
+#endif
       ENDDO
 
@@ -1941 +1948 @@
                WRITE ( 25+av )  surfaces%var_out
             ENDIF
+#if defined( __parallel )
             CALL MPI_BARRIER( comm2d, ierr )
+#endif
          ENDDO