Skip to content

Fix vertical gradient #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guillaumevernieres merged 3 commits into from
Jun 30, 2023
Merged

Fix vertical gradient #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc69718
a fix dvdz
hyunchul386 Jun 26, 2023
bcdd61a
Merge branch 'develop' into bugfix/fix_dvdz
kbhargava Jun 30, 2023
cc9e43c
Updating test references
kbhargava Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/soca/Utils/soca_utils.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ subroutine soca_diff(dvdz,v,h)
k = size(v,1)

do ik = 2, k-1
dvdz(ik) = (v(ik+1)-v(ik-1))/(h(ik)+0.5*h(ik+1)+h(ik-1))
dvdz(ik) = (v(ik+1)-v(ik-1))/(h(ik)+0.5*(h(ik+1)+h(ik-1)))
end do
dvdz(1) = dvdz(2)
dvdz(k) = dvdz(k-1)
Expand Down
26 changes: 13 additions & 13 deletions test/testref/3dhyb.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
CostJb : Nonlinear Jb = 0.0000000000000000e+00
CostJo : Nonlinear Jo(ADT) = 2.0458137413924788e+02, nobs = 99, Jo/n = 2.0664785266590697e+00, err = 1.0000000149011612e-01
CostFunction: Nonlinear J = 2.0458137413924788e+02
RPCGMinimizer: reduction in residual norm = 2.0799916147215207e-02
CostJo : Nonlinear Jo(ADT) = 2.0458137413924777e+02, nobs = 99, Jo/n = 2.0664785266590684e+00, err = 1.0000000149011613e-01
CostFunction: Nonlinear J = 2.0458137413924777e+02
RPCGMinimizer: reduction in residual norm = 2.0804496849039553e-02
CostFunction::addIncrement: Analysis:
Valid time: 2018-04-15T00:00:00Z
cicen min=-0.0040587640772214 max=1.0000648171411777 mean=0.1175079648519036
hicen min=-0.1695062409273280 max=4.0326695831062072 mean=0.4670400834782142
cicen min=-0.0040593081880349 max=1.0000647950655037 mean=0.1175080423133622
hicen min=-0.1694837858544874 max=4.0326695826027077 mean=0.4670393369306883
hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975
socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5744014203464261
tocn min=-1.8947909199238167 max=31.7004646997533541 mean=6.0146866159992252
uocn min=-0.8581811434703924 max=0.7001471559887942 mean=-0.0002552194939666
vocn min=-0.7656658596944719 max=1.4377766409421606 mean=0.0021996588789184
ssh min=-2.1622588504742026 max=0.8977780480451659 mean=-0.2938509447417898
socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5744047862924830
tocn min=-1.8947940137300057 max=31.7004646995896131 mean=6.0146891626655883
uocn min=-0.8581809322810460 max=0.7001463582118039 mean=-0.0002552185891037
vocn min=-0.7656658341969602 max=1.4377766409421606 mean=0.0021996576877204
ssh min=-2.1622959317614252 max=0.8974154324210799 mean=-0.2938633000727268
hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017
sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354
lhf min=-38.1373977661132812 max=256.5976562500000000 mean=42.0100402226406899
Expand All @@ -23,6 +23,6 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522



CostJb : Nonlinear Jb = 6.1214769596423713
CostJo : Nonlinear Jo(ADT) = 114.8805170210432181, nobs = 99, Jo/n = 1.1604092628388203, err = 0.1000000014901161
CostFunction: Nonlinear J = 121.0019939806855831
CostJb : Nonlinear Jb = 6.2208024967284885
CostJo : Nonlinear Jo(ADT) = 114.6405248894628244, nobs = 99, Jo/n = 1.1579850998935639, err = 0.1000000014901161
CostFunction: Nonlinear J = 120.8613273861913058
26 changes: 13 additions & 13 deletions test/testref/3dhybfgat.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
CostJb : Nonlinear Jb = 0.0000000000000000e+00
CostJo : Nonlinear Jo(ADT) = 8.7370280580244312e+01, nobs = 31, Jo/n = 2.8183961477498167e+00, err = 1.0000000149011612e-01
CostFunction: Nonlinear J = 8.7370280580244312e+01
RPCGMinimizer: reduction in residual norm = 2.8879006360054962e-03
CostJo : Nonlinear Jo(ADT) = 8.7370280580244113e+01, nobs = 31, Jo/n = 2.8183961477498101e+00, err = 1.0000000149011612e-01
CostFunction: Nonlinear J = 8.7370280580244113e+01
RPCGMinimizer: reduction in residual norm = 2.9185061797211485e-03
CostFunction::addIncrement: Analysis:
Valid time: 2018-04-15T00:00:00Z
cicen min=-0.0033930120836110 max=1.0000001204317763 mean=0.1174834218192429
hicen min=-0.0900746262843310 max=4.0326673084246947 mean=0.4695551166024028
socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5585013016301659
uocn min=-0.8581693992488438 max=0.7001590290390129 mean=-0.0002537828716458
vocn min=-0.7661101230340505 max=1.4377766409421606 mean=0.0021979175689238
tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0145631838893507
ssh min=-1.9241647037810099 max=0.8907404278998029 mean=-0.2876886553318843
cicen min=-0.0033958872442029 max=1.0000001203835267 mean=0.1174835206793045
hicen min=-0.0900934576976787 max=4.0326673084246947 mean=0.4695574918336070
socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5585138714596098
uocn min=-0.8581693992488438 max=0.7001579347565605 mean=-0.0002537807257102
vocn min=-0.7661101230279923 max=1.4377766409421606 mean=0.0021979176021416
tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0145093596929469
ssh min=-1.9241669151494767 max=0.8902346892941313 mean=-0.2877140108914097
hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017
sw min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000
lhf min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000
Expand All @@ -22,6 +22,6 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522



