From 4754b8ec39ab1facdf03d5068680bf79a5004d98 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Tue, 9 Apr 2024 08:56:49 +0100 Subject: [PATCH 1/2] First change attempt --- src/opsinputs/opsinputs_varobswriter_mod.F90 | 52 +++++++++--------- test/generate_unittest_netcdfs.py | 2 +- .../testinput/080_VarField_biaspredictors.nc4 | Bin 20179 -> 20179 bytes 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/opsinputs/opsinputs_varobswriter_mod.F90 b/src/opsinputs/opsinputs_varobswriter_mod.F90 index 6a6c4907..1864fa1a 100644 --- a/src/opsinputs/opsinputs_varobswriter_mod.F90 +++ b/src/opsinputs/opsinputs_varobswriter_mod.F90 @@ -1492,32 +1492,32 @@ subroutine opsinputs_varobswriter_fillpredictors( & "thickness_200_50hPa ", & "Tskin ", & "total_column_water ", & - "Legendre_order_1 ", & - "Legendre_order_2 ", & - "Legendre_order_3 ", & - "Legendre_order_4 ", & - "Legendre_order_5 ", & - "Legendre_order_6 ", & - "orbital_angle_order_1_cos ", & - "orbital_angle_order_1_sin ", & - "orbital_angle_order_2_cos ", & - "orbital_angle_order_2_sin ", & - "orbital_angle_order_3_cos ", & - "orbital_angle_order_3_sin ", & - "orbital_angle_order_4_cos ", & - "orbital_angle_order_4_sin ", & - "orbital_angle_order_5_cos ", & - "orbital_angle_order_5_sin ", & - "orbital_angle_order_6_cos ", & - "orbital_angle_order_6_sin ", & - "orbital_angle_order_7_cos ", & - "orbital_angle_order_7_sin ", & - "orbital_angle_order_8_cos ", & - "orbital_angle_order_8_sin ", & - "orbital_angle_order_9_cos ", & - "orbital_angle_order_9_sin ", & - "orbital_angle_order_10_cos", & - "orbital_angle_order_10_sin" /) + "legendre_order_1 ", & + "legendre_order_2 ", & + "legendre_order_3 ", & + "legendre_order_4 ", & + "legendre_order_5 ", & + "legendre_order_6 ", & + "satelliteOrbitalAngle_order_1_cos ", & + "satelliteOrbitalAngle_order_1_sin ", & + "satelliteOrbitalAngle_order_2_cos ", & + "satelliteOrbitalAngle_order_2_sin ", & + "satelliteOrbitalAngle_order_3_cos ", & + "satelliteOrbitalAngle_order_3_sin ", & + "satelliteOrbitalAngle_order_4_cos ", & + "satelliteOrbitalAngle_order_4_sin ", & + "satelliteOrbitalAngle_order_5_cos ", & + "satelliteOrbitalAngle_order_5_sin ", & + "satelliteOrbitalAngle_order_6_cos ", & + "satelliteOrbitalAngle_order_6_sin ", & + "satelliteOrbitalAngle_order_7_cos ", & + "satelliteOrbitalAngle_order_7_sin ", & + "satelliteOrbitalAngle_order_8_cos ", & + "satelliteOrbitalAngle_order_8_sin ", & + "satelliteOrbitalAngle_order_9_cos ", & + "satelliteOrbitalAngle_order_9_sin ", & + "satelliteOrbitalAngle_order_10_cos", & + "satelliteOrbitalAngle_order_10_sin" /) character(len=150) :: JediVarGroupWithSatId ! Body: diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index 4be587b9..f45e3016 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -674,7 +674,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_2d_normal_var_to_netcdf ('brightnessTemperature', ['constant_satid_5Predictor', 'constant_satid_8Predictor', 'thickness_850_300hPa_satid_5Predictor','thickness_850_300hPa_satid_8Predictor', 'thickness_200_50hPa_satid_5Predictor', 'thickness_200_50hPa_satid_8Predictor', - 'Legendre_order_1_satid_5Predictor', 'Legendre_order_1_satid_8Predictor'], + 'legendre_order_1_satid_5Predictor', 'legendre_order_1_satid_8Predictor'], 'testinput/080_VarField_biaspredictors.nc4', predictors=True) output_2d_simulated_var_to_netcdf('bendingAngle', 'testinput/071_VarField_bendingangle.nc4', add_occulting_satid=True) output_2d_normal_var_to_netcdf('impactParameterRO', 'MetaData', 'testinput/072_VarField_impactparam.nc4') diff --git a/test/testinput/080_VarField_biaspredictors.nc4 b/test/testinput/080_VarField_biaspredictors.nc4 index 76692c16f7dc1f0346f1048f85a6be2d44986701..382a073e10801551ffcc443b3b06f26807207b98 100644 GIT binary patch delta 459 zcmcaSm+|sk#tBEYEcJ|ZGE&k^Z4LDdP4tWe1Q>uI!w^I=FnB^J28Q{9iJLaQw`LJW zQ@)_@m&s;Z)}34|-(p(CChr#v+3Y8f%gD0PUe<5(e!+{3EX>z8TY<%22(M+DyjIL$ z@>d|X6*rjN3dCoDSX9Dbax4%p1>(0rY$|CmxfY0zN(L|m@N8C;lHuNLz@f!B*;aKw za|-jb&Hq*ZGO|eZwWdr~^i0{DqH&s;+4{nl$woRlEYn}V)CY?m(|O3q;>P!R#^eHR zi^=txqMLu{?Pp?HZ}3ri@@~UmE`cDwVul7L1_qPKyhaj}4U9zDtZ&ac&fqiI+enSY zhhfIq&59gujGK2Gr?RlfZdL!aS;eB1g+jB`qI z!8~OrMkbc6Rp0+j)^M?52@k#81r|Qz;>5_vFqz-&9!v10WShw!-E<@a4*1`8^Kfxu zkQIamHPA_AXJ77{Z07F7m@~Q3-Iy_F^ICUH7M3WuI!w^I=FnB^J28P(8WTuVptyzT8 zl+V4yHFdKs>rO6~8_V{%Pu?#Wve{1{myw0B^HbyI{el-6Srj(Ny#kBB5MIl~$UoUn zRDAMOF#|>+FzYCgB?@MJ1+pZ-ELCv>MrklB6v&bTvs!^HMKEhCkfj1!G9X7Xf3&y>w6 z8mF0=>rbzkY^0;Z!gjE>5G;C3=OH7DW{Awf$pzXLlj}7_H~-Mv&%|Q9VIJ4y-G;#m z`5)LC80vu`B+bBefvt-{l!<}CoZ-vq4c!brK&HuLJtJ|pDFq5E7#b#f8>z8WF)Oof zR^)JF+`QX3m4)U1RUiA!Di)V12hl>+~tROW0 yfX=be)R&uV=I+GkGr7{;n9*nRT6aqpmN(&wfnam|d_d-Gp6F}G$g+BdtqcH`5u=F! From 0f85e5f26c929607ef3268813eee8d1c6602eba7 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Tue, 9 Apr 2024 10:57:19 +0100 Subject: [PATCH 2/2] Fix spacing issue --- src/opsinputs/opsinputs_varobswriter_mod.F90 | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/opsinputs/opsinputs_varobswriter_mod.F90 b/src/opsinputs/opsinputs_varobswriter_mod.F90 index 1864fa1a..83c0a358 100644 --- a/src/opsinputs/opsinputs_varobswriter_mod.F90 +++ b/src/opsinputs/opsinputs_varobswriter_mod.F90 @@ -1487,17 +1487,17 @@ subroutine opsinputs_varobswriter_fillpredictors( & integer :: ii, jj integer, parameter :: maxpred = 31 character(len=*), parameter :: PredictorBaseName(1:maxpred) = (/ & - "constant ", & - "thickness_850_300hPa ", & - "thickness_200_50hPa ", & - "Tskin ", & - "total_column_water ", & - "legendre_order_1 ", & - "legendre_order_2 ", & - "legendre_order_3 ", & - "legendre_order_4 ", & - "legendre_order_5 ", & - "legendre_order_6 ", & + "constant ", & + "thickness_850_300hPa ", & + "thickness_200_50hPa ", & + "Tskin ", & + "total_column_water ", & + "legendre_order_1 ", & + "legendre_order_2 ", & + "legendre_order_3 ", & + "legendre_order_4 ", & + "legendre_order_5 ", & + "legendre_order_6 ", & "satelliteOrbitalAngle_order_1_cos ", & "satelliteOrbitalAngle_order_1_sin ", & "satelliteOrbitalAngle_order_2_cos ", &