Changeset 2921 for palm/trunk


Ignore:
Timestamp:
Mar 22, 2018 3:05:23 PM (4 years ago)
Author:
Giersch
Message:

further inipar parameter has been added to restart data, bugfix in spinup mechanism

Location:
palm/trunk/SOURCE
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/Makefile

    r2918 r2921  
    2525# -----------------
    2626# $Id$
     27# date_and_time_mod dependency has been added to read/write_restart_data_mod
     28#
     29# 2918 2018-03-21 15:52:14Z gronemeier
    2730# read/write_3d_binary and read/write_var_list has been removed,
    2831# read/write_restart_data_mod, wrd_write_string and
     
    13441347read_restart_data_mod.o: \
    13451348        chemistry_model_mod.o \
    1346         cpulog_mod.o\
     1349        cpulog_mod.o \
     1350        date_and_time_mod.o \
    13471351        gust_mod.o \
    13481352        land_surface_model_mod.o \
     
    16741678write_restart_data_mod.o: \
    16751679        chemistry_model_mod.o \
     1680        date_and_time_mod.o \
    16761681        gust_mod.o \
    16771682        land_surface_model_mod.o \
  • palm/trunk/SOURCE/land_surface_model_mod.f90

    r2894 r2921  
    2525! -----------------
    2626! $Id$
     27! The activation of spinup has been moved to parin
     28!
     29! 2894 2018-03-15 09:17:58Z Giersch
    2730! Calculations of the index range of the subdomain on file which overlaps with
    2831! the current subdomain are already done in read_restart_data_mod,
     
    45864589       land_surface = .TRUE.
    45874590
    4588 !
    4589 !--    Activate spinup
    4590        IF ( spinup_time > 0.0_wp )  THEN
    4591           coupling_start_time = spinup_time
    4592           IF ( spinup_pt_mean == 9999999.9_wp )  THEN
    4593              spinup_pt_mean = pt_surface
    4594           ENDIF
    4595           IF ( .NOT. spinup )  THEN
    4596              end_time = end_time + spinup_time
    4597              spinup = .TRUE.
    4598           ENDIF
    4599        ENDIF
    4600 
    46014591
    46024592 10    CONTINUE
  • palm/trunk/SOURCE/parin.f90

    r2906 r2921  
    2525! -----------------
    2626! $Id$
     27! Activation of spinup has been moved from lsm/usm_parin to parin itself
     28!
     29! 2906 2018-03-19 08:56:40Z Giersch
    2730! ENVIRONMENT variables read/write_svf has been added
    2831!
     
    707710
    708711!
     712!--       Activate spinup
     713          IF ( land_surface .OR. urban_surface )  THEN
     714             IF ( spinup_time > 0.0_wp )  THEN
     715                coupling_start_time = spinup_time
     716                IF ( spinup_pt_mean == 9999999.9_wp )  THEN
     717                   spinup_pt_mean = pt_surface
     718                ENDIF
     719                end_time = end_time + spinup_time
     720                spinup = .TRUE.
     721             ENDIF
     722          ENDIF
     723
     724!
    709725!--       In case of nested runs, explicitly set nesting boundary conditions.
    710726!--       This will overwrite the user settings and basic defaults.
  • palm/trunk/SOURCE/read_restart_data_mod.f90

    r2912 r2921  
    2525! -----------------
    2626! $Id$
     27! spinup_time, day_of_year_init and time_utc_init are also read now
     28!
     29! 2912 2018-03-20 13:00:05Z knoop
    2730! Added gust module interface calls
    2831!
     
    7881           ONLY:  inflow_damping_factor, mean_inflow_profiles, pt_init,        &
    7982                  q_init, ref_state, s_init, sa_init, u_init, ug, v_init, vg
     83
     84       USE date_and_time_mod,                                                  &
     85           ONLY:  day_of_year_init, time_utc_init
    8086
    8187       USE flight_mod,                                                         &
     
    343349             CASE ( 'damp_level_1d' )
    344350                READ ( 13 )  damp_level_1d
     351             CASE ( 'day_of_year_init' )
     352                READ ( 13 )  day_of_year_init
    345353             CASE ( 'dissipation_1d' )
    346354                READ ( 13 )  dissipation_1d
     
    561569             CASE ( 'simulated_time' )
    562570                READ ( 13 )  simulated_time
     571             CASE ( 'spinup_time' )
     572                READ ( 13 )  spinup_time
    563573             CASE ( 'surface_heatflux' )
    564574                READ ( 13 )  surface_heatflux
     
    609619             CASE ( 'time_since_reference_point' )
    610620                READ ( 13 )  time_since_reference_point
     621             CASE ( 'time_utc_init' )
     622                READ ( 13 )  time_utc_init
    611623             CASE ( 'timestep_scheme' )
    612624                READ ( 13 )  timestep_scheme
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r2920 r2921  
    2828! -----------------
    2929! $Id$
     30! The activation of spinup has been moved to parin
     31!
     32! 2920 2018-03-22 11:22:01Z kanani
    3033! Remove unused pcbl, npcbl from ONLY list
    3134! moh.hefny:
     
    51775180       urban_surface = .TRUE.
    51785181
    5179 !
    5180 !--    Activate spinup
    5181        IF ( spinup_time > 0.0_wp )  THEN
    5182           coupling_start_time = spinup_time
    5183           IF ( spinup_pt_mean == 9999999.9_wp )  THEN
    5184              spinup_pt_mean = pt_surface
    5185           ENDIF
    5186           IF ( .NOT. spinup )  THEN
    5187              end_time = end_time + spinup_time
    5188              spinup = .TRUE.
    5189           ENDIF
    5190        ENDIF
    51915182
    51925183 10    CONTINUE
     5184
    51935185
    51945186    END SUBROUTINE usm_parin
  • palm/trunk/SOURCE/write_restart_data_mod.f90

    r2912 r2921  
    2525! -----------------
    2626! $Id$
     27! spinup_time, day_of_year_init and time_utc_init are also written out now
     28!
     29! 2912 2018-03-20 13:00:05Z knoop
    2730! Added gust module interface calls
    2831!
     
    7780                  q_init, ref_state, s_init, sa_init, u_init, ug, v_init, vg
    7881
     82       USE date_and_time_mod,                                                  &
     83           ONLY:  day_of_year_init, time_utc_init
     84
    7985       USE flight_mod,                                                         &
    8086           ONLY:  flight_wrd_global
     
    313319       WRITE ( 14 )  damp_level_1d
    314320
     321       CALL wrd_write_string( 'day_of_year_init' )
     322       WRITE ( 14 )  day_of_year_init
     323
    315324       CALL wrd_write_string( 'dissipation_1d' )
    316325       WRITE ( 14 )  dissipation_1d
     
    632641       WRITE ( 14 )  simulated_time
    633642
     643       CALL wrd_write_string( 'spinup_time ' )
     644       WRITE ( 14 )  spinup_time
     645
    634646       CALL wrd_write_string( 'surface_heatflux' )
    635647       WRITE ( 14 )  surface_heatflux
     
    703715       CALL wrd_write_string( 'time_since_reference_point' )
    704716       WRITE ( 14 )  time_since_reference_point
     717
     718       CALL wrd_write_string( 'time_utc_init' )
     719       WRITE ( 14 )  time_utc_init
    705720
    706721       CALL wrd_write_string( 'timestep_scheme' )
Note: See TracChangeset for help on using the changeset viewer.