Ignore:
Timestamp:
Oct 30, 2018 8:50:15 PM (3 years ago)
Author:
suehring
Message:

Bugfix for previous commit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/salsa_mod.f90

    r3467 r3473  
    2525! -----------------
    2626! $Id$
     27! NetCDF input routine renamed
     28!
     29! 3467 2018-10-30 19:05:21Z suehring
    2730! Initial revision
    2831!
     
    5457!> @todo Revise masked data output. There is a potential bug in case of
    5558!>       terrain-following masked output, according to data_output_mask.
     59!> @todo There are now improved interfaces for NetCDF data input which can be
     60!>       used instead of get variable etc.
    5661!------------------------------------------------------------------------------!
    5762 MODULE salsa_mod
     
    14041409   
    14051410    USE netcdf_data_input_mod,                                                 &
    1406         ONLY:  get_attribute, get_dimension_length, get_variable, open_read_file
     1411        ONLY:  get_attribute, netcdf_data_input_get_dimension_length,          &
     1412               get_variable, open_read_file
    14071413   
    14081414    IMPLICIT NONE
     
    14681474!
    14691475!--       Input heights   
    1470           CALL get_dimension_length( id_faero, nz_file, "profile_z" )
     1476          CALL netcdf_data_input_get_dimension_length( id_faero, nz_file, "profile_z" )
    14711477         
    14721478          ALLOCATE( pr_z(nz_file), pr_mass_fracs_a(maxspec,nz_file),           &
     
    16091615!
    16101616!--       Input heights   
    1611           CALL get_dimension_length( id_fchem, nz_file, "profile_z" )
     1617          CALL netcdf_data_input_get_dimension_length( id_fchem, nz_file, "profile_z" )
    16121618          ALLOCATE( pr_z(nz_file), pr_gas(ngast,nz_file) )
    16131619          CALL get_variable( id_fchem, 'profile_z', pr_z )
     
    78537859   
    78547860    USE netcdf_data_input_mod,                                                 &
    7855         ONLY:  get_attribute, get_dimension_length, get_variable, open_read_file
     7861        ONLY:  get_attribute, netcdf_data_input_get_dimension_length,          &
     7862               get_variable, open_read_file
    78567863   
    78577864    USE surface_mod,                                                           &
     
    79607967!                             
    79617968!--       Index of gaseous compounds
    7962           CALL get_dimension_length( id_fchem, ng_file, "nspecies" ) 
     7969          CALL netcdf_data_input_get_dimension_length( id_fchem, ng_file, "nspecies" ) 
    79637970          IF ( ng_file < 5 )  THEN
    79647971             message_string = 'Some gaseous emissions missing.'
     
    79687975!
    79697976!--       Get number of emission categories 
    7970           CALL get_dimension_length( id_fchem, ncat, "ncat" )       
     7977          CALL netcdf_data_input_get_dimension_length( id_fchem, ncat, "ncat" )       
    79717978!
    79727979!--       Inquire the unit of gaseous fluxes
     
    80208027!
    80218028!-- Get number of emission categories and their indices       
    8022     CALL get_dimension_length( id_faero, ncat, "ncat" )
     8029    CALL netcdf_data_input_get_dimension_length( id_faero, ncat, "ncat" )
    80238030!
    80248031!-- Get emission category indices
     
    80728079!
    80738080!--    Aerosol geometric mean diameter 
    8074        CALL get_dimension_length( id_faero, nb_file, 'Dmid' )     
     8081       CALL netcdf_data_input_get_dimension_length( id_faero, nb_file, 'Dmid' )     
    80758082       IF ( nb_file /= nbins )  THEN
    80768083          message_string = 'The number of size bins in aerosol input data '//  &
     
    81758182!
    81768183!--    Emission time step
    8177        CALL get_dimension_length( id_faero, n_dt, 'dt_emission' )
     8184       CALL netcdf_data_input_get_dimension_length( id_faero, n_dt, 'dt_emission' )
    81788185       IF ( n_dt > 1 )  THEN
    81798186          CALL location_message( '    salsa_set_source: hourly emission data'//&
     
    81938200!
    81948201!--    Get dimension of z-axis:     
    8195        CALL get_dimension_length( id_faero, nz_file, 'z' )
     8202       CALL netcdf_data_input_get_dimension_length( id_faero, nz_file, 'z' )
    81968203!       
    81978204!--    Read surface emission data (x,y) PE-wise             
Note: See TracChangeset for help on using the changeset viewer.