Changeset 2795 for palm/trunk

Timestamp:

Feb 7, 2018 2:48:48 PM (7 years ago)

Author:

hellstea

Message:

Bugfix in nesting anterpolation relaxation functions

Location:

palm/trunk

Files:

• SOURCE/pmc_interface_mod.f90 (modified) (2 diffs)
• UTIL/Makefile (copied) (copied from palm/trunk/UTIL/Makefile) (1 diff)

palm/trunk/SOURCE/pmc_interface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in computation of the anterpolation under-relaxation functions. 
+! 
+! 2773 2018-01-30 14:12:54Z suehring
 ! - Nesting for chemical species
 ! - Bugfix in setting boundary condition at downward-facing walls for passive
@@ -2632 +2635 @@
        IF ( nesting_mode /= 'vertical' )  THEN
           DO  ii = icl, icr
-             IF ( nest_bound_l )  THEN
+             IF ( ifuu(ii) < ( nx + 1 ) / 2 )  THEN   
                 xi = ( MAX( 0.0_wp, ( cg%coord_x(ii) -                          &
-                       lower_left_coord_x ) ) / anterp_relax_length_l )**4
-             ELSEIF ( nest_bound_r )  THEN
+                     lower_left_coord_x ) ) / anterp_relax_length_l )**4
+                frax(ii) = xi / ( 1.0_wp + xi )
+             ELSE
                 xi = ( MAX( 0.0_wp, ( lower_left_coord_x + ( nx + 1 ) * dx -    &
                                       cg%coord_x(ii) ) ) /                      &
                        anterp_relax_length_r )**4
+                frax(ii) = xi / ( 1.0_wp + xi )                
+             ENDIF
+          ENDDO
+
+
+          DO  jj = jcs, jcn
+             IF ( jfuv(jj) < ( ny + 1 ) / 2 )  THEN 
+                eta = ( MAX( 0.0_wp, ( cg%coord_y(jj) -                         &
+                     lower_left_coord_y ) ) / anterp_relax_length_s )**4
+                fray(jj) = eta / ( 1.0_wp + eta )
              ELSE
-                xi = 999999.9_wp
-             ENDIF
-             frax(ii) = xi / ( 1.0_wp + xi )
-          ENDDO
-
-
-          DO  jj = jcs, jcn
-             IF ( nest_bound_s )  THEN
-                eta = ( MAX( 0.0_wp, ( cg%coord_y(jj) -                         &
-                        lower_left_coord_y ) ) / anterp_relax_length_s )**4
-             ELSEIF ( nest_bound_n )  THEN
                 eta = ( MAX( 0.0_wp, ( lower_left_coord_y + ( ny + 1 ) * dy -   &
                                        cg%coord_y(jj)) ) /                      &
                         anterp_relax_length_n )**4
-             ELSE
-                eta = 999999.9_wp
+                fray(jj) = eta / ( 1.0_wp + eta )
              ENDIF
-             fray(jj) = eta / ( 1.0_wp + eta )
           ENDDO
        ENDIF

palm/trunk/UTIL/Makefile

@@ -49 +49 @@
 CFLAGS = -O
 
-F90 =
-F90_SER =
-COPT =
-F90FLAGS =
-LDFLAGS =
+F90 = mpif90
+F90_SER = gfortran
+COPT = -cpp -DMPI_REAL=MPI_DOUBLE_PRECISION -DMPI_2REAL=MPI_2DOUBLE_PRECISION -D__netcdf
+F90FLAGS = -fcheck=all -fdefault-real-8 -fconvert=little-endian
+LDFLAGS  = -fcheck=all -fdefault-real-8 -fconvert=little-endian
+
+PKG_CONFIG      := PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 pkg-config
+NETCDF_F90FLAGS != $(PKG_CONFIG) --cflags netcdf-fortran
+NETCDF_LDFLAGS  != $(PKG_CONFIG) --libs netcdf-fortran
+F90FLAGS        += $(NETCDF_F90FLAGS)
+LDFLAGS         += $(NETCDF_LDFLAGS)
 
 .SUFFIXES: $(SUFFIXES) .f90