Changeset 3182 for palm/trunk/SOURCE/pres.f90

Timestamp:

Jul 27, 2018 1:36:03 PM (6 years ago)

Author:

suehring

Message:

New Inifor features: grid stretching, improved command-interface, support start dates in different formats in both YYYYMMDD and YYYYMMDDHH, Ability to manually control input file prefixes (--radiation-prefix, --soil-preifx, --flow-prefix, --soilmoisture-prefix) for compatiblity with DWD forcast naming scheme; GNU-style short and long option; Prepared output of large-scale forcing profiles (no computation yet); Added preprocessor flag netcdf4 to switch output format between netCDF 3 and 4; Updated netCDF variable names and attributes to comply with PIDS v1.9; Inifor bugfixes: Improved compatibility with older Intel Intel compilers by avoiding implicit array allocation; Added origin_lon/_lat values and correct reference time in dynamic driver global attributes; corresponding PALM changes: adjustments to revised Inifor; variables names in dynamic driver adjusted; enable geostrophic forcing also in offline nested mode; variable names in LES-LES and COSMO offline nesting changed; lateral boundary flags for nesting, in- and outflow conditions renamed

File:

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

palm/trunk/SOURCE/pres.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Rename variables for boundary flags and nesting
 ! 
 ! Former revisions:
@@ -161 +161 @@
 
     USE control_parameters,                                                    &
-        ONLY:  bc_lr_cyc, bc_ns_cyc, conserve_volume_flow, coupling_mode,      &
+        ONLY:  bc_lr_cyc, bc_ns_cyc, bc_radiation_l, bc_radiation_n,           &
+               bc_radiation_r, bc_radiation_s, child_domain,                   &
+               conserve_volume_flow, coupling_mode,                            &
                dt_3d, gathered_size, ibc_p_b, ibc_p_t,                         &
                intermediate_timestep_count, intermediate_timestep_count_max,   &
-               mg_switch_to_pe0_level, nest_domain, outflow_l, outflow_n,      &
-               outflow_r, outflow_s, psolver, subdomain_size, topography,      &
-               volume_flow, volume_flow_area, volume_flow_initial
+               mg_switch_to_pe0_level, psolver, subdomain_size,                &
+               topography, volume_flow, volume_flow_area, volume_flow_initial
 
     USE cpulog,                                                                &
@@ -219 +220 @@
     REAL(wp), DIMENSION(1:nzt) ::  w_l_l               !<
 
-    LOGICAL :: nest_domain_nvn      !<
+    LOGICAL :: child_domain_nvn      !<
 
 
@@ -280 +281 @@
 !
 !-- Left/right
-    IF ( conserve_volume_flow  .AND.  ( outflow_l .OR. outflow_r ) )  THEN
+    IF ( conserve_volume_flow  .AND.  ( bc_radiation_l .OR.                    &
+                                        bc_radiation_r ) )  THEN
 
        volume_flow(1)   = 0.0_wp
        volume_flow_l(1) = 0.0_wp
 
-       IF ( outflow_l )  THEN
+       IF ( bc_radiation_l )  THEN
           i = 0
-       ELSEIF ( outflow_r )  THEN
+       ELSEIF ( bc_radiation_r )  THEN
           i = nx+1
        ENDIF
@@ -325 +327 @@
 !
 !-- South/north
-    IF ( conserve_volume_flow  .AND.  ( outflow_n .OR. outflow_s ) )  THEN
+    IF ( conserve_volume_flow  .AND.  ( bc_radiation_n .OR. bc_radiation_s ) )  THEN
 
        volume_flow(2)   = 0.0_wp
        volume_flow_l(2) = 0.0_wp
 
-       IF ( outflow_s )  THEN
+       IF ( bc_radiation_s )  THEN
           j = 0
-       ELSEIF ( outflow_n )  THEN
+       ELSEIF ( bc_radiation_n )  THEN
           j = ny+1
        ENDIF
@@ -372 +374 @@
 !-- used both at bottom and top boundary, and if not a nested domain in a 
 !-- normal nesting run. In case of vertical nesting, this must be done.
-!-- Therefore an auxiliary logical variable nest_domain_nvn is used here, and 
+!-- Therefore an auxiliary logical variable child_domain_nvn is used here, and 
 !-- nvn stands for non-vertical nesting. 
 !-- This cannot be done before the first initial time step because ngp_2dh_outer
 !-- is not yet known then.
-    nest_domain_nvn = nest_domain
-    IF ( nest_domain .AND. nesting_mode == 'vertical' )  THEN
-       nest_domain_nvn = .FALSE.
+    child_domain_nvn = child_domain
+    IF ( child_domain .AND. nesting_mode == 'vertical' )  THEN
+       child_domain_nvn = .FALSE.
     ENDIF
 
     IF ( ibc_p_b == 1  .AND.  ibc_p_t == 1  .AND.                               &
-         .NOT. nest_domain_nvn  .AND. intermediate_timestep_count /= 0 )        &
+         .NOT. child_domain_nvn  .AND. intermediate_timestep_count /= 0 )       &
     THEN
        w_l = 0.0_wp;  w_l_l = 0.0_wp
@@ -758 +760 @@
 !-- height nzt after above modifications. Hint: w level nzt+1 does not impact
 !-- results. 
-    IF (nest_domain .OR. coupling_mode == 'vnested_fine') THEN
+    IF ( child_domain  .OR.  coupling_mode == 'vnested_fine' ) THEN
        w(nzt+1,:,:) = w(nzt,:,:)
     ENDIF