Changeset 3473 for palm/trunk

Timestamp:

Oct 30, 2018 8:50:15 PM (6 years ago)

Author:

suehring

Message:

Bugfix for previous commit

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (1 diff)
• init_3d_model.f90 (modified) (1 diff)
• modules.f90 (modified) (1 diff)
• parin.f90 (modified) (1 diff)
• salsa_mod.f90 (modified) (12 diffs)
• time_integration.f90 (modified) (1 diff)
• virtual_measurement_mod.f90 (modified) (1 diff)

palm/trunk/SOURCE/Makefile

@@ -20 +20 @@
 # Current revisions:
 # ------------------
-# Add virtual measurement module
+# 
 # 
 # Former revisions:
 # -----------------
 # $Id$
+# Add virtual measurement module
+# 
+# 3472 2018-10-30 20:43:50Z suehring
 # Add indoor model (kanani, srissman, tlang),
 # minor formatting

palm/trunk/SOURCE/init_3d_model.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! Add virtual measurement module
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Add virtual measurement module
+! 
+! 3472 2018-10-30 20:43:50Z suehring
 ! Add indoor model (kanani, srissman, tlang)
 ! 

palm/trunk/SOURCE/modules.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! +virtual_measurement
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! +virtual_measurement
+! 
+! 3472 2018-10-30 20:43:50Z suehring
 ! Add indoor model (kanani, srissman, tlang)
 ! 

palm/trunk/SOURCE/parin.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! Add virtual measurement module
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Add virtual measurement module
+! 
+! 3472 2018-10-30 20:43:50Z suehring
 ! Add indoor model (kanani, srissman, tlang),
 ! minor formatting

palm/trunk/SOURCE/salsa_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! NetCDF input routine renamed
+! 
+! 3467 2018-10-30 19:05:21Z suehring
 ! Initial revision
 ! 
@@ -54 +57 @@
 !> @todo Revise masked data output. There is a potential bug in case of 
 !>       terrain-following masked output, according to data_output_mask. 
+!> @todo There are now improved interfaces for NetCDF data input which can be
+!>       used instead of get variable etc.
 !------------------------------------------------------------------------------!
  MODULE salsa_mod
@@ -1404 +1409 @@
     
     USE netcdf_data_input_mod,                                                 &
-        ONLY:  get_attribute, get_dimension_length, get_variable, open_read_file
+        ONLY:  get_attribute, netcdf_data_input_get_dimension_length,          &
+               get_variable, open_read_file
     
     IMPLICIT NONE
@@ -1468 +1474 @@
 !
 !--       Input heights   
-          CALL get_dimension_length( id_faero, nz_file, "profile_z" ) 
+          CALL netcdf_data_input_get_dimension_length( id_faero, nz_file, "profile_z" ) 
           
           ALLOCATE( pr_z(nz_file), pr_mass_fracs_a(maxspec,nz_file),           &
@@ -1609 +1615 @@
 !
 !--       Input heights   
-          CALL get_dimension_length( id_fchem, nz_file, "profile_z" ) 
+          CALL netcdf_data_input_get_dimension_length( id_fchem, nz_file, "profile_z" ) 
           ALLOCATE( pr_z(nz_file), pr_gas(ngast,nz_file) ) 
           CALL get_variable( id_fchem, 'profile_z', pr_z ) 
@@ -7853 +7859 @@
     
     USE netcdf_data_input_mod,                                                 &
-        ONLY:  get_attribute, get_dimension_length, get_variable, open_read_file
+        ONLY:  get_attribute, netcdf_data_input_get_dimension_length,          &
+               get_variable, open_read_file
     
     USE surface_mod,                                                           &
@@ -7960 +7967 @@
 !                              
 !--       Index of gaseous compounds
-          CALL get_dimension_length( id_fchem, ng_file, "nspecies" )  
+          CALL netcdf_data_input_get_dimension_length( id_fchem, ng_file, "nspecies" )  
           IF ( ng_file < 5 )  THEN
              message_string = 'Some gaseous emissions missing.'
@@ -7968 +7975 @@
 !
 !--       Get number of emission categories  
-          CALL get_dimension_length( id_fchem, ncat, "ncat" )       
+          CALL netcdf_data_input_get_dimension_length( id_fchem, ncat, "ncat" )       
 !
 !--       Inquire the unit of gaseous fluxes
@@ -8020 +8027 @@
 !
 !-- Get number of emission categories and their indices       
-    CALL get_dimension_length( id_faero, ncat, "ncat" ) 
+    CALL netcdf_data_input_get_dimension_length( id_faero, ncat, "ncat" ) 
 !
 !-- Get emission category indices
@@ -8072 +8079 @@
 !
 !--    Aerosol geometric mean diameter  
-       CALL get_dimension_length( id_faero, nb_file, 'Dmid' )     
+       CALL netcdf_data_input_get_dimension_length( id_faero, nb_file, 'Dmid' )     
        IF ( nb_file /= nbins )  THEN
           message_string = 'The number of size bins in aerosol input data '//  &
@@ -8175 +8182 @@
 !
 !--    Emission time step
-       CALL get_dimension_length( id_faero, n_dt, 'dt_emission' ) 
+       CALL netcdf_data_input_get_dimension_length( id_faero, n_dt, 'dt_emission' ) 
        IF ( n_dt > 1 )  THEN
           CALL location_message( '    salsa_set_source: hourly emission data'//&
@@ -8193 +8200 @@
 !
 !--    Get dimension of z-axis:      
-       CALL get_dimension_length( id_faero, nz_file, 'z' )
+       CALL netcdf_data_input_get_dimension_length( id_faero, nz_file, 'z' )
 !        
 !--    Read surface emission data (x,y) PE-wise             

palm/trunk/SOURCE/time_integration.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! new module for virtual measurements introduced
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! new module for virtual measurements introduced
+! 
+! 3472 2018-10-30 20:43:50Z suehring
 ! Add indoor model (kanani, srissman, tlang)
 ! 

palm/trunk/SOURCE/virtual_measurement_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! Initial revision
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Initial revision
+! 
+! 3472 2018-10-30 20:43:50Z suehring
 !
 ! Authors: