Changeset 2104 for palm/trunk

Timestamp:

Jan 6, 2017 4:01:15 PM (8 years ago)

Author:

knoop

Message:

Bugfix for large scale forcing.

File:

• palm/trunk/SOURCE/ls_forcing_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/ls_forcing_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix for approximation related flux input conversion
 ! 
 ! Former revisions:
@@ -115 +115 @@
            ONLY:  p_surf, pt_surf, q_surf, qsws_surf, shf_surf, td_lsa_lpt,    &
                   td_lsa_q, td_sub_lpt, td_sub_q, time_surf, time_vert,        &
-                  heatflux_input_conversion, waterflux_input_conversion,       &
                   ug_vert, vg_vert, wsubs_vert, zu
 
@@ -226 +225 @@
           CALL message( 'ls_forcing', 'PA0371', 0, 0, 0, 6, 0 )
           lsf_surf = .FALSE.
-       ELSE
-          shf_surf  = shf_surf  * heatflux_input_conversion(nzb)
-          qsws_surf = qsws_surf * waterflux_input_conversion(nzb)
        ENDIF
 
@@ -358 +354 @@
        USE arrays_3d,                                                          &
            ONLY:  p_surf, pt_surf, q_surf, qsws, qsws_surf, shf, shf_surf,     &
+                  heatflux_input_conversion, waterflux_input_conversion,       &
                   time_surf, time_vert, ug, ug_vert, vg, vg_vert
 
@@ -363 +360 @@
            ONLY:  bc_q_b, ibc_pt_b, ibc_q_b, pt_surface, q_surface,            &
                   surface_pressure
+
+       USE indices,                                                            &
+           ONLY:  nzb
 
        USE kinds
@@ -395 +395 @@
 !--       In case of Neumann boundary condition pt_surface is needed for 
 !--       calculation of reference density
-          shf        = shf_surf(nt) + fac * ( shf_surf(nt+1) - shf_surf(nt) )
+          shf        = ( shf_surf(nt) + fac * ( shf_surf(nt+1) - shf_surf(nt) )&
+                       ) * heatflux_input_conversion(nzb)
           pt_surface = pt_surf(nt) + fac * ( pt_surf(nt+1) - pt_surf(nt) )
 
@@ -408 +409 @@
        ELSEIF ( ibc_q_b == 1 )  THEN
 
-          qsws = qsws_surf(nt) + fac * ( qsws_surf(nt+1) - qsws_surf(nt) )
+          qsws = ( qsws_surf(nt) + fac * ( qsws_surf(nt+1) - qsws_surf(nt) )   &
+                 ) * waterflux_input_conversion(nzb)
 
        ENDIF