Changeset 1992 for palm/trunk/SOURCE/header.f90

Timestamp:

Aug 12, 2016 3:14:59 PM (7 years ago)

Author:

suehring

Message:

Prescribing scalar flux at model top; several bugfixes concering data output of scalars and output of flight data

File:

• palm/trunk/SOURCE/header.f90 (modified) (5 diffs)

palm/trunk/SOURCE/header.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adapted for top_scalarflux
 ! 
 ! Former revisions:
@@ -1017 +1017 @@
 
        ELSE
-          r_lower = 'q(0)     = q(1)'
+          r_lower = 'q(0)      = q(1)'
        ENDIF
        IF ( ibc_q_t == 0 )  THEN
-          r_upper =  'q(nzt)   = q_top'
+          r_upper =  'q(nzt+1) = q_top'
        ELSE
-          r_upper =  'q(nzt)   = q(nzt-1) + dq/dz'
+          r_upper =  'q(nzt+1) = q(nzt) + dq/dz'
        ENDIF
        WRITE ( io, 301 ) 'q', r_lower, r_upper
@@ -1029 +1029 @@
     IF ( passive_scalar )  THEN
        IF ( ibc_s_b == 0 )  THEN
-          r_lower = 's(0)     = s_surface'
+          r_lower = 's(0)      = s_surface'
        ELSE
-          r_lower = 's(0)     = s(1)'
+          r_lower = 's(0)      = s(1)'
        ENDIF
        IF ( ibc_s_t == 0 )  THEN
-          r_upper =  's(nzt)   = s_top'
-       ELSE
-          r_upper =  's(nzt)   = s(nzt-1) + ds/dz'
+          r_upper =  's(nzt+1) = s_top'
+       ELSEIF ( ibc_s_t == 1 )  THEN
+          r_upper =  's(nzt+1) = s(nzt)'
+       ELSEIF ( ibc_s_t == 2 )  THEN
+          r_upper =  's(nzt+1) = s(nzt) + ds/dz'
        ENDIF
        WRITE ( io, 301 ) 's', r_lower, r_upper
@@ -1073 +1075 @@
           WRITE ( io, 316 )
        ENDIF
-       IF ( ocean  .AND.  constant_top_salinityflux )  THEN
+       IF ( ocean  .AND.  constant_top_salinityflux )                          &
           WRITE ( io, 309 )  top_salinityflux
-       ENDIF
        IF ( humidity       )  WRITE ( io, 315 )
-       IF ( passive_scalar )  WRITE ( io, 315 )
+       IF ( passive_scalar .AND.  constant_top_scalarflux )                    &
+          WRITE ( io, 302 ) top_scalarflux
     ENDIF
 
@@ -2033 +2035 @@
 313 FORMAT ('       Predefined constant scalar flux: ',E10.3,' kg/(m**2 s)')
 314 FORMAT ('       Predefined scalar value at the surface')
-315 FORMAT ('       Humidity / scalar flux at top surface is 0.0')
+302 FORMAT ('       Predefined constant scalarflux:   ',F9.6,' kg/(m**2 s)')
+315 FORMAT ('       Humidity flux at top surface is 0.0')
 316 FORMAT ('       Sensible heatflux and momentum flux from coupled ', &
                     'atmosphere model')