Changeset 3743 for palm/trunk/SOURCE


Ignore:
Timestamp:
Feb 15, 2019 8:50:40 AM (3 years ago)
Author:
moh.hefny
Message:

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

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

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

    r3705 r3743  
    2828! -----------------
    2929! $Id$
     30! added read/write number of MRT factors to the respective routines
     31!
     32! 3705 2019-01-29 19:56:39Z suehring
    3033! Make variables that are sampled in virtual measurement module public
    3134!
     
    82938296       INTEGER(iwp)                 :: npcbl_from_file = 0
    82948297       INTEGER(iwp)                 :: nsurfl_from_file = 0
     8298       INTEGER(iwp)                 :: nmrtbl_from_file = 0
    82958299       
    82968300       DO  i = 0, io_blocks-1
     
    83298333             
    83308334!
    8331 !--          read nsvfl, ncsfl, nsurfl
     8335!--          read nsvfl, ncsfl, nsurfl, nmrtf
    83328336             READ ( 88 ) nsvfl, ncsfl, nsurfl_from_file, npcbl_from_file,      &
    8333                          ndsidir_from_file
     8337                         ndsidir_from_file, nmrtbl_from_file, nmrtf
    83348338             
    83358339             IF ( nsvfl < 0  .OR.  ncsfl < 0 )  THEN
     
    83638367                 CALL message( 'radiation_read_svf', 'PA0494', 1, 2, 0, 6, 0 )
    83648368             ENDIF
     8369             IF ( nmrtbl_from_file /= nmrtbl )  THEN
     8370                 WRITE( message_string, * ) 'nmrtbl from SVF file does not ',  &
     8371                                            'match calculated nmrtbl from ',   &
     8372                                            'radiation_interaction_init'
     8373                 CALL message( 'radiation_read_svf', 'PA0494', 1, 2, 0, 6, 0 )
     8374             ELSE
     8375                 WRITE(message_string,*) '    Number of nmrtf to read ', nmrtf
     8376                 CALL location_message( message_string, .TRUE. )
     8377             ENDIF
    83658378             
    83668379!
     
    83798392             
    83808393!
    8381 !--          The allocation of svf, svfsurf, csf and csfsurf happens in routine
    8382 !--          radiation_calc_svf which is not called if the program enters
    8383 !--          radiation_read_svf. Therefore these arrays has to allocate in the
    8384 !--          following
     8394!--          The allocation of svf, svfsurf, csf, csfsurf, mrtf, mrtft, and
     8395!--          mrtfsurf happens in routine radiation_calc_svf which is not
     8396!--          called if the program enters radiation_read_svf. Therefore
     8397!--          these arrays has to allocate in the following
    83858398             IF ( nsvfl > 0 )  THEN
    83868399                ALLOCATE( svf(ndsvf,nsvfl) )
     
    83958408                READ(88) csf
    83968409                READ(88) csfsurf
     8410             ENDIF
     8411
     8412             IF ( nmrtbl > 0 )  THEN
     8413                ALLOCATE ( mrtf(nmrtf) )
     8414                ALLOCATE ( mrtft(nmrtf) )
     8415                ALLOCATE ( mrtfsurf(2,nmrtf) )
     8416                READ(88) mrtf
     8417                READ(88) mrtft
     8418                READ(88) mrtfsurf
    83978419             ENDIF
    83988420             
     
    84298451
    84308452             WRITE ( 89 )  rad_version
    8431              WRITE ( 89 )  nsvfl, ncsfl, nsurfl, npcbl, ndsidir
     8453             WRITE ( 89 )  nsvfl, ncsfl, nsurfl, npcbl, ndsidir, nmrtbl, nmrtf
    84328454             IF ( nsurfl > 0 ) THEN
    84338455                WRITE ( 89 )  skyvf
     
    84468468                 WRITE ( 89 )  csfsurf
    84478469             ENDIF
    8448 
     8470             IF ( nmrtbl > 0 )  THEN
     8471                 WRITE ( 89 )  mrtf
     8472                 WRITE ( 89 )  mrtft               
     8473                 WRITE ( 89 )  mrtfsurf
     8474             ENDIF
    84498475!
    84508476!--          Close binary file                 
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r3730 r3743  
    3131! convert the file back to unix format
    3232!
    33 ! $Id$
     33! 3730 2019-02-11 11:26:47Z moh.hefny
    3434! Formatting and clean-up (rvtils)
    3535!
Note: See TracChangeset for help on using the changeset viewer.