CostJb : Nonlinear Jb = 2.3910852056267453
CostJo : Nonlinear Jo(ADT) = 76.9254966085777170, nobs = 31, Jo/n = 2.4814676325347649, err = 0.1000000014901161
CostFunction: Nonlinear J = 79.3165818142044685
CostJb : Nonlinear Jb = 2.4428367123211485
CostJo : Nonlinear Jo(ADT) = 76.8979710680983288, nobs = 31, Jo/n = 2.4805797118741397, err = 0.1000000014901161
CostFunction: Nonlinear J = 79.3408077804194818
50 changes: 25 additions & 25 deletions test/testref/3dvar_godas.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
CostJb : Nonlinear Jb = 0.0000000000000000e+00
CostJo : Nonlinear Jo(CoolSkin) = 1.6731214283333800e+04, nobs = 200, Jo/n = 8.3656071416669008e+01, err = 3.6419991997020579e-01
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1.6258116856443858e+03, nobs = 174, Jo/n = 9.3437453197953211e+00, err = 3.6280357515271239e-01
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4431675889674533e+00, nobs = 29, Jo/n = 1.8769543410232598e-01, err = 1.0000000000000000e+00
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1.6258116856443880e+03, nobs = 174, Jo/n = 9.3437453197953335e+00, err = 3.6280357515271239e-01
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4431675889674569e+00, nobs = 29, Jo/n = 1.8769543410232609e-01, err = 1.0000000000000000e+00
CostJo : Nonlinear Jo(ADT) = 1.0375381454781235e-02, nobs = 95, Jo/n = 1.0921454162927615e-04, err = 2.8169260935368467e+01
CostJo : Nonlinear Jo(InsituTemperature) = 3.3944990007872309e+02, nobs = 205, Jo/n = 1.6558531711157225e+00, err = 8.9723213032395277e-01
CostJo : Nonlinear Jo(InsituSalinity) = 3.4804589303321143e+02, nobs = 218, Jo/n = 1.5965407937303278e+00, err = 6.0819699545777528e-01
CostJo : Nonlinear Jo(SeaIceFraction) = 5.8152359560103514e+02, nobs = 88, Jo/n = 6.6082226772844903e+00, err = 1.0000000149011612e-01
CostFunction: Nonlinear J = 1.9631498900661576e+04
RPCGMinimizer: reduction in residual norm = 1.4862985298039461e-01
CostJo : Nonlinear Jo(InsituTemperature) = 3.3944990007872332e+02, nobs = 205, Jo/n = 1.6558531711157234e+00, err = 8.9723213032395277e-01
CostJo : Nonlinear Jo(InsituSalinity) = 3.4804589303321234e+02, nobs = 218, Jo/n = 1.5965407937303318e+00, err = 6.0819699545777528e-01
CostJo : Nonlinear Jo(SeaIceFraction) = 5.8152359560103446e+02, nobs = 88, Jo/n = 6.6082226772844823e+00, err = 1.0000000149011612e-01
CostFunction: Nonlinear J = 1.9631498900661580e+04
RPCGMinimizer: reduction in residual norm = 1.4890894677558011e-01
CostFunction::addIncrement: Analysis:
Valid time: 2018-04-15T00:00:00Z
cicen min=-0.0000692762619539 max=1.0003374928148037 mean=0.1175459538574530
cicen min=-0.0000693201292598 max=1.0003376635630259 mean=0.1175458333852691
hicen min=0.0000000000000000 max=4.0326673084246947 mean=0.4712515705773916
hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975
socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923210379893
tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183148649295131
ssh min=-1.9244215595435641 max=0.9272826987293792 mean=-0.2767864244350091
socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923223520315
tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183437899017829
ssh min=-1.9244215280991723 max=0.9272827086645625 mean=-0.2767863997914393
hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017
sw min=-225.0942946657453660 max=0.0000000000000000 mean=-71.7383583440961132
lhf min=-38.1375200295195498 max=256.5954941593348053 mean=42.0097185887710580
shf min=-58.9492911009887948 max=201.3742676087534278 mean=6.0753284159540160
lw min=0.0000000000000000 max=88.0360936577936570 mean=31.3955346150854773
us min=0.0043960513522736 max=0.0196673881640923 mean=0.0086875716053277
sw min=-225.0942956823528505 max=0.0000000000000000 mean=-71.7383580540423793
lhf min=-38.1375200582396161 max=256.5954937724312686 mean=42.0097184800355450
shf min=-58.9492910987185894 max=201.3742675934934994 mean=6.0753284134086591
lw min=0.0000000000000000 max=88.0360936611186276 mean=31.3955346168523803
us min=0.0043960514439903 max=0.0196673929715284 mean=0.0086875839294735
mld min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515
layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420

