Changes between Version 54 and Version 55 of ticket/1613_NOC3_vvl_by_default
- Timestamp:
- 2015-12-12T15:35:00+01:00 (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
ticket/1613_NOC3_vvl_by_default
v54 v55 25 25 26 26 == I. Before/Now/After vertical coordinate system by default == 27 ===>>> runs ORCA2_LIM3 trunk and this branch identical to the last digit ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5845] [[BR]] ===>>> small bug correction in in_out_manager.F90 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5858] [[BR]] ===>>> correction of trunk bugs [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev= 5860] and [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev= 5861] + bug correction in non-vvl case===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5862] [[BR]] [[BR]] ===>>> Not working in non vvl case (blow up in 10 time step !) error (tmask instead of umask in dlmvvl)[[BR]] ===>>> OK see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5863] [[BR]] ===>>> re-introduce changes in dynhpg.F90 ===>>> ''' OK'''see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5864]27 ===>>> runs ORCA2_LIM3 trunk and this branch identical to the last digit ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5845] [[BR]] ===>>> small bug correction in in_out_manager.F90 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5858] [[BR]] ===>>> correction of trunk bugs [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev= 5860] and [https://forge.ipsl.jussieu.fr/nemo/log/trunk/NEMOGCM?rev= 5861] + bug correction in non-vvl case===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5862] [[BR]] [[BR]] ===>>> Not working in non vvl case (blow up in 10 time step !) error (tmask instead of umask in dlmvvl)[[BR]] ===>>> OK see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5863] [[BR]] ===>>> re-introduce changes in dynhpg.F90 ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5864] 28 28 29 29 * dom_oce.F90 :[[BR]](1) systematic declaration of before/now/after vertical coordinate [[BR]](2) uniformisation of the name: hur (hvr) becomes r1_hu_n (r1_hv_n) ; idem for before and after[[BR]](3) gdep3w becomes gde3w === … … 34 34 35 35 == [[BR]]II. Non-linear free surface by default == 36 ===>>> ''' (1)+(2)''' runs ORCA2_LIM and ORCA2_LIM3 (ln_linssh=T & =F) identical to the last digit with results of part I (rev 5864) and compilation with ORCA2_LIM_PISCES fine ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5868] [[BR]] ===>>> ''' (3) TRA''' runs ORCA2_LIM and ORCA2_LIM3 (ln_linssh=T & =F) OK, but solver modified (roundoff changes) ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5883] [[BR]] Bug correction to pass SETTE ===>>> ''' OK'''see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5916]36 ===>>> ''' (1)+(2)''' runs ORCA2_LIM and ORCA2_LIM3 (ln_linssh=T & =F) identical to the last digit with results of part I (rev 5864) and compilation with ORCA2_LIM_PISCES fine ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5868] [[BR]] ===>>> ''' (3) TRA''' runs ORCA2_LIM and ORCA2_LIM3 (ln_linssh=T & =F) OK, but solver modified (roundoff changes) ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5883] [[BR]] Bug correction to pass SETTE ===>>> ''' OK''' see revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 5916] 37 37 38 38 === (1) replace lk_vvl by .NOT.ln_linssh everywhere === … … 54 54 '''(1)''' Merge with the trunk, revision [https://forge.ipsl.jussieu.fr/nemo/log/trunk?rev= 5930].[[BR]]Minor correction:[[BR]]- bmask is removed (not used anymore) (modules: dommsk.F90, bdyini.F90, dom_oce.F90)[[BR]]- suppression of kt argument in subroutine tide_init (bdyini.F90 module) 55 55 56 merge with compilation OK, '''no test run''' ===>>> revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 6004].[[BR]][[BR]]'''(2)''' Improve the time stepping with respect to vertical mixing (dynzdf.F90, dynzdf_exp.F90, dynzdf_imp.F90, and dynnxt.F90)[[BR]]- dynnxt.F90 : add a subroutine (dyn_nxt_LF) which performs the leap frog time stepping, and is called in dynzdf in both explicit and implicit cases.[[BR]]- dynzdf_exp and _imp.F90 : remove the LF time stepping now done in dynzdf.F90[[BR]]- dynzdf_imp.F90 : add in argument the time step of the e3u, e3v: either _n (linear free surf.) or _a (default) [[BR]] e3uw, e3vw changed from now to after time step, and since there are only used in dyn_zdf_imp there are computed there and defined as local 3D arrays[[BR]]- dynzdf_exp.F90 : e3uw, e3vw changed from now to before time step. 56 merge with compilation OK, '''no test run''' ===>>> revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 6004]. 57 58 Bug correction to pass SETTE test ===>>> revision [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 6030] & [https://forge.ipsl.jussieu.fr/nemo/log/branches/2015/dev_r5836_NOC3_vvl_by_default?rev= 6031]. 59 60 [[BR]] [[BR]]'''(2)''' Improve the time stepping with respect to vertical mixing (dynzdf.F90, dynzdf_exp.F90, dynzdf_imp.F90, and dynnxt.F90)[[BR]]- dynnxt.F90 : add a subroutine (dyn_nxt_LF) which performs the leap frog time stepping, and is called in dynzdf in both explicit and implicit cases.[[BR]]- dynzdf_exp and _imp.F90 : remove the LF time stepping now done in dynzdf.F90[[BR]]- dynzdf_imp.F90 : add in argument the time step of the e3u, e3v: either _n (linear free surf.) or _a (default) [[BR]] e3uw, e3vw changed from now to after time step, and since there are only used in dyn_zdf_imp there are computed there and defined as local 3D arrays[[BR]]- dynzdf_exp.F90 : e3uw, e3vw changed from now to before time step.[[BR]][[BR]] 57 61 58 62 == IV. time stepping of tracers : performed systematically on thickness-weighted tracers (or possibly on volume-weighted tracers): ==