5 |
============================== |
============================== |
6 |
|
|
7 |
|
|
8 |
|
o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these |
9 |
|
files are nearly the same anyway. |
10 |
|
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04: |
11 |
|
- redefinition of tau(i,i) (by a factor of ustar) |
12 |
|
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results) |
13 |
|
- replace rhonil by rhoConstFresh in computation of evap (bug fix) |
14 |
|
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results) |
15 |
|
- replace |
16 |
|
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh ) |
17 |
|
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j) |
18 |
|
by |
19 |
|
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh ) |
20 |
|
(changes results) |
21 |
|
-> exf_bulkformulae v1.22, |
22 |
|
update verification experiments lab_sea, offline_exf_seaice, seaice_obcs |
23 |
|
(lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13, |
24 |
|
output.txt 1.63 |
25 |
|
offline_exf_seaice: output.seaicetd.txt 1.7 |
26 |
|
seaice_obcs: output.txt 1.10) |
27 |
|
Step 2: do the actual merge and remove exf_bulk_largeyeager04.F |
28 |
|
-> exf_bulkformulae v1.23, |
29 |
|
unfortunately requires updating lab_sea.salt_plume (6 matching digits), |
30 |
|
and global_ocean.cs32x15.icedyn (only 11 matching digits) |
31 |
o adjoint of exch-1: |
o adjoint of exch-1: |
32 |
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
33 |
(note: was already like this when using EXCH-2) and remove flow dir |
(note: was already like this when using EXCH-2) and remove flow dir |