Changes between Version 46 and Version 47 of ticket/1593_CNRS9_NOC3_LDF
- Timestamp:
- 2015-12-16T12:16:58+01:00 (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
ticket/1593_CNRS9_NOC3_LDF
v46 v47 26 26 27 27 == I. Phasing of horizontal scale factors == 28 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5737] ''' + minor correction''' revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5737](SETTE OK)28 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5737] ''' + minor correction''' revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5737] (SETTE OK) 29 29 30 30 === (I.1) standardisation of the name === … … 32 32 33 33 === (I.2) domhgr: add a optional read of surface scale factors === 34 An optional read of surface scale factors at velocity points ( e1e2u and e1e2v) is needed in coordinate file. Indeed, in case of reduction of a scale factor (e1u or e2v) in a strait, the surface at u- and v-points must remain unchanged.[[BR]] This allows to suppress the dom_vvl_orca_fix routine from dlmvvl.F90 module.[[BR]] '' Note that this change modifies the model results'' , as it contains a better handling of reduced strait width (i.e. reduced face between 2 adjacent T-points, but unchanged U and V points volume).[[BR]] The implementation performed here is a first step to the full simplification of domhgr.F90. We kept here the hard coded reduction of scale factor in some straits for some given ORCA configuration. [[BR]] A last step (see IV) will be to suppress the hard coded reduction of some scale factor as it will be always given in the coordinates.nc file together with the e1e2u & e1e2v surfaces. ===>>> OK see ''' revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5755]'''34 An optional read of surface scale factors at velocity points ( e1e2u and e1e2v) is needed in coordinate file. Indeed, in case of reduction of a scale factor (e1u or e2v) in a strait, the surface at u- and v-points must remain unchanged.[[BR]] This allows to suppress the dom_vvl_orca_fix routine from dlmvvl.F90 module.[[BR]] '' Note that this change modifies the model results'' , as it contains a better handling of reduced strait width (i.e. reduced face between 2 adjacent T-points, but unchanged U and V points volume).[[BR]] The implementation performed here is a first step to the full simplification of domhgr.F90. We kept here the hard coded reduction of scale factor in some straits for some given ORCA configuration. [[BR]] A last step (see IV) will be to suppress the hard coded reduction of some scale factor as it will be always given in the coordinates.nc file together with the e1e2u & e1e2v surfaces. ===>>> OK see ''' revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5755] ''' 35 35 36 36 == [[BR]][[BR]]II. Phasing of the advective/diffusive trends on tracers == 37 37 === II.1 —''' '''LDF on tracers''' (both TRA & TRC) - Diffusive trends''' === 38 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5758] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5759] and [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5760]with SETTE OK39 40 ''' ====>>>> Bug in triad operator TO BE CHECKED''' [[BR]]triad operator is neither restartable not repro in the branche (it was the case in v3.6 stable)38 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5758] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5759] and [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5760] with SETTE OK 39 40 ''' ====>>>> Bug in triad operator TO BE CHECKED''' [[BR]] triad operator is neither restartable not repro in the branche (it was the case in v3.6 stable) 41 41 42 42 ''operator'': [[BR]]- laplacian operator: re-entrant laplacian for iso-level, standard iso-neutral, and triad iso-neutral operators ;[[BR]]- bilaplacian operator: traldf_blp.F90 module: use of the re-entrant laplacian [[BR]]- both standard and triad iso-neutral operators includes the Method of Stabilizing Correction (Lemarié et al. (2012) which allows bilaplacian along iso-neutral surfaces ;[[BR]]- triad operator: introduce Beckers et al. (2000) compact stencil in the cross-isoneutral direction ; make the triad operator available in TOP[[BR]]- change name: traldf_iso_grif.F90 becomes traldf_iso_triad.F90[[BR]]- suppression of traadv_eiv.F90 ; traldf_bilap.F90 ; traldf_bilapg.F90 ;[[BR]]- remove the possibility to compute the lateral diffusion from T-S anomalies (key_traldf_ano) … … 98 98 99 99 === [[BR]]II.2 — Advective trends (TRA/traadv....) === 100 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5770] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5771] ===>> SETTE OK with revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5774] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5775] 101 102 * traadv_muscl2.F90 removed[[BR]]- traadv_muscl.F90 renamed traadv_mus.F90[[BR]]- traadv_cen2.F90 replaced by traadv_cen which provides 2nd and 4th order centered scheme on both horizontal and vertical directions.[[BR]]- name TVD has been changed to the more commonly used FCT (Flux Correction Transport)[[BR]]- FCT offers now 2nd and 4th order centered scheme on both horizontal and vertical directions.[[BR]]- UBS offers now in option either a 2nd order FCT or a 4th order COMPACT scheme in the vertical direction[[BR]]- NB in case of 4th order in the vertical, CEN, UBS and FCT use a compact 4th order scheme[[BR]]- key_esopa removed from traadv.F90 103 104 [[BR]]- Surface boundary condition in ISF case has been added in all cases (except 4th order COMPACT scheme which currently don't work with ISF) 100 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5770] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5771] ===>> SETTE OK with revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5774] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5737 5775] 101 102 - traadv_muscl2.F90 removed[[BR]]- traadv_muscl.F90 renamed traadv_mus.F90[[BR]]- traadv_cen2.F90 replaced by traadv_cen which provides 2nd and 4th order centered scheme on both horizontal and vertical directions.[[BR]]- name TVD has been changed to the more commonly used FCT (Flux Correction Transport)[[BR]]- FCT offers now 2nd and 4th order centered scheme on both horizontal and vertical directions.[[BR]]- UBS offers now in option either a 2nd order FCT or a 4th order COMPACT scheme in the vertical direction[[BR]]- NB in case of 4th order in the vertical, CEN, UBS and FCT use a compact 4th order scheme[[BR]]- key_esopa removed from traadv.F90[[BR]]- Surface boundary condition in ISF case has been added in all cases (except 4th order COMPACT scheme which have not been tested with ISF) 105 103 106 104 {{{ … … 123 121 / 124 122 }}} 125 '''Unresolved issues/improvement''' on TRAADV: [[BR]]- QCK: cross terms are missing. alternate direction should be added....[[BR]]- Bug in FCT with sub-time-stepping and key_vvl. The change in e3 should be taken into account in the sub-timesteps.[[BR]]- traadv_mus.F90 some rather simple optimization can be added...[[BR]]- traadv_qck.F90 : possibility to add a 4th order COMPACT scheme on the vertical. [[BR]]- 4th order COMPACT doesn't work with ISF the routine have to be modified123 '''Unresolved issues/improvement''' on TRAADV: [[BR]]- QCK: cross terms are missing. alternate direction should be added....[[BR]]- Bug in FCT with sub-time-stepping and key_vvl. The change in e3 should be taken into account in the sub-timesteps.[[BR]]- traadv_mus.F90 some rather simple optimization can be added...[[BR]]- traadv_qck.F90 : possibility to add a 4th order COMPACT scheme on the vertical. [[BR]]- 4th order COMPACT have not been tested with ISF. The routine needs probably to be modified. 126 124 127 125 === [[BR]]II.3 — Miscellaneous === … … 131 129 132 130 == [[BR]][[BR]][[BR]]III. Phasing of momentum trends == 133 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5777 5777] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5778 5778] and [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5782 5782]with SETTE OK131 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5777 5777] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5778 5778] and [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5782 5782] with SETTE OK 134 132 135 133 === [[BR]]III.1 — LDF on dynamics - viscous trends === … … 169 167 170 168 === [[BR]]III.2 —''' '''ADV on dynamics''' - advective trends''' === 171 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5778 5778] and [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5786 5786]with SETTE OK169 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5778 5778] and [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5786 5786] with SETTE OK 172 170 173 171 ''dynvor.F90 (impact also dynspg_ts.F90)''[[BR]] - remove key_esopa[[BR]] - remove dyn_vor_mix : now successive call of den_vor_ene (Coriolis) and din_vor_ens (relative voricity)[[BR]] - replace rotn by its calculation everywhere in dynvor.F90[[BR]] - remove the use of fmask from standard vorticity calculation in dynvor.F90 but add a namelist parameter (ln_dynvor_msk) to multiply by fmask the vorticity term[[BR]]- add an namelist option to mask or not the vorticity (including Coriolis) '''CAUTION''' : the mask option does not work: set to FALSE by default with comment DO NOT set it to TRUE (see ''' [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5721_CNRS9_NOC3_LDF?rev=5827 5827]''' )[[BR]]- change ln_dynvor_een_old into nn_een_e3f = 0/1 … … 219 217 Starting from the '''trunk''' (revision: [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev=5838 5836]), which has been phased with the branch described here, several branches are created which will contain the following item: 220 218 221 • Documentation : create a branch (shared among all developers) to document both the changes in revision [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev=5838 5836] and those in branches starting from this revision.219 • Documentation : create a branch (shared among all developers) to document both the changes in revision [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev=5838 5836] and those in branches starting from this revision. 222 220 223 221 • Non linear free surface by default ([https://forge.ipsl.jussieu.fr/nemo/browser/branches/2015/dev_r5836_NOC3_vvl_by_default dev_r5836_NOC3_vvl_by_default]). see Wiki page [https://forge.ipsl.jussieu.fr/nemo/wiki/ticket/5836_NOC3_vvl_by_default 5836_NOC3_vvl_by_default] 224 222 225 • ZDF simplification: introduce a vertical physics manager that allows to save MPP communications. remove avmu, avmv. remove all key_zdfxxx 226 227 • create trptra.F90 which compute the effective velocity for both TRC and TRA 223 • ZDF simplification: introduce a vertical physics manager that allows to save MPP communications. remove avmu, avmv. remove all key_zdfxxx (a Gurvan's branch) 224 225 • create trptra.F90 which compute the effective velocity for both TRC and TRA (a Gurvan's branch) 228 226 229 227 • remove all remaining hard coded parts specific to a configuration (especially ORCA2): see a description of the remaining work here: [https://forge.ipsl.jussieu.fr/nemo/wiki/2014WP/2014_SystemSimplification_hard_coding SystemSimplification_hard_coding]