Expand All @@ -33,12 +33,12 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522



CostJb : Nonlinear Jb = 0.3607257504211560
CostJo : Nonlinear Jo(CoolSkin) = 16187.3654912514211901, nobs = 200, Jo/n = 80.9368274562571060, err = 0.3641999199702058
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1602.0416832526752842, nobs = 174, Jo/n = 9.2071361106475589, err = 0.3628035751527124
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4426907397108639, nobs = 29, Jo/n = 0.1876789910245125, err = 1.0000000000000000
CostJo : Nonlinear Jo(ADT) = 0.0103757220711691, nobs = 95, Jo/n = 0.0001092181270649, err = 28.1692609353684666
CostJo : Nonlinear Jo(InsituTemperature) = 337.9287619710107720, nobs = 205, Jo/n = 1.6484329852244428, err = 0.8972321303239528
CostJo : Nonlinear Jo(InsituSalinity) = 346.7212333339583665, nobs = 218, Jo/n = 1.5904643730915522, err = 0.6081969954577753
CostJo : Nonlinear Jo(SeaIceFraction) = 580.7189695656682034, nobs = 88, Jo/n = 6.5990791996098661, err = 0.1000000014901161
CostFunction: Nonlinear J = 19060.5899315869392012
CostJb : Nonlinear Jb = 0.3856003402344498
CostJo : Nonlinear Jo(CoolSkin) = 16186.9643635032589373, nobs = 200, Jo/n = 80.9348218175162941, err = 0.3641999199702058
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1596.7679360181962238, nobs = 174, Jo/n = 9.1768272184953812, err = 0.3628035751527124
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4426904998659715, nobs = 29, Jo/n = 0.1876789827539990, err = 1.0000000000000000
CostJo : Nonlinear Jo(ADT) = 0.0103757170152075, nobs = 95, Jo/n = 0.0001092180738443, err = 28.1692609353684666
CostJo : Nonlinear Jo(InsituTemperature) = 337.3302597227105935, nobs = 205, Jo/n = 1.6455134620620029, err = 0.8972321303239528
CostJo : Nonlinear Jo(InsituSalinity) = 346.7205645110620367, nobs = 218, Jo/n = 1.5904613050966148, err = 0.6081969954577753
CostJo : Nonlinear Jo(SeaIceFraction) = 580.7185630030103312, nobs = 88, Jo/n = 6.5990745795796633, err = 0.1000000014901161
CostFunction: Nonlinear J = 19054.3403533153577882
32 changes: 16 additions & 16 deletions test/testref/3dvarbump.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
CostJb : Nonlinear Jb = 0.0000000000000000e+00
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 7.2761517888788660e+02, nobs = 123, Jo/n = 5.9155705600641184e+00, err = 3.7062900658774245e-01
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 7.2761520714484391e+02, nobs = 123, Jo/n = 5.9155707897954786e+00, err = 3.7062899283957257e-01
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.7834714574083208e+01, nobs = 50, Jo/n = 1.1566942914816642e+00, err = 1.0000000000000000e+00
CostJo : Nonlinear Jo(ADT) = 1.7801726582342692e+02, nobs = 91, Jo/n = 1.9562336903673287e+00, err = 1.0000000149011612e-01
CostJo : Nonlinear Jo(InsituTemperature) = 3.4603228199330812e+02, nobs = 203, Jo/n = 1.7045925221345228e+00, err = 9.0034813002045044e-01
CostJo : Nonlinear Jo(InsituSalinity) = 3.1204770545775682e+02, nobs = 218, Jo/n = 1.4314114929254900e+00, err = 6.0819699619437717e-01
CostFunction: Nonlinear J = 1.6215471467364616e+03
RPCGMinimizer: reduction in residual norm = 2.0333584772030691e-01
CostJo : Nonlinear Jo(ADT) = 1.7801726582342690e+02, nobs = 91, Jo/n = 1.9562336903673285e+00, err = 1.0000000149011612e-01
CostJo : Nonlinear Jo(InsituTemperature) = 3.4603234526181200e+02, nobs = 203, Jo/n = 1.7045928338020295e+00, err = 9.0034813852418905e-01
CostJo : Nonlinear Jo(InsituSalinity) = 3.1204797269182581e+02, nobs = 218, Jo/n = 1.4314127187698431e+00, err = 6.0819699545777528e-01
CostFunction: Nonlinear J = 1.6215475054959918e+03
RPCGMinimizer: reduction in residual norm = 1.9585627812873155e-01
CostFunction::addIncrement: Analysis:
Valid time: 2018-04-15T00:00:00Z
hocn min=0.0009999999999977 max=1345.6400000000003274 mean=132.2975966204909355
socn min=21.6778874359345082 max=39.8774684135234310 mean=34.6285532534979836
tocn min=-1.8883899372702533 max=33.0299466196283120 mean=6.3804420615446844
socn min=21.6778874359345082 max=39.8774684135234310 mean=34.6292686263590355
tocn min=-1.8883899372702533 max=33.2682523259166132 mean=6.3735018436205531
uocn min=-0.6975788196638589 max=0.4840625031242498 mean=0.0013055310445162
vocn min=-0.7661101215480253 max=0.9402890903466523 mean=0.0028998456865158
ssh min=-2.0964116929684500 max=0.8417711551919234 mean=-0.2579245652977167
ssh min=-2.1084939224168693 max=0.8449085686573465 mean=-0.2602635096607882
mld min=2.4370615877370523 max=4593.1523423819935488 mean=193.6208071648662212
layer_depth min=2.4370615877370523 max=5587.8978052886013757 mean=1243.8222388394297013

