Changeset 253


Ignore:
Timestamp:
Mar 5, 2009 4:22:39 AM (13 years ago)
Author:
raasch
Message:

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

Location:
palm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mrun

    r251 r253  
    170170     # 25/02/09 - Siggi  - cputime-option (-t) is allowed to be omitted for
    171171     #                     interactive runs
    172      # 02/03/09 - Siggi  - adjustments for new NEC-SX9 at RIAM (necriam)
     172     # 05/03/09 - Siggi  - adjustments for new NEC-SX9 at RIAM (necriam)
    173173
    174174
     
    11931193        (lctit)      queue=sla3;;
    11941194        (nech)       queue=none;;
    1195         (necriam)    queue=SS;;
     1195        (necriam)    queue=SP;;
    11961196        (unics)      queue=unics;;
    11971197    esac
  • palm/trunk/SCRIPTS/subjob

    r251 r253  
    372372                 esac;;
    373373        (necriam) case  $ndq  in
    374                      (SS|P6|X)  error=false;;
     374                     (SP|SS|P6)  error=false;;
    375375                     (*)    error=true;;
    376376                 esac;;
     
    817817#PBS -b $nodes
    818818#PBS -o $remote_dayfile
    819 #PBS -N palm
     819#PBS -N $job_name
    820820#PBS -j o
    821821#PBS -v MPIPROGINV=YES
     
    829829#PBS -q ${queue}
    830830#PBS -o $remote_dayfile
    831 #PBS -N palm
     831#PBS -N $job_name
    832832#PBS -j o
    833833#PBS -v MPIPROGINV=YES
     
    899899       elif [[ $remote_host = necriam ]]
    900900       then
    901           return_queue=SS
     901          return_queue=SP
    902902       else
    903903          return_queue=unknown
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r247 r253  
    4242(cpu_log)
    4343
    44 advec_particles, check_parameters, cpu_log, init_particles
     44Bugfix: output if particle time series only if particle advection is switched
     45on. (time_integration)
     46
     47advec_particles, check_parameters, cpu_log, init_particles, time_integration
  • palm/trunk/SOURCE/time_integration.f90

    r198 r253  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Bugfix: output if particle time series only if particle advection is switched
     7!         on
    78!
    89! Former revisions:
     
    494495!
    495496!--    Output of particle time series
    496        IF ( time_dopts >= dt_dopts  .OR. &
    497             ( simulated_time >= particle_advection_start  .AND. &
    498               first_call_advec_particles ) )  THEN
    499           CALL data_output_ptseries
    500           time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )
     497       IF ( particle_advection )  THEN
     498          IF ( time_dopts >= dt_dopts  .OR. &
     499               ( simulated_time >= particle_advection_start  .AND. &
     500                 first_call_advec_particles ) )  THEN
     501             CALL data_output_ptseries
     502             time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )
     503          ENDIF
    501504       ENDIF
    502505
Note: See TracChangeset for help on using the changeset viewer.