Skip to content

Commit

Permalink
Only static area/volume vars can be in associated_files
Browse files Browse the repository at this point in the history
Diag_manager now requires that non-static area/volume vars must be in the same file(s) as the variable that needs them.

This requirement will be relaxed after FRE is updated to handle this properly.
  • Loading branch information
underwoo committed Dec 11, 2014
1 parent c90c8a0 commit c7e870f
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions diag_manager/diag_manager.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1126,12 +1126,14 @@ LOGICAL FUNCTION get_related_field(field, rel_field, out_field_id, out_file_id)

! If time_method, freq, output_units, next_output, and last_output the same, or
! the output_field is static then valid for cell_measures
IF ( ( (files(cm_file_num)%output_freq.EQ.files(rel_file)%output_freq) .AND.&
& (files(cm_file_num)%output_units.EQ.files(rel_file)%output_units) .AND.&
& (output_fields(cm_ind)%time_ops.EQV.rel_field%time_ops) .AND.&
& (output_fields(cm_ind)%next_output.EQ.rel_field%next_output) .AND.&
& (output_fields(cm_ind)%last_output.EQ.rel_field%last_output) ).OR.&
& ( output_fields(cm_ind)%static.OR.rel_field%static ) ) THEN
!!$ For now, only static fields can be in an external file
!!$ IF ( ( (files(cm_file_num)%output_freq.EQ.files(rel_file)%output_freq) .AND.&
!!$ & (files(cm_file_num)%output_units.EQ.files(rel_file)%output_units) .AND.&
!!$ & (output_fields(cm_ind)%time_ops.EQV.rel_field%time_ops) .AND.&
!!$ & (output_fields(cm_ind)%next_output.EQ.rel_field%next_output) .AND.&
!!$ & (output_fields(cm_ind)%last_output.EQ.rel_field%last_output) ).OR.&
!!$ & ( output_fields(cm_ind)%static.OR.rel_field%static ) ) THEN
IF ( output_fields(cm_ind)%static.OR.rel_field%static ) THEN
get_related_field = .TRUE.
out_field_id = cm_ind
out_file_id = cm_file_num
Expand Down

0 comments on commit c7e870f

Please sign in to comment.