From 6763c73e322f4bcd5561fd165b44d2cfb99005b2 Mon Sep 17 00:00:00 2001 From: rem1776 Date: Tue, 18 Feb 2025 15:07:15 -0500 Subject: [PATCH 1/3] change diag output yaml name and fix send_data_4d uninitialized return value --- diag_manager/diag_manager.F90 | 1 + diag_manager/fms_diag_yaml.F90 | 2 +- test_fms/diag_manager/test_diag_out_yaml.F90 | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/diag_manager/diag_manager.F90 b/diag_manager/diag_manager.F90 index d16a9a3f7..d107a29f8 100644 --- a/diag_manager/diag_manager.F90 +++ b/diag_manager/diag_manager.F90 @@ -3518,6 +3518,7 @@ LOGICAL FUNCTION send_data_4d(diag_field_id, field, time, is_in, js_in, ks_in, & call fms_diag_object%fms_diag_accept_data(diag_field_id, field, mask_local, rmask_local, & time, is_in, js_in, ks_in, ie_in, je_in, ke_in, weight, & err_msg) + send_data_4d = .true. if (present(err_msg)) then if (err_msg .ne. "") then diff --git a/diag_manager/fms_diag_yaml.F90 b/diag_manager/fms_diag_yaml.F90 index c36bcc93c..e7de7623e 100644 --- a/diag_manager/fms_diag_yaml.F90 +++ b/diag_manager/fms_diag_yaml.F90 @@ -1976,7 +1976,7 @@ subroutine fms_diag_yaml_out() enddo tier2size = i - call write_yaml_from_struct_3( 'diag_out.yaml'//c_null_char, 1, keys, vals, & + call write_yaml_from_struct_3( 'diag_yaml.out'//c_null_char, 1, keys, vals, & SIZE(diag_yaml%diag_files), keys2, vals2, & tier3size, tier3each, keys3, vals3, & (/size(diag_yaml%diag_files), 0, 0, 0, 0, 0, 0, 0/)) diff --git a/test_fms/diag_manager/test_diag_out_yaml.F90 b/test_fms/diag_manager/test_diag_out_yaml.F90 index 3039ac224..2b1f62101 100644 --- a/test_fms/diag_manager/test_diag_out_yaml.F90 +++ b/test_fms/diag_manager/test_diag_out_yaml.F90 @@ -41,7 +41,7 @@ subroutine check_output_yaml integer, parameter :: yaml_len = 402 character(len=128) :: out_yaml_line, ref_yaml_line character(len=17), parameter :: ref_fname = 'diag_out_ref.yaml' - character(len=13), parameter :: out_fname = 'diag_out.yaml' + character(len=13), parameter :: out_fname = 'diag_yaml.out' if( mpp_root_pe() .ne. mpp_pe()) return open(newunit=un_out, file=out_fname, status="old", action="read") open(newunit=un_ref, file=ref_fname, status="old", action="read") @@ -58,4 +58,4 @@ subroutine check_output_yaml end subroutine -end program \ No newline at end of file +end program From c4d3a7f47cad121d8f7b21fc64142922b099e24a Mon Sep 17 00:00:00 2001 From: rem1776 Date: Wed, 26 Feb 2025 10:33:18 -0500 Subject: [PATCH 2/3] change name to diag_manifest.yaml --- diag_manager/fms_diag_yaml.F90 | 2 +- test_fms/diag_manager/test_diag_out_yaml.F90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diag_manager/fms_diag_yaml.F90 b/diag_manager/fms_diag_yaml.F90 index e7de7623e..4d40b06d0 100644 --- a/diag_manager/fms_diag_yaml.F90 +++ b/diag_manager/fms_diag_yaml.F90 @@ -1976,7 +1976,7 @@ subroutine fms_diag_yaml_out() enddo tier2size = i - call write_yaml_from_struct_3( 'diag_yaml.out'//c_null_char, 1, keys, vals, & + call write_yaml_from_struct_3( 'diag_manifest.yaml'//c_null_char, 1, keys, vals, & SIZE(diag_yaml%diag_files), keys2, vals2, & tier3size, tier3each, keys3, vals3, & (/size(diag_yaml%diag_files), 0, 0, 0, 0, 0, 0, 0/)) diff --git a/test_fms/diag_manager/test_diag_out_yaml.F90 b/test_fms/diag_manager/test_diag_out_yaml.F90 index 2b1f62101..36da2fdb4 100644 --- a/test_fms/diag_manager/test_diag_out_yaml.F90 +++ b/test_fms/diag_manager/test_diag_out_yaml.F90 @@ -41,7 +41,7 @@ subroutine check_output_yaml integer, parameter :: yaml_len = 402 character(len=128) :: out_yaml_line, ref_yaml_line character(len=17), parameter :: ref_fname = 'diag_out_ref.yaml' - character(len=13), parameter :: out_fname = 'diag_yaml.out' + character(len=13), parameter :: out_fname = 'diag_manifest.yaml' if( mpp_root_pe() .ne. mpp_pe()) return open(newunit=un_out, file=out_fname, status="old", action="read") open(newunit=un_ref, file=ref_fname, status="old", action="read") From eb7e807eef75dfb6839551159644d8505081440b Mon Sep 17 00:00:00 2001 From: rem1776 Date: Wed, 26 Feb 2025 10:51:04 -0500 Subject: [PATCH 3/3] adjust string length used in test --- test_fms/diag_manager/test_diag_out_yaml.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_fms/diag_manager/test_diag_out_yaml.F90 b/test_fms/diag_manager/test_diag_out_yaml.F90 index 36da2fdb4..0fa7e2c1b 100644 --- a/test_fms/diag_manager/test_diag_out_yaml.F90 +++ b/test_fms/diag_manager/test_diag_out_yaml.F90 @@ -41,7 +41,7 @@ subroutine check_output_yaml integer, parameter :: yaml_len = 402 character(len=128) :: out_yaml_line, ref_yaml_line character(len=17), parameter :: ref_fname = 'diag_out_ref.yaml' - character(len=13), parameter :: out_fname = 'diag_manifest.yaml' + character(len=18), parameter :: out_fname = 'diag_manifest.yaml' if( mpp_root_pe() .ne. mpp_pe()) return open(newunit=un_out, file=out_fname, status="old", action="read") open(newunit=un_ref, file=ref_fname, status="old", action="read")