From 5bbf0ffa001bc515d7aaae833cbb855b793a0535 Mon Sep 17 00:00:00 2001 From: ann-norcio <142816397+ann-norcio@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:20:06 -0500 Subject: [PATCH 1/6] Update filter_mod.rst Corrected documentation for output_forward_op_errors output --- assimilation_code/modules/assimilation/filter_mod.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assimilation_code/modules/assimilation/filter_mod.rst b/assimilation_code/modules/assimilation/filter_mod.rst index 62e730bc08..9068e45442 100644 --- a/assimilation_code/modules/assimilation/filter_mod.rst +++ b/assimilation_code/modules/assimilation/filter_mod.rst @@ -360,8 +360,8 @@ prior inflation and the second controls the posterior inflation. | | | ensemble member which returns a non-zero | | | | return code, a line will be written to | | | | this file. Each line will have three | -| | | values listed: the observation number, | -| | | the ensemble member number, and the | +| | | values listed: the ensemble member number,| +| | | the (local) observation number, and the | | | | istatus return code. Be cautious when | | | | turning this option on. The number of | | | | lines in this file can be up to the | From 1b7043eaaaf2ab62c7bd73f8af1ab48422ddd9f4 Mon Sep 17 00:00:00 2001 From: ann-norcio <142816397+ann-norcio@users.noreply.github.com> Date: Tue, 19 Dec 2023 16:40:12 -0500 Subject: [PATCH 2/6] Update filter_mod.f90 --- assimilation_code/modules/assimilation/filter_mod.f90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assimilation_code/modules/assimilation/filter_mod.f90 b/assimilation_code/modules/assimilation/filter_mod.f90 index 0565dda900..0484304c14 100644 --- a/assimilation_code/modules/assimilation/filter_mod.f90 +++ b/assimilation_code/modules/assimilation/filter_mod.f90 @@ -2022,10 +2022,10 @@ subroutine verbose_forward_op_output(qc_ens_handle, prior_post, ens_size, keys) endif ! qc_ens_handle is a real representing an integer; values /= 0 get written out -do i = 1, ens_size - do j = 1, qc_ens_handle%my_num_vars - if(nint(qc_ens_handle%copies(i, j)) /= 0) write(forward_unit, *) i, keys(j), nint(qc_ens_handle%copies(i, j)) - end do +do i = 1, ens_size + do j = 1, qc_ens_handle%my_num_vars + if(nint(qc_ens_handle%copies(i, j)) /= 0) write(forward_unit, *) i, keys(qc_ens_handle%my_vars(j)), nint(qc_ens_handle%copies(i, j)) + end do end do call close_file(forward_unit) From 3d35e04ef830140fc641b8d7561525d4608c9dda Mon Sep 17 00:00:00 2001 From: ann-norcio <142816397+ann-norcio@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:06:45 -0500 Subject: [PATCH 3/6] Update filter_mod.f90 --- assimilation_code/modules/assimilation/filter_mod.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assimilation_code/modules/assimilation/filter_mod.f90 b/assimilation_code/modules/assimilation/filter_mod.f90 index 0484304c14..b5ca88be73 100644 --- a/assimilation_code/modules/assimilation/filter_mod.f90 +++ b/assimilation_code/modules/assimilation/filter_mod.f90 @@ -2024,7 +2024,7 @@ subroutine verbose_forward_op_output(qc_ens_handle, prior_post, ens_size, keys) ! qc_ens_handle is a real representing an integer; values /= 0 get written out do i = 1, ens_size do j = 1, qc_ens_handle%my_num_vars - if(nint(qc_ens_handle%copies(i, j)) /= 0) write(forward_unit, *) i, keys(qc_ens_handle%my_vars(j)), nint(qc_ens_handle%copies(i, j)) + if(nint(qc_ens_handle%copies(i, j)) /= 0) write(forward_unit, *) i, j, keys(qc_ens_handle%my_vars(j)), nint(qc_ens_handle%copies(i, j)) end do end do From 47864dcde86a437f3a626f74ee03ec1615b47af7 Mon Sep 17 00:00:00 2001 From: ann-norcio <142816397+ann-norcio@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:24:56 -0500 Subject: [PATCH 4/6] Update filter_mod.rst --- assimilation_code/modules/assimilation/filter_mod.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/assimilation_code/modules/assimilation/filter_mod.rst b/assimilation_code/modules/assimilation/filter_mod.rst index 9068e45442..1d8a18c0aa 100644 --- a/assimilation_code/modules/assimilation/filter_mod.rst +++ b/assimilation_code/modules/assimilation/filter_mod.rst @@ -359,9 +359,10 @@ prior inflation and the second controls the posterior inflation. | | | in the current directory. For each | | | | ensemble member which returns a non-zero | | | | return code, a line will be written to | -| | | this file. Each line will have three | -| | | values listed: the ensemble member number,| -| | | the (local) observation number, and the | +| | | this file. Each line will list the | +| | | following values: the ensemble member | +| | | number, local observation number, the key | +| | | for the local observation, and then the | | | | istatus return code. Be cautious when | | | | turning this option on. The number of | | | | lines in this file can be up to the | From eb520b3db4c1f56bceea20daf83e352eb9c647ca Mon Sep 17 00:00:00 2001 From: ann-norcio <142816397+ann-norcio@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:32:55 -0500 Subject: [PATCH 5/6] Update filter_mod.rst --- assimilation_code/modules/assimilation/filter_mod.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assimilation_code/modules/assimilation/filter_mod.rst b/assimilation_code/modules/assimilation/filter_mod.rst index 1d8a18c0aa..d0b0940494 100644 --- a/assimilation_code/modules/assimilation/filter_mod.rst +++ b/assimilation_code/modules/assimilation/filter_mod.rst @@ -362,7 +362,7 @@ prior inflation and the second controls the posterior inflation. | | | this file. Each line will list the | | | | following values: the ensemble member | | | | number, local observation number, the key | -| | | for the local observation, and then the | +| | | for the observation, and then the | | | | istatus return code. Be cautious when | | | | turning this option on. The number of | | | | lines in this file can be up to the | From a793b1b0e652b6c8086624bbfd71a17494c75fc0 Mon Sep 17 00:00:00 2001 From: ann-norcio <142816397+ann-norcio@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:33:47 -0500 Subject: [PATCH 6/6] Update filter_mod.f90 --- assimilation_code/modules/assimilation/filter_mod.f90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assimilation_code/modules/assimilation/filter_mod.f90 b/assimilation_code/modules/assimilation/filter_mod.f90 index b5ca88be73..80aa020457 100644 --- a/assimilation_code/modules/assimilation/filter_mod.f90 +++ b/assimilation_code/modules/assimilation/filter_mod.f90 @@ -2022,10 +2022,10 @@ subroutine verbose_forward_op_output(qc_ens_handle, prior_post, ens_size, keys) endif ! qc_ens_handle is a real representing an integer; values /= 0 get written out -do i = 1, ens_size - do j = 1, qc_ens_handle%my_num_vars - if(nint(qc_ens_handle%copies(i, j)) /= 0) write(forward_unit, *) i, j, keys(qc_ens_handle%my_vars(j)), nint(qc_ens_handle%copies(i, j)) - end do +do i = 1, ens_size + do j = 1, qc_ens_handle%my_num_vars + if(nint(qc_ens_handle%copies(i, j)) /= 0) write(forward_unit, *) i, j, keys(qc_ens_handle%my_vars(j)), nint(qc_ens_handle%copies(i, j)) + end do end do call close_file(forward_unit)