From 437d6fb4d94b3ecc67310f436751fa0593faae4d Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 10 May 2023 15:17:35 +0000 Subject: [PATCH] Update S4 module, remove TODO. #447 --- modulefiles/gsi_s4.lua | 6 +++--- src/gsi/genstats_gps.f90 | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modulefiles/gsi_s4.lua b/modulefiles/gsi_s4.lua index f393ce516a..52e942f458 100644 --- a/modulefiles/gsi_s4.lua +++ b/modulefiles/gsi_s4.lua @@ -1,9 +1,9 @@ help([[ ]]) -local hpc_ver=os.getenv("hpc_ver") or "1.1.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.4" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "18.0.4" +local hpc_ver=os.getenv("hpc_ver") or "1.2.0" +local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1" +local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1" local miniconda_ver=os.getenv("miniconda_ver") or "3.8-s4" local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2" diff --git a/src/gsi/genstats_gps.f90 b/src/gsi/genstats_gps.f90 index d20587e49d..ab61f531de 100644 --- a/src/gsi/genstats_gps.f90 +++ b/src/gsi/genstats_gps.f90 @@ -784,7 +784,6 @@ subroutine contents_netcdf_diag_ call screen_to_single_nc_diag_metadata("Errinv_Adjust",(gps_allptr%rdiag(15)) ) call screen_to_single_nc_diag_metadata("Errinv_Final",(gps_allptr%rdiag(16)) ) call screen_to_single_nc_diag_metadata("Observation",(gps_allptr%rdiag(17)) ) - !TODO Verify that 'adjusted' is supposed to be the same as unadjusted if(isnan(gps_allptr%rdiag(17)) .or. isnan(gps_allptr%rdiag(5))) then call nc_diag_metadata("Obs_Minus_Forecast_adjusted", sngl(real(r_missing))) call nc_diag_metadata("Obs_Minus_Forecast_unadjusted", sngl(real(r_missing)))