Changeset 1365 for palm/trunk/SOURCE/buoyancy.f90

Timestamp:

Apr 22, 2014 3:03:56 PM (11 years ago)

Author:

boeske

Message:

large scale forcing enabled

File:

• palm/trunk/SOURCE/buoyancy.f90 (modified) (4 diffs)

palm/trunk/SOURCE/buoyancy.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Calculation of reference state in subroutine calc_mean_profile moved to
+! subroutine time_integration,
+! subroutine calc_mean_profile moved to new file calc_mean_profile.f90
 ! 
 ! Former revisions:
@@ -78 +80 @@
 
     PRIVATE
-    PUBLIC buoyancy, buoyancy_acc, calc_mean_profile
+    PUBLIC buoyancy, buoyancy_acc
 
     INTERFACE buoyancy
@@ -88 +90 @@
        MODULE PROCEDURE buoyancy_acc
     END INTERFACE buoyancy_acc
-
-    INTERFACE calc_mean_profile
-       MODULE PROCEDURE calc_mean_profile
-    END INTERFACE calc_mean_profile
 
  CONTAINS
@@ -376 +374 @@
     END SUBROUTINE buoyancy_ij
 
-
-    SUBROUTINE calc_mean_profile( var, pr, loc )
-
-!------------------------------------------------------------------------------!
-! Description:
-! ------------
-! Calculate the horizontally averaged vertical temperature profile (pr=4 in case
-! of potential temperature, 44 in case of virtual potential temperature, and 64
-! in case of density (ocean runs)).
-!------------------------------------------------------------------------------!
-
-       USE arrays_3d,                                                          &
-           ONLY:  ref_state
-
-       USE control_parameters,                                                 &
-           ONLY:  intermediate_timestep_count, message_string
-
-       USE indices,                                                            &
-           ONLY:  ngp_2dh_s_inner, nxl, nxr, nyn, nys, nzb, nzb_s_inner, nzt
-
-       USE kinds
-
-       USE pegrid
-
-       USE statistics,                                                         &
-           ONLY:  flow_statistics_called, hom, sums, sums_l
-
-
-       IMPLICIT NONE
-
-       CHARACTER (LEN=*) ::  loc !:
-       
-       INTEGER(iwp) ::  i                  !:
-       INTEGER(iwp) ::  j                  !:
-       INTEGER(iwp) ::  k                  !:
-       INTEGER(iwp) ::  pr                 !: 
-       INTEGER(iwp) ::  omp_get_thread_num !:
-       INTEGER(iwp) ::  tn                 !:
-       
-#if defined( __nopointer )
-       REAL(wp), DIMENSION(:,:,:) ::  var  !:
-#else
-       REAL(wp), DIMENSION(:,:,:), POINTER ::  var
-#endif
-
-!
-!--    Computation of the horizontally averaged profile of variable var, unless
-!--    already done by the relevant call from flow_statistics. The calculation
-!--    is done only for the first respective intermediate timestep in order to
-!--    spare communication time and to produce identical model results with jobs
-!--    which are calling flow_statistics at different time intervals.
-       IF ( .NOT. flow_statistics_called  .AND.                                &
-            intermediate_timestep_count == 1 )  THEN
-
-!
-!--       Horizontal average of variable var
-          tn           =   0  ! Default thread number in case of one thread
-          !$OMP PARALLEL PRIVATE( i, j, k, tn )
-!$        tn = omp_get_thread_num()
-          sums_l(:,pr,tn) = 0.0_wp
-          !$OMP DO
-          DO  i = nxl, nxr
-             DO  j =  nys, nyn
-                DO  k = nzb_s_inner(j,i), nzt+1
-                   sums_l(k,pr,tn) = sums_l(k,pr,tn) + var(k,j,i)
-                ENDDO
-             ENDDO
-          ENDDO
-          !$OMP END PARALLEL
-
-          DO  i = 1, threads_per_task-1
-             sums_l(:,pr,0) = sums_l(:,pr,0) + sums_l(:,pr,i)
-          ENDDO
-
-#if defined( __parallel )
-
-          IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
-          CALL MPI_ALLREDUCE( sums_l(nzb,pr,0), sums(nzb,pr), nzt+2-nzb,       &
-                              MPI_REAL, MPI_SUM, comm2d, ierr )
-
-#else
-
-          sums(:,pr) = sums_l(:,pr,0)
-
-#endif
-
-          hom(:,1,pr,0) = sums(:,pr) / ngp_2dh_s_inner(:,0)
-
-       ENDIF
-
-       SELECT CASE ( loc )
-
-          CASE ( 'time_int' )
-
-             ref_state(:)  = hom(:,1,pr,0)   ! this is used in the buoyancy term
-
-
-          CASE ( 'nudging' )
-             !nothing to be done
-
-
-          CASE DEFAULT
-             message_string = 'unknown location "' // loc // '"'
-             CALL message( 'calc_mean_profile', 'PA0379', 1, 2, 0, 6, 0 )
-
-       END SELECT
-
-
-
-    END SUBROUTINE calc_mean_profile
-
  END MODULE buoyancy_mod