From 356f1fed65047300278a04c25c162d5f21c3a03b Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Mon, 6 Mar 2023 12:55:44 +0000 Subject: [PATCH 1/2] Change the path for the pressureAtCloudTop so that a variable assignment to hPa can be added to the yaml --- Varfields.md | 2 +- src/opsinputs/opsinputs_varobswriter_mod.F90 | 2 +- test/generate_unittest_netcdfs.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Varfields.md b/Varfields.md index 32a48fb7..7098ffa9 100644 --- a/Varfields.md +++ b/Varfields.md @@ -31,7 +31,7 @@ | 31 | `VarField_solzenith` | `SolarZenith(:)` | solar zenith angle | `MetaData/solarZenithAngle` | | | 32 | `VarField_solazimth` | | | | Implement | | 34 | `VarField_iremiss` | `IREmiss(:)` | surface emissivity (satellite 1dvar) | 'Emiss/emissivityIR' | | -| 35 | `VarField_cloudtopp` | `CloudTopP(:)` | cloud top pressure (hPa) (satellite 1dvar) | `OneDVar/pressureAtTopOfCloud` | | +| 35 | `VarField_cloudtopp` | `CloudTopP(:)` | cloud top pressure (hPa) (satellite 1dvar) | `OutputToVAR/pressureAtTopOfCloud` | | | 36 | `VarField_cloudfrac` | `CloudFrac(:)` | cloud fraction (satellite 1dvar) | `OneDVar/cloudAmount` | | | 39 | `VarField_vnatovpp` | | | | Implement | | 40 | `VarField_procoption` | | | | Implement | diff --git a/src/opsinputs/opsinputs_varobswriter_mod.F90 b/src/opsinputs/opsinputs_varobswriter_mod.F90 index 16cb5039..f4021589 100644 --- a/src/opsinputs/opsinputs_varobswriter_mod.F90 +++ b/src/opsinputs/opsinputs_varobswriter_mod.F90 @@ -919,7 +919,7 @@ subroutine opsinputs_varobswriter_populateobservations( & case (VarField_cloudtopp) call opsinputs_fill_fillreal( & Ob % Header % CloudTopP, "CloudTopP", JediToOpsLayoutMapping, Ob % CloudTopP, & - ObsSpace, "pressureAtTopOfCloud", "OneDVar") + ObsSpace, "pressureAtTopOfCloud", "OutputToVAR") case (VarField_cloudfrac) call opsinputs_fill_fillreal( & Ob % Header % CloudFrac, "CloudFrac", JediToOpsLayoutMapping, Ob % CloudFrac, & diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index 0c2ccb95..7d56ab0e 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -648,7 +648,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_1d_normal_int_var_to_netcdf('satelliteIdentifier', 'MetaData', 'testinput/028_VarField_satid.nc4') output_1d_normal_var_to_netcdf ('solarZenithAngle', 'MetaData', 'testinput/031_VarField_solzenith.nc4') output_1d_normal_var_to_netcdf ('emissivityIR', 'Emiss', 'testinput/034_VarField_iremiss.nc4') - output_1d_normal_var_to_netcdf ('pressureAtTopOfCloud', 'OneDVar', 'testinput/035_VarField_cloudtopp.nc4') + output_1d_normal_var_to_netcdf ('pressureAtTopOfCloud', 'OutputToVAR', 'testinput/035_VarField_cloudtopp.nc4') output_1d_normal_var_to_netcdf ('cloudAmount', 'OneDVar', 'testinput/036_VarField_cloudfrac.nc4') output_2d_simulated_var_to_netcdf('windEastward', 'testinput/051_VarField_u10ambwind.nc4', with_bias=True) output_2d_simulated_var_to_netcdf('windNorthward', 'testinput/052_VarField_v10ambwind.nc4', with_bias=True) @@ -747,7 +747,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # IASI - this tests the variable_for_quality_control option output_full_varobs_to_netcdf(['MetaData/latitude','MetaData/longitude', 'OneDVar/skinTemperature','MetaData/sensorZenithAngle', - 'MetaData/solarZenithAngle','OneDVar/pressureAtTopOfCloud','OneDVar/cloudAmount', + 'MetaData/solarZenithAngle','OutputToVAR/pressureAtTopOfCloud','OneDVar/cloudAmount', 'MetaData/ozoneTotal'], ['ObsValue/radiance','DerivedObsValue/brightnessTemperature','EffectiveError/brightnessTemperature', 'OneDVar/emissivity', 'BiasCorrObsValue/brightnessTemperature', From d70c17ad958525ce60f737bca87687b454627e88 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Mon, 6 Mar 2023 14:49:59 +0000 Subject: [PATCH 2/2] Update test data --- test/testinput/035_VarField_cloudtopp.nc4 | Bin 12558 -> 12558 bytes test/testinput/varobs_globalnamelist_iasi.nc4 | Bin 20339 -> 20585 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/testinput/035_VarField_cloudtopp.nc4 b/test/testinput/035_VarField_cloudtopp.nc4 index e31f74e7c86365ba50e784e491ba1df26d5f6f01..e9f50dd0db225d04eb8b7e3bacf9c88a292e7733 100644 GIT binary patch delta 72 zcmeB6>Py;?&B|CcIfu27<;|ziubUsT7D=hgF#rK03pIiev=LLR5s63C=dVuC3_S` delta 69 zcmeB6>Py;?&B|CdIfu27rIqzc-sXp_MN%qK3_!rh!VaQ&kXqGmFuj_MA Pg=w;$p8Do_3IzfHhWili diff --git a/test/testinput/varobs_globalnamelist_iasi.nc4 b/test/testinput/varobs_globalnamelist_iasi.nc4 index 23261fbfe8047a3ee6c26fc8df0435f57bf849a3..ff0d9017c7f3a3cf4a61b25c98ff9225a817a362 100644 GIT binary patch delta 2373 zcmc&$Yfw{H5I*zYUwNT953Ac|<+zj!1{&5eoP@q9`qEbfdx2*jS0$tOUahBUHlR{kcr7kzbYm>s}m*K`1JU-<`@Ly2u})zx~zhOZLEFWe3AbRWMefE|#i! zD8q%22o!GjdY&)vE;>8CS1ef1$uHc*K1Zs* zFr~^8XpMUUlC*NTAFZ*9C-U6*6~3(9?RA!|a(h>MUY|v5(qvvT97|Lb*0##k+39-T z^55h9kO#Y?2P53mkJN_BI|UZ?c+E2*Py2G194-$S1)HL>tht<&0QY z?2+u#KM+zSXMPTIir4#wvI(BnEJs!tR?>Ze7be!tjwRL?X%ioaC$s2-iym4`Zb z^jKV>3g7%_$D{^w%bcLhx(59^2Rl*7lY82|IZGvwlk()0H~^EIO_Dt%H*&voj?mm) zB5wwlwU1BVw{1I!+(-~YH&qR#{851eIU|gGL~Pxa@NH~j$~oB|A0kBA(};Zeysef- zTw&A<+beQ?w{nR`B?72Czh07E-c)NrAt`;w644IqR-=1wcc!6uyiG!(ZyroTckwm_ z9Si=JgZLt=(B6d>y-{vgPa1^eMhV89rIgAkJ%I<$I>5mAw@jiKZz=X zQN8FQG!!Or&H?pD0e|Qk25!z>+^R-W949Q2Ae5>X@g^0?s7kIPrz%MsMpbem-%rBg zzg7{_D`gUVQaL`U$Qc;VGcl~cg#S{q`|exU`9}=(8e3s14)OiD@uUz*n}_5w zL5tN~j_6S29sBn#@WalMp8UrR2!^AKWcH<<%}d(7ZF^!#I))1cgCQaOU?$aN@T_54 zxLo{33@3*ThD0`550?zt@dfp3+MKRs9`_o1F%1ZZD~25QO9Os-4mhM+#AX@=M*Ds` z+f5ne&BW+|U&j?wUs_Ncr*cH=cy~DG1=E3kp_?1#3Ej+Gf~bN;T>GSHSa|fqoa-x$a(t78}hOwzS3tXI0IAGYDXtK4)HvtNxU7;Epf@(mv~$rud}UEoLo{3tgxkN zRTTt~ur};E#bViE`iFwIzU1yBaNbxOFq``sADz4uL+3ix=>($s)HgV_iRc8PcshZo zKBX?Th>jo%n0nn^X6hl5vZU5mH4mJ^&rSqi*cAB25@fIF;oYhXu78Je82lCU1E;I5 za{o6|-+yM>QbjovxoG-{)xvwFe=~UVfUYIsv8@8VbuY8MT1d8~upK5a+0xiuW>{`Z RXH^x@W1G&lRN<~0`3peOrk(%* delta 2297 zcmc&$drVVj6hHU&QlLCqEnqBC2i8)QhrBGM<<*u_0j*H?Fv14dl2m1#ZNX_~Iv2wq zYSemk3)3y2iCdy$kHYYuX;_wJRz)ScWjdEEx&)IkUo-0FlHGg1`(fl?|Je6O&pF?D ze!uUW@Amc}^WbA<|AMNZ3&gdI5J=o+``qQUx3bA2Y>v1mOOjMWYQnS?5ZYTFS-T@W z#t~_SWCf%3CEFr*8rktCG&6s38kyFLrEDWxW{!qg8N)59dc7ptFI&Oj34=W{tdE-F zG85(=Pb2<^<`6nni`^-!aWJ04ODV}rF-GDuaWF-WQz<5$yyyB|hud8b5gV~)z5}o@ zJfHb@S3baQUE+t>pN|Cn^Qvj)80J#QZCM`GB^&}_yg>o~aRH+0Ty@go5 zito%RP@K&pl3b4!uAH@xrHtx-{%ob6zEj74OlEKWj?v7TZ`_;k~7o@Tl6QII&c+Yv-%(Q54{L-39LcIW208XQtrpsIQ?Yb(TIa~oHC`SxNVP&B+O#<2JE zv8iOC=E&quzARfIEsfCgT{m1a?i-6m_cK*ZU7~xXv6f+r>V(aC6Z<}SY9c-Ya>9CQ z93GtU?XMPn&u9G>h8O~+r`U;J>zZZ<#63J1)ImD0 z&V=~gCv@;5&t}7^vHOJ}yc`-h_L`#t+2wABX~qx|6TdJFd(u|?%EH4Ml@*a zx_Ja1@wYgAd=rpvxSG*O$M64=uNFJb!!mMXzUiRzLJt zlg#w`it3)1Pw&6@M3}SWW`3?fhVv~ASZGqrAIu}nwK;K`%ZRp&t7WA0*h7(*} z!B;vr^?LtUB8B59I!e1Y;Op~xsKrj{-DWrnSZaNDw|9MrH>wW={DG6wM}Xldget4A zGidV%0yM_gWi$(c757!adp7!@vRT}17DT!6T6Kf8r@ry${NR45YK0i zn zDM#pt_L@@sexv|0s%+fRFvjXFSn15=2KujFiHfoC) F_8-W#q)q?;