Changeset 3932

Timestamp:

Apr 24, 2019 5:31:34 PM (6 years ago)

Author:

suehring

Message:

Add missing if statements for call of pmc_set_dataarray_name for TKE and dissipation; minor bugfix for nesting of chemical species

Location:

palm/trunk/SOURCE

Files:

• pmc_child_mod.f90 (modified) (2 diffs)
• pmc_general_mod.f90 (modified) (2 diffs)
• pmc_interface_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/pmc_child_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! ------------------
-! 
+! typo removed
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
-! statemnet added to avoid compiler warning
+! statement added to avoid compiler warning
 ! 
 ! 3655 2019-01-07 16:51:22Z knoop
@@ -247 +247 @@
     IF ( m_model_rank == 0 )  THEN
        myindex = myindex + 1
-       myname%couple_index = myIndex
+       myname%couple_index = myindex
        myname%parentdesc   = TRIM( parentarraydesc )
        myname%nameonparent = TRIM( parentarrayname )

palm/trunk/SOURCE/pmc_general_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! ------------------
-! 
+! Increase character length so that also chemistry variable names fully fit
 ! 
 ! Former revisions:
@@ -132 +132 @@
        TYPE(C_PTR)               :: SendBuf      !< data pointer in send buffer
        TYPE(C_PTR)               :: RecvBuf      !< data pointer in receive buffer
-       CHARACTER(LEN=8)          :: Name         !< name of array
+       CHARACTER(LEN=da_namelen) :: Name         !< name of array
        TYPE(arraydef), POINTER   :: next
     END TYPE arraydef

palm/trunk/SOURCE/pmc_interface_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Add missing if statements for call of pmc_set_dataarray_name for TKE and 
+! dissipation.
 ! 
 ! Former revisions:
@@ -1341 +1342 @@
 !--    design of model coupler, however, data array names must be already 
 !--    available at this point.
-       CALL pmc_set_dataarray_name( 'coarse', 'e'  ,'fine', 'e',  ierr )
+       IF ( (        rans_mode_parent  .AND.         rans_mode )  .OR.         &
+            (  .NOT. rans_mode_parent  .AND.  .NOT.  rans_mode  .AND.          &
+               .NOT. constant_diffusion ) )  THEN
+          CALL pmc_set_dataarray_name( 'coarse', 'e'  ,'fine', 'e',  ierr )
+       ENDIF
 !
 !--    Nesting of dissipation rate only if both parent and child are in RANS
-!--    mode and TKE-epsilo closure is applied. Please so also comment for TKE
+!--    mode and TKE-epsilo closure is applied. Please see also comment for TKE
 !--    above.
-       CALL pmc_set_dataarray_name( 'coarse', 'diss'  ,'fine', 'diss',  ierr )
+       IF ( rans_mode_parent  .AND.  rans_mode  .AND.  rans_tke_e )  THEN
+          CALL pmc_set_dataarray_name( 'coarse', 'diss'  ,'fine', 'diss',  ierr )
+       ENDIF
 
        IF ( .NOT. neutral )  THEN
@@ -1511 +1518 @@
 
        DO  WHILE ( pmc_c_getnextarray( myname ) )
+!
 !--       Note that cg%nz is not the original nz of parent, but the highest
 !--       parent-grid level needed for nesting.