Changeset 253 for palm/trunk

Timestamp:

Mar 5, 2009 4:22:39 AM (16 years ago)

Author:

raasch

Message:

small adjustments for NEC at RIAM; bugfix concerning output of particle timeseries

Location:

palm/trunk

Files:

• SCRIPTS/mrun (modified) (2 diffs)
• SCRIPTS/subjob (modified) (4 diffs)
• SOURCE/CURRENT_MODIFICATIONS (modified) (1 diff)
• SOURCE/time_integration.f90 (modified) (2 diffs)

palm/trunk/SCRIPTS/mrun

@@ -170 +170 @@
      # 25/02/09 - Siggi  - cputime-option (-t) is allowed to be omitted for
      #                     interactive runs
-     # 02/03/09 - Siggi  - adjustments for new NEC-SX9 at RIAM (necriam)
+     # 05/03/09 - Siggi  - adjustments for new NEC-SX9 at RIAM (necriam)
 
 
@@ -1193 +1193 @@
         (lctit)      queue=sla3;;
         (nech)       queue=none;;
-        (necriam)    queue=SS;;
+        (necriam)    queue=SP;;
         (unics)      queue=unics;;
     esac

palm/trunk/SCRIPTS/subjob

@@ -372 +372 @@
                  esac;;
         (necriam) case  $ndq  in
-                     (SS|P6|X)  error=false;;
+                     (SP|SS|P6)  error=false;;
                      (*)    error=true;;
                  esac;;
@@ -817 +817 @@
 #PBS -b $nodes
 #PBS -o $remote_dayfile
-#PBS -N palm
+#PBS -N $job_name
 #PBS -j o
 #PBS -v MPIPROGINV=YES
@@ -829 +829 @@
 #PBS -q ${queue}
 #PBS -o $remote_dayfile
-#PBS -N palm
+#PBS -N $job_name
 #PBS -j o
 #PBS -v MPIPROGINV=YES
@@ -899 +899 @@
        elif [[ $remote_host = necriam ]]
        then
-          return_queue=SS
+          return_queue=SP
        else
           return_queue=unknown

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -42 +42 @@
 (cpu_log)
 
-advec_particles, check_parameters, cpu_log, init_particles
+Bugfix: output if particle time series only if particle advection is switched
+on. (time_integration)
+
+advec_particles, check_parameters, cpu_log, init_particles, time_integration

palm/trunk/SOURCE/time_integration.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Bugfix: output if particle time series only if particle advection is switched
+!         on
 !
 ! Former revisions:
@@ -494 +495 @@
 !
 !--    Output of particle time series
-       IF ( time_dopts >= dt_dopts  .OR. &
-            ( simulated_time >= particle_advection_start  .AND. &
-              first_call_advec_particles ) )  THEN
-          CALL data_output_ptseries
-          time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )
+       IF ( particle_advection )  THEN
+          IF ( time_dopts >= dt_dopts  .OR. &
+               ( simulated_time >= particle_advection_start  .AND. &
+                 first_call_advec_particles ) )  THEN
+             CALL data_output_ptseries
+             time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )
+          ENDIF
        ENDIF