From c7e870f0d92d362e2ed14563fa42b38123f2969a Mon Sep 17 00:00:00 2001 From: Seth Underwood Date: Thu, 11 Dec 2014 16:53:29 -0500 Subject: [PATCH] Only static area/volume vars can be in associated_files 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. --- diag_manager/diag_manager.F90 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/diag_manager/diag_manager.F90 b/diag_manager/diag_manager.F90 index 4b71ecb3f9..be355ba7e6 100644 --- a/diag_manager/diag_manager.F90 +++ b/diag_manager/diag_manager.F90 @@ -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