Changeset 3483 for palm/trunk
- Timestamp:
- Nov 2, 2018 2:19:26 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/chem_emissions_mod.f90
r3467 r3483 27 27 ! ----------------- 28 28 ! $Id$ 29 ! bugfix: wrong locations of netCDF directives fixed 30 ! 31 ! 3467 2018-10-30 19:05:21Z suehring 29 32 ! Enabled PARAMETRIZED mode for default surfaces when LSM is not applied but 30 33 ! salsa is used … … 85 88 86 89 #if defined ( __netcdf ) 90 USE NETCDF 91 #endif 87 92 88 93 USE netcdf_data_input_mod, & 89 94 ONLY: chem_emis_att_type, chem_emis_val_type 90 91 USE NETCDF92 93 #endif94 95 95 96 USE date_and_time_mod, & … … 192 193 193 194 !> Boltzmann constant: 194 REAL , PARAMETER:: kbolz = 1.38066e-23_wp ! J/K195 REAL(wp), PARAMETER :: kbolz = 1.38066e-23_wp ! J/K 195 196 196 197 !> Inverse Reference Pressure (1/Pa) … … 758 759 SUBROUTINE chem_emissions_init(emt_att,emt,nspec_out) 759 760 760 #if defined( __netcdf )761 762 761 USE surface_mod, & 763 762 ONLY: surf_lsm_h,surf_def_h,surf_usm_h … … 868 867 ENDIF 869 868 870 #endif871 872 873 869 END SUBROUTINE chem_emissions_init 874 870 … … 899 895 900 896 IMPLICIT NONE 901 902 #if defined( __netcdf )903 897 904 898 !--- IN/OUT … … 1716 1710 1717 1711 1718 #endif1719 1720 1712 END SUBROUTINE chem_emissions_setup 1721 1713 -
palm/trunk/SOURCE/cpulog_mod.f90
r3229 r3483 25 25 ! ----------------- 26 26 ! $Id$ 27 ! output format limited to a maximum line length of 80 28 ! 29 ! 3229 2018-09-04 15:05:36Z sward 27 30 ! Bugfix in maximum time spent per log point: PE 0 was beeing ignored. 28 31 ! … … 587 590 101 FORMAT (/'special measures:'/ & 588 591 &'-----------------------------------------------------------', & 589 &'--------------------- ---')590 591 102 FORMAT (A25,2X,F9.3,2X,F7.2,1X,I7, 3(1X,F9.3))592 &'---------------------') 593 594 102 FORMAT (A25,2X,F9.3,2X,F7.2,1X,I7,2(1X,F9.3),1X,F5.2) 592 595 103 FORMAT (/'Barriers are set in front of collective operations') 593 596 104 FORMAT (/'No barriers are set in front of collective operations') … … 595 598 106 FORMAT (/'Exchange of ghostpoints via MPI_ISEND/MPI_IRECV') 596 599 107 FORMAT (//) 597 110 FORMAT ('------------------------------------------------------------ -',&598 &'--------- '//&599 &'place: mean counts min ',&600 &' max rms'/&601 &' sec. % sec.', &602 &' sec. sec.'/&603 &'-----------------------------------------------------------', 604 &'--------------------- ---')600 110 FORMAT ('------------------------------------------------------------', & 601 &'----------'// & 602 &'place: mean counts ', & 603 &' min max rms'/ & 604 &' sec. % ', & 605 &'sec. sec. sec.'/ & 606 &'-----------------------------------------------------------', & 607 &'---------------------') 605 608 111 FORMAT (/'Barriers are set at beginning (start/continue) of measurements') 606 609 -
palm/trunk/SOURCE/netcdf_data_input_mod.f90
r3474 r3483 25 25 ! ----------------- 26 26 ! $Id$ 27 ! bugfix: misplaced directives for netCDF fixed 28 ! 29 ! 3474 2018-10-30 21:07:39Z kanani 27 30 ! Add UV exposure model input (Schrempf) 28 31 ! … … 4944 4947 SUBROUTINE netcdf_data_input_get_dimension_length( id, dim_len, & 4945 4948 variable_name ) 4946 #if defined( __netcdf )4947 4948 4949 USE pegrid 4949 4950 … … 4957 4958 INTEGER(iwp) :: id_dim !< dimension id 4958 4959 4960 #if defined( __netcdf ) 4959 4961 ! 4960 4962 !-- First, inquire dimension ID -
palm/trunk/SOURCE/salsa_mod.f90
r3481 r3483 25 25 ! ----------------- 26 26 ! $Id$ 27 ! bugfix: directives added to allow compilation without netCDF 28 ! 29 ! 3481 2018-11-02 09:14:13Z raasch 27 30 ! temporary variable cc introduced to circumvent a possible Intel18 compiler bug 28 31 ! related to contiguous/non-contguous pointer/target attributes … … 1410 1413 ONLY: zu 1411 1414 1412 USE NETCDF1415 ! USE NETCDF 1413 1416 1414 1417 USE netcdf_data_input_mod, & … … 1469 1472 ! 1470 1473 !-- Read input profiles from PIDS_SALSA 1474 #if defined( __netcdf ) 1471 1475 ! 1472 1476 !-- Location-dependent size distributions and compositions. … … 1560 1564 CALL message( 'salsa_mod: aerosol_init', 'SA0032', 1, 2, 0, 6, 0 ) 1561 1565 ENDIF ! netcdf_extend 1566 #endif 1562 1567 1563 1568 ELSEIF ( isdtyp == 0 ) THEN … … 1610 1615 ! 1611 1616 !-- Read input profiles from PIDS_CHEM 1617 #if defined( __netcdf ) 1612 1618 ! 1613 1619 !-- Location-dependent size distributions and compositions. … … 1661 1667 CALL message( 'salsa_mod: aerosol_init', 'SA0033', 1, 2, 0, 6, 0 ) 1662 1668 ENDIF ! netcdf_extend 1669 #endif 1670 1663 1671 ENDIF 1664 1672 -
palm/trunk/SOURCE/surface_output_mod.f90
r3421 r3483 25 25 ! ----------------- 26 26 ! $Id$ 27 ! bugfix: missed directives for MPI added 28 ! 29 ! 3421 2018-10-24 18:39:32Z gronemeier 27 30 ! Add output variables 28 31 ! Write data into binary file 29 ! Initial imple nentation from Klaus Ketelsen and Matthias Suehring32 ! Initial implementation from Klaus Ketelsen and Matthias Suehring 30 33 ! 31 34 ! 3420 2018-10-24 17:30:08Z gronemeier … … 796 799 WRITE ( 25+av ) surfaces%polygons 797 800 ENDIF 801 #if defined( __parallel ) 798 802 CALL MPI_BARRIER( comm2d, ierr ) 803 #endif 799 804 first_output(av) = .TRUE. 800 805 ENDDO … … 808 813 WRITE ( 25+av ) simulated_time 809 814 ENDIF 815 #if defined( __parallel ) 810 816 CALL MPI_BARRIER( comm2d, ierr ) 817 #endif 811 818 ENDDO 812 819 … … 1941 1948 WRITE ( 25+av ) surfaces%var_out 1942 1949 ENDIF 1950 #if defined( __parallel ) 1943 1951 CALL MPI_BARRIER( comm2d, ierr ) 1952 #endif 1944 1953 ENDDO 1945 1954
Note: See TracChangeset
for help on using the changeset viewer.