Expand All @@ -23,10 +23,10 @@ layer_depth min=2.4370615877370523 max=5587.8978052886013757 mean=1243.822



CostJb : Nonlinear Jb = 59.4492415973704951
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 444.1238384078720856, nobs = 123, Jo/n = 3.6107629138851389, err = 0.3706290065877424
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 59.5333260200038552, nobs = 50, Jo/n = 1.1906665204000770, err = 1.0000000000000000
CostJo : Nonlinear Jo(ADT) = 150.9104219724243023, nobs = 91, Jo/n = 1.6583562854112561, err = 0.1000000014901161
CostJo : Nonlinear Jo(InsituTemperature) = 300.1571147651554270, nobs = 203, Jo/n = 1.4786064766756426, err = 0.9003481300204504
CostJo : Nonlinear Jo(InsituSalinity) = 150.1629547995659095, nobs = 218, Jo/n = 0.6888208935759904, err = 0.6081969961943772
CostFunction: Nonlinear J = 1164.3368975623920960
CostJb : Nonlinear Jb = 53.0340911400380790
CostJo : Nonlinear Jo(SeaSurfaceTemp) = 446.9544273941489791, nobs = 123, Jo/n = 3.6337758324727560, err = 0.3706289928395726
CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 59.9152947100068118, nobs = 50, Jo/n = 1.1983058942001363, err = 1.0000000000000000
CostJo : Nonlinear Jo(ADT) = 154.6934489111536095, nobs = 91, Jo/n = 1.6999280100126770, err = 0.1000000014901161
CostJo : Nonlinear Jo(InsituTemperature) = 293.3242787162378136, nobs = 203, Jo/n = 1.4449471857942748, err = 0.9003481385241890
CostJo : Nonlinear Jo(InsituSalinity) = 149.8578704365598355, nobs = 218, Jo/n = 0.6874214240209167, err = 0.6081969954577753
CostFunction: Nonlinear J = 1157.7794113081451997
Loading