Changeset 2261 for palm/trunk/SOURCE

Timestamp:

Jun 8, 2017 2:25:57 PM (7 years ago)

Author:

raasch

Message:

changes in mrun: unified cycle numbers for output files are used, paths and filenames are allowed to contain arbitrary numbers of dots, archive feature completely removed from the script, nech related parts completely removed, OpenMP bugfix in prognostic_equations

Location:

palm/trunk/SOURCE

Files:

• palm.f90 (modified) (3 diffs)
• prognostic_equations.f90 (modified) (3 diffs)

palm/trunk/SOURCE/palm.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! output of run number for mrun to create unified cycle numbers
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -171 +174 @@
 
     USE control_parameters,                                                    &
-
         ONLY:  cloud_physics, constant_diffusion, coupling_char, coupling_mode,&
                do2d_at_begin, do3d_at_begin, humidity, initializing_actions,   &
-               land_surface, io_blocks, io_group,                              &
-               large_scale_forcing, message_string, microphysics_seifert,      &
-               nest_domain, neutral,                                           &
-               nudging, passive_scalar, simulated_time, simulated_time_chr,    &
-               urban_surface,                                                  &
+               io_blocks, io_group, land_surface, large_scale_forcing,         &
+               message_string, microphysics_seifert, nest_domain, neutral,     &
+               nudging, passive_scalar, runnr, simulated_time,                 &
+               simulated_time_chr, urban_surface,                              &
                user_interface_current_revision,                                &
                user_interface_required_revision, version, wall_heatflux,       &
@@ -480 +481 @@
 
 !
+!-- Write run number to file (used by mrun to create unified cycle numbers for
+!-- output files
+    IF ( myid == 0  .AND.  runnr > 0 )  THEN
+       OPEN( 90, FILE='RUN_NUMBER', FORM='FORMATTED' )
+       WRITE( 90, '(I4)' )  runnr
+       CLOSE( 90 )
+    ENDIF
+
+!
 !-- Take final CPU-time for CPU-time analysis
     CALL cpu_log( log_point(1), 'total', 'stop' )

palm/trunk/SOURCE/prognostic_equations.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for r2232: openmp directives removed
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -404 +407 @@
            call_microphysics_at_all_substeps ) )                               &
     THEN
-       !$OMP PARALLEL private (i,j)
+       !$OMP PARALLEL PRIVATE (i,j)
        !$OMP DO
-!$OMP PARALLEL PRIVATE (i, j)
-!$OMP DO
        DO  i = nxlg, nxrg
           DO  j = nysg, nyng
@@ -414 +415 @@
        ENDDO
        !$OMP END PARALLEL
-!$OMP END PARALLEL
     ENDIF
 
 !
 !-- Loop over all prognostic equations
-    !$OMP PARALLEL private (i,i_omp_start,j,k,loop_start,tn)
+    !$OMP PARALLEL PRIVATE (i,i_omp_start,j,k,loop_start,tn)
 
     !$  tn = omp_get_thread_num()