Changeset 4023 for palm/trunk


Ignore:
Timestamp:
Jun 12, 2019 1:20:01 PM (2 years ago)
Author:
maronga
Message:

consistent output of time stamps in header and run control for runs with spinup. Commented previous revisions in palm_csd

Location:
palm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palm_csd_files/palm_csd_canopy_generator.py

    r4021 r4023  
    2020# Current revisions:
    2121# -----------------
    22 # Added support for tree shape
     22#
    2323#
    2424# Former revisions:
    2525# -----------------
    2626# $Id: palm_csd_canopy_generator.py 3773 2019-03-01 08:56:57Z maronga $
     27# Added support for tree shape
     28#
     29# 3773 2019-03-01 08:56:57Z maronga
    2730# Bugfix: conversion to integer required for indexing
    2831#
  • palm/trunk/SCRIPTS/palm_csd_files/palm_csd_tools.py

    r4021 r4023  
    2020# Current revisions:
    2121# -----------------
    22 # Bugfix: missing conversion to integer
    23 #
     22#
    2423#
    2524# Former revisions:
    2625# -----------------
    2726# $Id: palm_csd_tools.py 3773 2019-03-01 08:56:57Z maronga $
     27# Bugfix: missing conversion to integer
     28#
     29#
     30# 3773 2019-03-01 08:56:57Z maronga
    2831# Unspecified changes
    2932#
  • palm/trunk/SOURCE/header.f90

    r4017 r4023  
    2525! -----------------
    2626! $Id$
     27! Renamed "coupling start time" to "spinup time"
     28!
     29! 4017 2019-06-06 12:16:46Z schwenkel
    2730! unused variable removed
    2831!
     
    20052008             '                                      per second of simulated tim', &
    20062009               'e: ',F9.3,' s')
    2007 207 FORMAT ( ' Coupling start time: ',F9.3,' s')
     2010207 FORMAT ( ' Spinup time:        ',F9.3,' s')
    20082011250 FORMAT (//' Computational grid and domain size:'/ &
    20092012              ' ----------------------------------'// &
  • palm/trunk/SOURCE/time_integration_spinup.f90

    r3885 r4023  
    2525! -----------------
    2626! $Id$
     27! Time stamps are now negative in run control output
     28!
     29! 3885 2019-04-11 11:29:34Z kanani
    2730! Changes related to global restructuring of location messages and introduction
    2831! of additional debug messages
     
    176179    IMPLICIT NONE
    177180
    178     CHARACTER (LEN=9) ::  time_to_string          !<
     181    CHARACTER (LEN=9) ::  time_to_string                  !<
     182 
     183 
     184    CHARACTER (LEN=1) ::  sign_chr                        !< String containing '-' or ' '
     185    CHARACTER (LEN=9) ::  time_since_reference_point_chr  !< time since reference point, i.e., negative during spinup
    179186 
    180187    INTEGER(iwp) ::  i !< running index
     
    449456       simulated_time_chr         = time_to_string( simulated_time )
    450457       time_since_reference_point = simulated_time - coupling_start_time
    451 
     458       time_since_reference_point_chr = time_to_string( ABS(time_since_reference_point) )
     459       
     460       IF ( time_since_reference_point < 0.0_wp )  THEN
     461          sign_chr = '-'
     462       ELSE
     463          sign_chr = ' '
     464       ENDIF
     465     
     466       
    452467       IF ( data_output_during_spinup )  THEN
    453468          IF ( simulated_time >= skip_time_do2d_xy )  THEN
     
    548563!
    549564!--       Write some general information about the spinup in run control file
    550           WRITE ( 15, 101 )  current_timestep_number_spinup, simulated_time_chr, dt_3d, pt_spinup
     565          WRITE ( 15, 101 )  current_timestep_number_spinup, sign_chr, time_since_reference_point_chr, dt_3d, pt_spinup
    551566!
    552567!--       Write buffer contents to disc immediately
     
    583598!-- Formats
    584599100 FORMAT (///'Spinup control output:'/  &
    585             '--------------------------------'// &
    586             'ITER.  HH:MM:SS    DT   PT(z_MO)'/   &
    587             '--------------------------------')
    588 101 FORMAT (I5,2X,A9,1X,F6.2,3X,F6.2,2X,F6.2)
     600            '---------------------------------'// &
     601            'ITER.   HH:MM:SS    DT   PT(z_MO)'/   &
     602            '---------------------------------')
     603101 FORMAT (I5,2X,A1,A9,1X,F6.2,3X,F6.2,2X,F6.2)
    589604
    590605 CONTAINS
Note: See TracChangeset for help on using the changeset viewer.