Changeset 3743 for palm/trunk

Timestamp:

Feb 15, 2019 8:50:40 AM (6 years ago)

Author:

moh.hefny

Message:

added read/write number of MRT factors to the respective routines

Location:

palm/trunk/SOURCE

Files:

• radiation_model_mod.f90 (modified) (8 diffs)
• urban_surface_mod.f90 (modified) (1 diff)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! added read/write number of MRT factors to the respective routines
+!
+! 3705 2019-01-29 19:56:39Z suehring
 ! Make variables that are sampled in virtual measurement module public 
 ! 
@@ -8293 +8296 @@
        INTEGER(iwp)                 :: npcbl_from_file = 0
        INTEGER(iwp)                 :: nsurfl_from_file = 0
+       INTEGER(iwp)                 :: nmrtbl_from_file = 0
        
        DO  i = 0, io_blocks-1
@@ -8329 +8333 @@
               
 !
-!--          read nsvfl, ncsfl, nsurfl
+!--          read nsvfl, ncsfl, nsurfl, nmrtf
              READ ( 88 ) nsvfl, ncsfl, nsurfl_from_file, npcbl_from_file,      &
-                         ndsidir_from_file
+                         ndsidir_from_file, nmrtbl_from_file, nmrtf
              
              IF ( nsvfl < 0  .OR.  ncsfl < 0 )  THEN
@@ -8363 +8367 @@
                  CALL message( 'radiation_read_svf', 'PA0494', 1, 2, 0, 6, 0 )
              ENDIF
+             IF ( nmrtbl_from_file /= nmrtbl )  THEN
+                 WRITE( message_string, * ) 'nmrtbl from SVF file does not ',  &
+                                            'match calculated nmrtbl from ',   &
+                                            'radiation_interaction_init'
+                 CALL message( 'radiation_read_svf', 'PA0494', 1, 2, 0, 6, 0 )
+             ELSE
+                 WRITE(message_string,*) '    Number of nmrtf to read ', nmrtf
+                 CALL location_message( message_string, .TRUE. )
+             ENDIF
               
 !
@@ -8379 +8392 @@
              
 !
-!--          The allocation of svf, svfsurf, csf and csfsurf happens in routine 
-!--          radiation_calc_svf which is not called if the program enters 
-!--          radiation_read_svf. Therefore these arrays has to allocate in the 
-!--          following
+!--          The allocation of svf, svfsurf, csf, csfsurf, mrtf, mrtft, and 
+!--          mrtfsurf happens in routine radiation_calc_svf which is not 
+!--          called if the program enters radiation_read_svf. Therefore 
+!--          these arrays has to allocate in the following
              IF ( nsvfl > 0 )  THEN
                 ALLOCATE( svf(ndsvf,nsvfl) )
@@ -8395 +8408 @@
                 READ(88) csf
                 READ(88) csfsurf
+             ENDIF
+
+             IF ( nmrtbl > 0 )  THEN
+                ALLOCATE ( mrtf(nmrtf) )
+                ALLOCATE ( mrtft(nmrtf) )
+                ALLOCATE ( mrtfsurf(2,nmrtf) )
+                READ(88) mrtf
+                READ(88) mrtft
+                READ(88) mrtfsurf
              ENDIF
               
@@ -8429 +8451 @@
 
              WRITE ( 89 )  rad_version
-             WRITE ( 89 )  nsvfl, ncsfl, nsurfl, npcbl, ndsidir
+             WRITE ( 89 )  nsvfl, ncsfl, nsurfl, npcbl, ndsidir, nmrtbl, nmrtf
              IF ( nsurfl > 0 ) THEN
                 WRITE ( 89 )  skyvf
@@ -8446 +8468 @@
                  WRITE ( 89 )  csfsurf
              ENDIF
-
+             IF ( nmrtbl > 0 )  THEN
+                 WRITE ( 89 )  mrtf
+                 WRITE ( 89 )  mrtft                
+                 WRITE ( 89 )  mrtfsurf
+             ENDIF
 !
 !--          Close binary file                 

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -31 +31 @@
 ! convert the file back to unix format
 !
-! $Id$
+! 3730 2019-02-11 11:26:47Z moh.hefny
 ! Formatting and clean-up (rvtils)
 !