Changeset 1106 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Mar 4, 2013 5:31:38 AM (11 years ago)

Author:

raasch

Message:

New:
---

Porting of FFT-solver for serial runs to GPU using CUDA FFT,
preprocessor lines in transpose routines rearranged, so that routines can also
be used in serial (non-parallel) mode,
transpositions also carried out in serial mode, routines fftx, fftxp replaced
by calls of fft_x, fft_x replaced by fft_x_1d in the 1D-decomposition routines
(Makefile, Makefile_check, fft_xy, poisfft, poisfft_hybrid, transpose, new: cuda_fft_interfaces)

--stdin argument for mpiexec on lckyuh, -y and -Y settings output to header (mrun)

Changed:

---

Module array_kind renamed precision_kind
(check_open, data_output_3d, fft_xy, modules, user_data_output_3d)

some format changes for coupled atmosphere-ocean runs (header)
small changes in code formatting (microphysics, prognostic_equations)

Errors:

---

bugfix: default value (0) assigned to coupling_start_time (modules)
bugfix: initial time for preruns of coupled runs is output as -coupling_start_time (data_output_profiles)

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (8 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! small changes in code formatting
 !
 ! Former revisions:
@@ -418 +418 @@
 
 !
-!--      If required, calculate tendencies for total water content, rain water 
-!--      content, rain drop concentration and liquid temperature
-
-         IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
-
-            tend_q(:,j,i)  = 0.0
-            tend_qr(:,j,i) = 0.0
-            tend_nr(:,j,i) = 0.0
-            tend_pt(:,j,i) = 0.0
-!
-!--         Droplet size distribution (dsd) properties are needed for the 
-!--         computation of selfcollection, breakup, evaporation and 
-!--         sedimentation of rain.  
-            IF ( precipitation )  THEN
-               CALL dsd_properties( i,j ) 
-               CALL autoconversion( i,j )
-               CALL accretion( i,j )
-               CALL selfcollection_breakup( i,j )
-               CALL evaporation_rain( i,j )
-               CALL sedimentation_rain( i,j )
-            ENDIF
-
-            IF ( drizzle )  CALL sedimentation_cloud( i,j )
-
-         ENDIF
+!--       If required, calculate tendencies for total water content, rain water 
+!--       content, rain drop concentration and liquid temperature
+          IF ( cloud_physics  .AND.  icloud_scheme == 0 )  THEN
+
+             tend_q(:,j,i)  = 0.0
+             tend_qr(:,j,i) = 0.0
+             tend_nr(:,j,i) = 0.0
+             tend_pt(:,j,i) = 0.0
+!
+!--          Droplet size distribution (dsd) properties are needed for the
+!--          computation of selfcollection, breakup, evaporation and
+!--          sedimentation of rain
+             IF ( precipitation )  THEN
+                CALL dsd_properties( i,j )
+                CALL autoconversion( i,j )
+                CALL accretion( i,j )
+                CALL selfcollection_breakup( i,j )
+                CALL evaporation_rain( i,j )
+                CALL sedimentation_rain( i,j )
+             ENDIF
+
+             IF ( drizzle )  CALL sedimentation_cloud( i,j )
+
+          ENDIF
 
 !
@@ -469 +468 @@
              ENDIF
 
+!
 !--          Using microphysical tendencies (latent heat)
              IF ( cloud_physics )  THEN
                 IF ( icloud_scheme == 0 )  THEN
                    tend(:,j,i) = tend(:,j,i) + tend_pt(:,j,i)
-                ELSEIF ( icloud_scheme == 1 .AND. precipitation)  THEN
+                ELSEIF ( icloud_scheme == 1  .AND.  precipitation )  THEN
                    CALL impact_of_latent_heat( i, j ) 
                 ENDIF
@@ -480 +480 @@
 !
 !--          Consideration of heat sources within the plant canopy
-             IF ( plant_canopy .AND. ( cthf /= 0.0 ) ) THEN
+             IF ( plant_canopy  .AND.  cthf /= 0.0 )  THEN
                 CALL plant_canopy_model( i, j, 4 )
              ENDIF
 
 !
-!--          If required, compute influence of large-scale subsidence/ascent
+!--          If required, compute effect of large-scale subsidence/ascent
              IF ( large_scale_subsidence )  THEN
                 CALL subsidence( i, j, tend, pt, pt_init )
              ENDIF
-
 
              CALL user_actions( i, j, 'pt-tendency' )
@@ -600 +599 @@
                 IF ( icloud_scheme == 0 )  THEN
                    tend(:,j,i) = tend(:,j,i) + tend_q(:,j,i)
-                ELSEIF ( icloud_scheme == 1 .AND. precipitation )  THEN
+                ELSEIF ( icloud_scheme == 1  .AND.  precipitation )  THEN
                    CALL calc_precipitation( i, j )
                 ENDIF
@@ -606 +605 @@
 !
 !--          Sink or source of scalar concentration due to canopy elements
-             IF ( plant_canopy ) CALL plant_canopy_model( i, j, 5 )
+             IF ( plant_canopy )  CALL plant_canopy_model( i, j, 5 )
 
 !
@@ -645 +644 @@
 !--          If required, calculate prognostic equations for rain water content 
 !--          and rain drop concentration
-             IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
+             IF ( cloud_physics  .AND.  icloud_scheme == 0 )  THEN
 !
 !--             Calculate prognostic equation for rain water content
@@ -706 +705 @@
                 IF ( timestep_scheme(1:5) == 'runge' )  THEN
                    IF ( ws_scheme_sca )  THEN
-                      CALL advec_s_ws( i, j, nr, 'nr', flux_s_nr,    & 
-                                    diss_s_nr, flux_l_nr, diss_l_nr, &
-                                    i_omp_start, tn )
+                      CALL advec_s_ws( i, j, nr, 'nr', flux_s_nr,       & 
+                                       diss_s_nr, flux_l_nr, diss_l_nr, &
+                                       i_omp_start, tn )
                    ELSE 
                       CALL advec_s_pw( i, j, nr )