← Back to branch summary

~reducedmodelling/fluidity/ReducedModel

« back to all changes in this revision

Viewing changes to diagnostics/Field_Copies.F90

  • Committer: Stephan Kramer
  • Date: 2011-04-22 17:28:48 UTC
  • mfrom: (3448.1.1 fluidity)
  • Revision ID: s.kramer@imperial.ac.uk-20110422172848-ay26j9c5qilnvfr5
Extending ewrite_minmax macro to work with scalar/vector/tensor_fields and (block_)csr_matrices.

Instead of:

  do dim=1, field%dim
    ewrite_minmax(field%val(dim,:))
  end do

, simply do:

  ewrite_minmax(field)

As an added bonus the field%name will also be written to the log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diagnostics/Field_Copies.F90
43
43
  use transform_elements
44
44
  use state_fields_module
45
45
  use sparse_matrices_fields
 
46
  use fldebug
46
47
 
47
48
  implicit none
48
49
  
398
399
    call get_option(trim(path) // "/smoothing_length_scale", alpha)
399
400
    ewrite(2, *) "alpha = ", alpha
400
401
    
401
 
    ewrite_minmax(source_field%val)
 
402
    ewrite_minmax(source_field)
402
403
    call smooth_scalar(source_field, positions, s_field, alpha, path)
403
 
    ewrite_minmax(s_field%val)
 
404
    ewrite_minmax(s_field)
404
405
    
405
406
    deallocate(alpha)
406
407
    if(allocated) deallocate(source_field)
430
431
    ewrite(2, *) "alpha = ", alpha
431
432
    
432
433
    call smooth_vector(source_field, positions, v_field, alpha, path)
433
 
    ewrite_minmax(v_field%val)
 
434
    ewrite_minmax(v_field)
434
435
    
435
436
    deallocate(alpha)
436
437
   
459
460
    call anisotropic_smooth_scalar(source_field, positions, s_field, alpha, path)
460
461
 
461
462
    ewrite(2, *) "alpha = ", alpha
462
 
    ewrite_minmax(source_field%val)
463
 
    ewrite_minmax(s_field%val)
 
463
    ewrite_minmax(source_field)
 
464
    ewrite_minmax(s_field)
464
465
 
465
466
    if(allocated) deallocate(source_field)
466
467
    
487
488
    call anisotropic_smooth_vector(source_field, positions, v_field, alpha, path)
488
489
 
489
490
    ewrite(2, *) "alpha = ", alpha
490
 
    ewrite_minmax(source_field%val)
491
 
    ewrite_minmax(v_field%val)
 
491
    ewrite_minmax(source_field)
 
492
    ewrite_minmax(v_field)
492
493
    
493
494
    ewrite(1, *) "Exiting calculate_helmholtz_anisotropic_smoothed_vector"
494
495
    
514
515
    call anisotropic_smooth_tensor(source_field, positions, t_field, alpha, path)
515
516
 
516
517
    ewrite(2, *) "alpha = ", alpha
517
 
    ewrite_minmax(source_field%val)
518
 
    ewrite_minmax(t_field%val)
 
518
    ewrite_minmax(source_field)
 
519
    ewrite_minmax(t_field)
519
520
    
520
521
    ewrite(1, *) "Exiting calculate_helmholtz_anisotropic_smoothed_tensor"
521
522