Ignore:
Timestamp:
Oct 29, 2013 1:21:31 PM (8 years ago)
Author:
heinze
Message:

Undoing commit 1239

File:
1 edited

Legend:

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

    r1239 r1240  
    2020! Current revisions:
    2121! -----------------
    22 ! output for nudging + large scale forcing from external file
     22!
    2323!
    2424! Former revisions:
     
    428428        WRITE ( io, 154 )
    429429    ENDIF
    430     IF ( nudging )  THEN
    431         WRITE ( io, 155 )
    432         WRITE ( io, 156 )
    433     ENDIF
    434     IF ( large_scale_forcing )  THEN
    435         WRITE ( io, 157 )
    436         WRITE ( io, 158 )
    437     ENDIF
    438430    WRITE ( io, 99 )
    439431
     
    714706       WRITE ( io, 303 )
    715707       IF ( constant_heatflux )  THEN
    716           IF ( large_scale_forcing .AND. lsf_surf ) THEN
    717              WRITE ( io, 306 )  shf(0,0)
    718           ELSE
    719              WRITE ( io, 306 )  surface_heatflux
    720           ENDIF
     708          WRITE ( io, 306 )  surface_heatflux
    721709          IF ( random_heatflux )  WRITE ( io, 307 )
    722710       ENDIF
    723711       IF ( humidity  .AND.  constant_waterflux )  THEN
    724           IF ( large_scale_forcing .AND. lsf_surf ) THEN
    725              WRITE ( io, 311 ) qsws(0,0)
    726           ELSE
    727              WRITE ( io, 311 ) surface_waterflux
    728           ENDIF
     712          WRITE ( io, 311 ) surface_waterflux
    729713       ENDIF
    730714       IF ( passive_scalar  .AND.  constant_waterflux )  THEN
     
    13041288    ENDDO
    13051289
    1306     IF ( .NOT. large_scale_forcing ) THEN
    1307        WRITE ( io, 423 )  TRIM( coordinates ), TRIM( ugcomponent ), &
    1308                           TRIM( gradients ), TRIM( slices )
    1309     ELSE
    1310        WRITE ( io, 429 )
    1311     ENDIF
     1290    WRITE ( io, 423 )  TRIM( coordinates ), TRIM( ugcomponent ), &
     1291                       TRIM( gradients ), TRIM( slices )
    13121292
    13131293!-- Profile of the geostrophic wind (component vg)
     
    13401320    ENDDO
    13411321
    1342     IF ( .NOT. large_scale_forcing ) THEN
    1343        WRITE ( io, 424 )  TRIM( coordinates ), TRIM( vgcomponent ), &
    1344                           TRIM( gradients ), TRIM( slices )
    1345     ENDIF
     1322    WRITE ( io, 424 )  TRIM( coordinates ), TRIM( vgcomponent ), &
     1323                       TRIM( gradients ), TRIM( slices )
    13461324
    13471325!
     
    13791357    ENDDO
    13801358
    1381     IF ( .NOT. nudging ) THEN
    1382        WRITE ( io, 420 )  TRIM( coordinates ), TRIM( temperatures ), &
    1383                           TRIM( gradients ), TRIM( slices )
    1384     ELSE
    1385        WRITE ( io, 428 )
    1386     ENDIF
     1359    WRITE ( io, 420 )  TRIM( coordinates ), TRIM( temperatures ), &
     1360                       TRIM( gradients ), TRIM( slices )
    13871361
    13881362!
     
    14181392
    14191393       IF ( humidity )  THEN
    1420           IF ( .NOT. nudging ) THEN
    1421              WRITE ( io, 421 )  TRIM( coordinates ), TRIM( temperatures ), &
    1422                                 TRIM( gradients ), TRIM( slices )
    1423           ENDIF
     1394          WRITE ( io, 421 )  TRIM( coordinates ), TRIM( temperatures ), &
     1395                             TRIM( gradients ), TRIM( slices )
    14241396       ELSE
    14251397          WRITE ( io, 422 )  TRIM( coordinates ), TRIM( temperatures ), &
     
    17331705                  'prognostic equation for')
    17341706154 FORMAT ('     the potential temperature')
    1735 155 FORMAT (' --> Nudging is used - initial profiles for u, v, pt and q ',&
    1736                   'correspond to the')
    1737 156 FORMAT ('     first profiles in NUDGING_DATA')
    1738 157 FORMAT (' --> Large scale forcing from external file (LSF_DATA) is used: ')
    1739 158 FORMAT ('     prescribed surfaces fluxes and geostrophic wind components')
    17401707200 FORMAT (//' Run time and time step information:'/ &
    17411708             ' ----------------------------------'/)
     
    19901957427 FORMAT (/'    Initial wind profiles (u,v) are interpolated from given'// &
    19911958                  ' profiles')
    1992 428 FORMAT (/'    Initial profiles (u, v, pt, q) are taken from file '/ &
    1993              '    NUDGING_DATA')
    1994 429 FORMAT (/'    Geostrophic wind profiles (ug, vg) are are taken from file '/ &
    1995              '    LSF_DATA_DATA')
    19961959430 FORMAT (//' Cloud physics quantities / methods:'/ &
    19971960              ' ----------------------------------'/)
Note: See TracChangeset for help on using the changeset viewer.