Changeset 4527

Timestamp:

May 11, 2020 9:39:55 AM (5 years ago)

Author:

monakurppa

Message:

salsa_mod: bug fixes in salsa_wrd_global, salsa_check_data_output and TEST/cases/urban_environment_salsa

Location:

palm/trunk

Files:

• SOURCE/salsa_mod.f90 (modified) (8 diffs)
• TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_p3d (modified) (1 diff)

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Correct a bug in salsa_wrd_global and salsa_check_data_output,
+! and add reglim to be read/written in the restart data
+! 
+! 4525 2020-05-10 17:05:07Z raasch
 ! added reading/writing of global restart data,
 ! added reading/writing restart data with MPI-IO,
@@ -3025 +3029 @@
           READ ( 13 )  mass_fracs_b
 
+       CASE ( 'reglim' )
+          READ ( 13 )  reglim
+
        CASE DEFAULT
 
@@ -3058 +3065 @@
     CALL rrd_mpi_io_global_array( 'mass_fracs_a', mass_fracs_a )
     CALL rrd_mpi_io_global_array( 'mass_fracs_b', mass_fracs_b )
+    CALL rrd_mpi_io_global_array( 'reglim', reglim )
 
  END SUBROUTINE salsa_rrd_global_mpi
@@ -3373 +3381 @@
     IF ( TRIM( restart_data_format_output ) == 'fortran_binary' )  THEN
 
-       CALL wrd_write_string( 'listpec' )
+       CALL wrd_write_string( 'listspec' )
        WRITE ( 14 )  listspec
 
@@ -3390 +3398 @@
        CALL wrd_write_string( 'mass_fracs_b' )
        WRITE ( 14 )  mass_fracs_b
+
+       CALL wrd_write_string( 'reglim' )
+       WRITE ( 14 )  reglim
 
     ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
@@ -3403 +3414 @@
        CALL wrd_mpi_io_global_array( 'mass_fracs_a', mass_fracs_a )
        CALL wrd_mpi_io_global_array( 'mass_fracs_b', mass_fracs_b )
+       CALL wrd_mpi_io_global_array( 'reglim', reglim )
 
     ENDIF
@@ -10713 +10725 @@
           CALL message( 'check_parameters', 'PA0707', 1, 2, 0, 6, 0 )
        ENDIF
+       unit = 'kg/m3'
 
     ELSE
@@ -10728 +10741 @@
              unit = 'mum2/cm3'
 
-          CASE ( 'PM0.1', 'PM2.5', 'PM10', 's_BC', 's_DU', 's_H2O', 's_NH', 's_NO', 's_OC',        &
-                 's_SO4', 's_SS' )
+          CASE ( 'PM0.1', 'PM2.5', 'PM10', 's_BC', 's_DU', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
              unit = 'kg/m3'
 

palm/trunk/TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_p3d

@@ -271 +271 @@
     feedback_to_palm        = .F.,   ! feedback to flow due to condensation of water
     nesting_salsa           = .F.,   ! apply self-nesting for salsa variables
-    read_restart_data_salsa = .F.,   ! skip reading restart data even if it's done for the flow
-    write_binary_salsa      = .F.,   ! skip writing restart data even if it's done for the flow
     nesting_offline_salsa   = .F.,   ! apply offline nesting for salsa