← Back to branch summary

~fluidity-core/fluidity/sediment

« back to all changes in this revision

Viewing changes to main/Fluids.F90

  • Committer: Sam Parkinson
  • Date: 2011-12-01 15:18:13 UTC
  • mfrom: (3413.1.30 sediment_restructure)
  • Revision ID: s.parkinson11@imperial.ac.uk-20111201151813-9vygndld22tdzepx
merge with sediment_restructure branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/Fluids.F90
194
194
    call initialise_qmesh
195
195
    call initialise_write_state
196
196
 
197
 
 
198
 
    ! Initialise sediments
199
 
    if (have_option("/material_phase[0]/sediment")) then
200
 
        call sediment_init()
201
 
    end if
202
 
 
203
197
    ! Initialise Hyperlight
204
198
#ifdef HAVE_HYPERLIGHT
205
199
    if (have_option("ocean_biology/lagrangian_ensemble/hyperlight")) then
391
385
       ewrite(-1,*) "You must specify a dump format and it must be vtk."
392
386
       FLExit("Rejig your FLML: /io/dump_format")
393
387
    end if
 
388
 
 
389
    ! Initialise k_epsilon before other diagnostic fields are calculated so that
 
390
    !  diffusivity fields are calculated correctly
 
391
    have_k_epsilon = .false.
 
392
    keps_option_path="/material_phase[0]/subgridscale_parameterisations/k-epsilon/"
 
393
    if (have_option(trim(keps_option_path))) then
 
394
        have_k_epsilon = .true.
 
395
        call keps_init(state(1))
 
396
    end if
394
397
 
395
398
    ! initialise the multimaterial fields
396
399
    call initialise_diagnostic_material_properties(state)
442
445
        call gls_init(state(1))
443
446
    end if
444
447
 
445
 
    ! Initialise k_epsilon
446
 
    have_k_epsilon = .false.
447
 
    keps_option_path="/material_phase[0]/subgridscale_parameterisations/k-epsilon/"
448
 
    if (have_option(trim(keps_option_path))) then
449
 
        have_k_epsilon = .true.
450
 
        call keps_init(state(1))
451
 
    end if
452
 
 
453
448
    ! ******************************
454
449
    ! *** Start of timestep loop ***
455
450
    ! ******************************
944
939
        call keps_cleanup()
945
940
    end if
946
941
 
947
 
    if (have_option("/material_phase[0]/sediment")) then
948
 
        call sediment_cleanup()
949
 
    end if
950
 
 
951
942
    ! closing .stat, .convergence and .detector files
952
943
    call close_diagnostic_files()
953
944