Opened 16 months ago

Last modified 2 months ago

#2385 new Task

KERNEL-06_techene_better_e3_management

Reported by: techene Owned by: techene
Priority: low Milestone: Unscheduled
Component: DOM Version: trunk
Severity: minor Keywords:
Cc: Branch review: failed
MP ready?: no Task progress:

Description (last modified by techene)

Workplan action

KERNEL-06 Better and faster implementation of quasi eulerian coordinate (star coordinates : z* et s*)

Wikipage: wiki:2020WP/KERNEL-06_techene_better_e3_management

starting point

In NEMO r12377 scale factors (e3*) at u-v-w-uw-vw-f-points are interpolated from e3t at Kbb, Kmm, and Kaa.
The module in charge of scale factor management is src/OCE/DOM/domvvl.F90.

domvvl.F90 interpolation routine is called :

  • at initialisation or restart at u-v-w-uw-vw-f-points
    nemogcm 
    --> nemo_init
       --> dom_init
          --> dom_vvl_init
             --> dom_vvl_rst
             --> dom_vvl_zgr
                --> dom_vvl_interpol 
    
  • at each time step for "after" scale factor at u-v-points each time ssh[Naa] is computed
    nemogcm 
    --> stp
       --> dom_vvl_sf_nxt
          --> e3t[Kaa]
          --> dom_vvl_interpol
    
  • at each time step for "now" scale factor at u-v-points e3t is directly filtered
    nemogcm 
    --> stp
       --> tra_atf
          --> e3t[Kmm]
       --> dyn_atf
          --> e3t[Kmm]
          --> dom_vvl_interpol
    
  • at each time step after time swapping for "now" at f-point and "before" scale factor both at w-uw-vw-points
    nemogcm 
    --> stp
       --> dom_vvl_sf_update
          --> dom_vvl_interpol
    

developments

In version 1 of source:/NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3 we implement changes progressively and validate step by step regarding GYRE_PISCES test case. We remove all the vvl routines usage thus we replace e3t/u/v/w/uw/vw at 3 time step + e3f (19) 3d tables storage and twice e3u/v "after" + e3u/v "now" + e3f/w/uw/vw "now" + e3w/uw/vw "before" (13) 3d tables interpolation at each step and e3u/v/f/w/uw/vw "now" + e3u/v/w/uw/vw "before" (11) 3d tables interpolation at initialisation or restart by r3t/u/v at 3 time steps and r3f i.e. (10) 2d table storage and on the fly light computation. For backward compatibility we introduce a cpp key key_qco in order to isolate new scale factor implementation from former vvl version. qco stand for for "quasi eulerian coordinate".

  • new variables added in dom_oce and domain
    r3P with P = [t,u,v,f] are 2d in space ssh/hP0
    
  • new module in DOM : dom_qco
    -- dom_qco_r3c ! compute ssh/ht0 at t-point and interpolate ssh/h.0 at u-v-f-points from ssh
    -- dom_qco_zgr ! set ssh/ht0 at t-u-v-f-points for Kmm and at t-u-v-points for Kbb
       --> dom_qco_r3c[Kmm] at t-u-v-f-points
       --> dom_qco_r3c[Kbb] at t-u-v  -points
    
  • new substitute in DOM : domzgr_substitute When key_qco is active e3. is no longer a variable but an expression. Each time e3. appears in a routine an include domzgr_substitute in the module enables to replace it by a (e3._0 ( 1 + r3. ) * mask.) like expression.
    #   define  e3t(i,j,k,t)   (e3t_0(i,j,k)*(1._wp+r3t(i,j,t)*tmask(i,j,k)))
    #   define  e3u(i,j,k,t)   (e3u_0(i,j,k)*(1._wp+r3u(i,j,t)*umask(i,j,k)))
    #   define  e3v(i,j,k,t)   (e3v_0(i,j,k)*(1._wp+r3v(i,j,t)*vmask(i,j,k)))
    #   define  e3f(i,j,k)     (e3f_0(i,j,k)*(1._wp+r3f(i,j)*fmask(i,j,k)))
    #   define  e3w(i,j,k,t)   (e3w_0(i,j,k)*(1._wp+r3t(i,j,t)))
    #   define  e3uw(i,j,k,t)  (e3uw_0(i,j,k)*(1._wp+r3u(i,j,t)))
    #   define  e3vw(i,j,k,t)  (e3vw_0(i,j,k)*(1._wp+r3v(i,j,t)))
    
  • finally we extended the e3. modification to h. r1_h. and gde..
    #   define  ht(i,j)        (ht_0(i,j)+ssh(i,j,Kmm))
    #   define  hu(i,j,t)      (hu_0(i,j)*(1._wp+r3u(i,j,t)))
    #   define  hv(i,j,t)      (hv_0(i,j)*(1._wp+r3v(i,j,t)))
    #   define  r1_hu(i,j,t)   (r1_hu_0(i,j)/(1._wp+r3u(i,j,t)))
    #   define  r1_hv(i,j,t)   (r1_hv_0(i,j)/(1._wp+r3v(i,j,t)))
    #   define  gdept(i,j,k,t) (gdept_0(i,j,k)*(1._wp+r3t(i,j,t)))
    #   define  gdepw(i,j,k,t) (gdepw_0(i,j,k)*(1._wp+r3t(i,j,t)))
    #   define  gde3w(i,j,k)   (gdept_0(i,j,k)*(1._wp+r3t(i,j,Kmm))-ssh(i,j,Kmm))
    

Step 1 : Check the error for e3t, e3w between the current way to compute e3 at T-, W-point and the proposed way to compute e3 at T-, W-point.

  • prints added with no change in the results

Step 2 : First we change only the core routine in domvvl which should be changed into domQE.

  • add new variables, duplicate step into steplf and domvvl into domQE
  • change interpolation routines into scaling routines in domQE

Step 3 : Then we change the Asselin filtering routine indeed because water forcing are applied locally.

  • change Asselin routines (maybe not required since e3 scale with vertical with JC modif)

Step 4 : Finally we remove the interpol routine in the whole code

  • remove interpolating routine in all the code (AGRIF, OFF,…)
  • use a SUBSTITUTE when there are e3 CALL
  • make some changes in step and domQE to have the whole thing consistent

Tests

Once the development is done, the PI should complete the tests section below and after ask the reviewers to start their review.

This part should contain the detailed results of SETTE tests (restartability and reproducibility for each of the reference configuration) and detailed results of restartability and reproducibility when the option is activated on specified configurations used for this test

Regular checks:

  • Can this change be shown to produce expected impact (option activated)?
  • Can this change be shown to have a null impact (option not activated)?
  • Results of the required bit comparability tests been run: are there no differences when activating the development?
  • If some differences appear, is reason for the change valid/understood?
  • If some differences appear, is the impact as expected on model configurations?
  • Is this change expected to preserve all diagnostics?
  • If no, is reason for the change valid/understood?
  • Are there significant changes in run time/memory?


We want to track and maybe explain the differences observed at every steps.
Reference set up : For that we produce a reference data set with the trunk -r 12377 using the GYRE_PISCES configuration where top cpp_key has been removed. We run it on 120 time steps. The drag coefficient is zero. We XIOS output an averaged field every 5 days.

Step 1 : We print MAXVAL of error between both way to compute the vertical scale factors at each time step, note that we cancelled forcing (in the r12377 revision it should not change anything since water forcings such as run off and emp scale with the vertical).

error between proposed and former way to compute vertical scale factors at time kt = 1, 120, 85
e3t (1)
0.0000000000000000
3999.6591076268369
4.54747350886E-013
e3t (2)
5.68434188608E-014
5.11590769747E-013
4.54747350886E-013
e3w
4.64477238892E-007
6.13657050507E-006
5.27333801869E-006

gde3w
1.81898940354E-012
2.72848410531E-012
2.72848410531E-012

QUESTION : Why do we have such an error on the e3w scale factors ? It is not consistent with machine accuracy error. It seems to be related to the e3w_0 computation. How do we compute e3w_0 ?
OK SOLVED ! THIS IS A KIND OF ERROR IN THE CODE !!! DUE TO THE FACT THAT E3W_0(jk) != 0.5 * ( E3T_0(jk) + E3T_0(jk-1) )…

Step 2 : Change the code in domvvl turn into domqe. Duplicate step.F90 into steplf.F90 and call domqe routines inside.

We observe small errors but not errors at the truncature level as expected with the curent trunk version. This is due to the differences spotted above.
WE CAN NO LONGER USE THE TRUNK PRODUCTION AS A REFERENCE…

Bug list

  • bad location of after r3 coefficient with no time splitting
  • some silly allocating memory bugs found
  • not that silly bug in implicit mode triggering for SPITZ12 configuration (Dt instead of 2Dt required) due to update

BUG 1 : dom_qco_init.F90 dom_init is called before dyn_adv_init, then default value of ln_dynadv_vec is at false. r3P coefficients computation is not the same if we use flux of vector form. GYRE_PISCES runs in vector form so at the restart r3P are initialised with their flux form instead of their vector from.
RESOLUTION : cpp key added key_qcoTest_FluxForm performance tests have to be done if performances are not relevant the flux from qco switch will be removed. Note that a switch as been added in dynspg_ts to compute surface average consistently with qco flux form. En gros soit on fait la distinction a chaque interpolation lineaire de la ssh soit pas du tout, il faut juste être consistent. Si les performances flux form (il y a moins de calcul) ne sont pas significatives, on pourra abandonner le calcul sinon il faudra ajouter une option de restart. Routines from domqco.F90 and dynapg_ts.F90 havs to be modified.

BUG 2.1 : in dynatf_qco.F90 barotrope uub and vvb are compute with the un-filtrered scale factor
BUG 2.2 : the way to compute uub and vvb with e3 from ssh/h0 is not exactly the same as the implementation of e3 filtered
RESOLUTION : use filtered r3P_f and be carefull the computation has to be done exactly as in domzgr_substitute i.e. including mask and parenthesis otherwise the restartability fails in dynatf_qco.F90.

BUG 3: when time splitting is not active ssh/h0 at f-points after the dynamic was not computed
RESOLUTION : an extra dom_qco_r3c after dyn_spg_ts in case ln_dynspg_ts = F in stpMLF.F90

  • non linear version of GYRE_PISCES shows restartability issue due to BUG 1
  • ORCA2_ICE_PISCES

WARNING in debug mode restartability fails it is the case even for the trunk @ 13327 need to be confirmed running tests on the current trunk when it will run… problem un PISCES/TOP solved by Christian !

Commit History (69)

ChangesetAuthorTimeChangeLog
14233jchanut2020-12-21T09:06:20+01:00

#2385, prevent from overflow values with een scheme, nn_e3f_typ=1 and key_qco/key_linssh

14205techene2020-12-17T19:23:48+01:00

#2385 cosmetics and cleaning

14204techene2020-12-17T19:12:24+01:00

#2385 SWG bug fix

14184techene2020-12-16T11:20:59+01:00

#2385 add key_linssh or key_qco using domzgr_substitute - only sette tested

14183techene2020-12-16T11:20:07+01:00

#2385 add key_linssh or key_qco using domzgr_substitute - only sette tested

14180techene2020-12-15T23:25:58+01:00

#2385 correct F-point variables names

14179techene2020-12-15T23:17:09+01:00

#2385 restart with qco bug fix for euler 1st and RK3

14148jchanut2020-12-10T14:43:23+01:00

#2385, qco and agrif TOP (missing substitutes)

14143techene2020-12-09T22:26:04+01:00

#2385 add key_linssh equivalent to ln_linssh using domzr_substitute

14141techene2020-12-09T17:00:01+01:00

#2385 and #2480 : revise check compatibilities

14139techene2020-12-09T16:08:30+01:00

#2385 SWE associated update in OCE

14137techene2020-12-09T10:55:03+01:00

#2385 : swe is now working (SWE/restart.F90 and SWE/stpctl.F90 moved as subroutines of OCE/IOM/restart.F90 and OCE/stpctl.F90)

14118techene2020-12-07T11:31:48+01:00

#2385 bug fixes for qco

14053techene2020-12-03T14:48:38+01:00

#2385 added to the trunk

14052techene2020-12-03T14:38:57+01:00

#2385 branch updated with trunk 14051

14051techene2020-12-03T14:28:02+01:00

#2385 branch updated with trunk 14045 (pb in ORCA2_ICE_OBS to fix later)

14050techene2020-12-03T13:51:53+01:00

#2385 branch updated with trunk 14033 sette test ok except ORCA2_ICE_OBS + changes the results

14027jchanut2020-12-03T10:12:29+01:00

Remove circular dependency between dynspg_ts and agrif_oce_inter, #2385p

14023techene2020-12-03T09:07:27+01:00

#2385 problem : branch updated with trunk 13986

14018techene2020-12-02T18:22:24+01:00

#2385 branch updated with trunk 13970

13762techene2020-11-09T19:55:21+01:00

#2385 set ssh separately from istate variables to remove domqco.F90 duplicates

13761techene2020-11-09T18:49:23+01:00

#2385 set ssh separately from istate variables to remove domqco.F90 duplicates

13757techene2020-11-09T17:25:44+01:00

#2385 initilise ssh separately to remove domqco.F90 duplicates

13740techene2020-11-06T14:00:29+01:00

#2385 remove Kaa from arguments

13737techene2020-11-06T12:25:58+01:00

#2385 hf bug correction (only used by qco) : use a dedicated fe3mask instead of fmask which values are not 0 or 1

13736techene2020-11-06T12:23:04+01:00

#2385 qco e3f bug correction : use a dedicated fe3mask instead of fmask which values are not 0 or 1

13735techene2020-11-06T12:16:15+01:00

#2385 : cleaning comments

13734techene2020-11-06T12:08:40+01:00

#2385 : cleaning comments and OFF/stpmlf

13732techene2020-11-06T10:20:56+01:00

#2385 clean dom_qco_zgr : Kaa is no longer needed as an argument

13706techene2020-10-29T15:51:55+01:00

#2385 #2555 and #2527 shallow water test case now runs properly

13698techene2020-10-28T19:18:46+01:00

#2385 update qco names after agrif required changes

13693jchanut2020-10-28T17:34:14+01:00

#2385, change r3x update with AGRIF: Avoid passing arguments to a subroutine while swapping grids

13692jchanut2020-10-28T17:29:51+01:00

#2385, revert to standard VORTEX cpp keys, i.e. remove "key_qco"

13689jchanut2020-10-28T11:42:21+01:00

#2385, Missing ssh initialization for vortex

13683jchanut2020-10-27T18:27:17+01:00

#2385, AGRIF. Duplicate now r3x in after r3x arrays at initialization (as done with std vvl)

13680jchanut2020-10-26T23:02:27+01:00

#2385, effectively add VORTEX ssh initialization and key_qco. Save first guess (prior update) r3x arrays: Restored correct value of surface w.

13678jchanut2020-10-26T18:52:53+01:00

#2385, qco with AGRIF

13644techene2020-10-20T12:17:11+02:00

#2385 come back to previous e3 weighting in ene and ens when qco not activated (SETTE pass)

13627techene2020-10-16T16:26:17+02:00

#2385 cosmetics and warning for ENT uncompatibility with vector form

13621techene2020-10-16T14:16:38+02:00

#2385 ln_dynvor=T should be ok

13615techene2020-10-15T17:22:11+02:00

#2385 typo correction

13614techene2020-10-15T17:21:08+02:00

#2385 cleaning

13608techene2020-10-14T18:31:28+02:00

#2385 reordering and remove unnecessary USE - sette test not passed yet

13607techene2020-10-14T18:27:09+02:00

#2385 cosmetics and F-point loops changed

13606techene2020-10-14T18:23:00+02:00

#2385 adapted for SWE

13605techene2020-10-14T18:13:19+02:00

#2385 add diags and diags at F-point

13604techene2020-10-14T18:07:31+02:00

#2385 cleaning, relevant features moved to OCE, bug corrected in dynvor

13603techene2020-10-14T18:04:16+02:00

#2385 adapted for SWE : some cleaning, bug corrected in the time stepping (more details in the ticket)

13600techene2020-10-14T17:55:14+02:00

#2385 adapted for SWE: clean unnecessary USE, remove unwanted features (AGRIF, coupling,…), add constants

13599techene2020-10-14T17:45:46+02:00

#2385 add some comments and cleaning

13597techene2020-10-14T17:40:42+02:00

#2385 cleanning

13592techene2020-10-14T17:11:08+02:00

#2385 proper link to cfgs/SHARED

13513techene2020-09-24T14:17:18+02:00

#2527 and #2385 add a symmetric operator for ocean viscosity

13512techene2020-09-24T13:57:53+02:00

#2385 add the possibility of having F grid files / variables (needed for SWE and maybe useful for having the vorticity at the right point)

13503techene2020-09-22T22:12:27+02:00

files copied from dev_r12527_Gurvan_ShallowWater see #2385

13502techene2020-09-22T22:07:46+02:00

test for SWE developpement integrated into KERNEL-06_2 see #2385

13437techene2020-08-25T23:16:04+02:00

debug : e3w initialised properly wrt gdept #2385

13430techene2020-08-24T13:02:49+02:00

qco debug : consequence of the trunk bad commit #2385

13427techene2020-08-21T18:26:57+02:00

debug in order to pass non linear SETTE test when agrif in not activated see #2385

13426techene2020-08-21T17:12:04+02:00

Create a new branch for KERNEL-06 debug see #2385

13228smasson2020-07-02T16:41:07+02:00

better e3: update with trunk@13227 see #2385

13219smasson2020-07-02T12:40:30+02:00

better e3: update with trunk@13218 see #2385

13217smasson2020-07-02T11:27:33+02:00

better e3: update with trunk@13215 see #2385

13198smasson2020-07-01T16:27:52+02:00

better e3: minor cleaning see #2385

13193smasson2020-07-01T15:42:06+02:00

better e3: update with trunk@13136 see #2385

13167techene2020-06-26T18:38:12+02:00

#2385 : pass sette tests without key_qco, oops should be true this time

13164techene2020-06-26T17:02:14+02:00

#2385 : pass sette tests without key_qco

12724techene2020-04-08T21:37:59+02:00

branch KERNEL-06 : merge with trunk@12698 #2385 - in duplcated files : changes to comply to the new trunk variables and some loop bug fixes

12460techene2020-02-25T17:32:23+01:00

branch for vertical scale factor management in leap frog associated with #2385

Change History (85)

comment:1 Changed 16 months ago by techene

In 12460:

branch for vertical scale factor management in leap frog associated with #2385

comment:2 Changed 15 months ago by techene

In 12724:

branch KERNEL-06 : merge with trunk@12698 #2385 - in duplcated files : changes to comply to the new trunk variables and some loop bug fixes

comment:3 Changed 12 months ago by techene

In 13164:

#2385 : pass sette tests without key_qco

comment:4 Changed 12 months ago by techene

In 13167:

#2385 : pass sette tests without key_qco, oops should be true this time

comment:5 Changed 12 months ago by smasson

In 13193:

better e3: update with trunk@13136 see #2385

comment:6 Changed 12 months ago by smasson

In 13198:

better e3: minor cleaning see #2385

comment:7 Changed 12 months ago by smasson

[13198] passes all sette tests and gives the same results as trunk@12925

[reee217@jean-zay2: sette]$ ./sette_rpt.sh

Current code is : NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3 @ r13198  ( last change @ r13198 )

SETTE validation report generated for :

       NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3 @ r13198 (last changed revision)

       on X64_JEANZAY arch file


!!---------------1st pass------------------!!

   !----restart----!
WGYRE_PISCES_ST              run.stat    restartability  passed :  13198
WGYRE_PISCES_ST              tracer.stat restartability  passed :  13198
WORCA2_ICE_PISCES_ST         run.stat    restartability  passed :  13198
WORCA2_ICE_PISCES_ST         tracer.stat restartability  passed :  13198
WORCA2_OFF_PISCES_ST         tracer.stat restartability  passed :  13198
WAMM12_ST                    run.stat    restartability  passed :  13198
WORCA2_SAS_ICE_ST            run.stat    restartability  passed :  13198
WAGRIF_DEMO_ST               run.stat    restartability  passed :  13198
WSPITZ12_ST                  run.stat    restartability  passed :  13198
WISOMIP_ST                   run.stat    restartability  passed :  13198
WOVERFLOW_ST                 run.stat    restartability  passed :  13198
WLOCK_EXCHANGE_ST            run.stat    restartability  passed :  13198
WVORTEX_ST                   run.stat    restartability  passed :  13198
WICE_AGRIF_ST                run.stat    restartability  passed :  13198

   !----repro----!
WGYRE_PISCES_ST              run.stat    reproducibility passed :  13198
WGYRE_PISCES_ST              tracer.stat reproducibility passed :  13198
WORCA2_ICE_PISCES_ST         run.stat    reproducibility passed :  13198
WORCA2_ICE_PISCES_ST         tracer.stat reproducibility passed :  13198
WORCA2_OFF_PISCES_ST         tracer.stat reproducibility passed :  13198
WAMM12_ST                    run.stat    reproducibility passed :  13198
WORCA2_SAS_ICE_ST            run.stat    reproducibility passed :  13198
WORCA2_ICE_OBS_ST            run.stat    reproducibility passed :  13198
WAGRIF_DEMO_ST               run.stat    reproducibility passed :  13198
WSPITZ12_ST                  run.stat    reproducibility passed :  13198
WISOMIP_ST                   run.stat    reproducibility passed :  13198
WVORTEX_ST                   run.stat    reproducibility passed :  13198
WICE_AGRIF_ST                run.stat    reproducibility passed :  13198

   !----agrif check----!
ORCA2 AGRIF vs ORCA2 NOAGRIF run.stat    unchanged  -    passed :  13198 13198

   !----result comparison check----!

check result differences between :
VALID directory : /gpfsscratch/rech/fqx/reee217/dev_r12377_KERNEL-06_techene_e3/NEMO_VALIDATION at rev 13198
and
REFERENCE directory : /gpfswork/rech/fqx/reee217/NEMO_ALL_VALIDATIONS/trunk/NEMO_VALIDATION at rev 12925

WGYRE_PISCES_ST       run.stat    files are identical
WGYRE_PISCES_ST       tracer.stat files are identical
WORCA2_ICE_PISCES_ST  run.stat    files are identical
WORCA2_ICE_PISCES_ST  tracer.stat files are identical
WORCA2_OFF_PISCES_ST  tracer.stat files are identical
WAMM12_ST             run.stat    files are identical
WISOMIP_ST            run.stat    files are identical
WORCA2_SAS_ICE_ST     run.stat    files are identical
WAGRIF_DEMO_ST        run.stat    files are identical
WSPITZ12_ST           run.stat    files are identical
WISOMIP_ST            run.stat    files are identical
WVORTEX_ST            run.stat    files are identical
WICE_AGRIF_ST         run.stat    files are identical

comment:8 Changed 12 months ago by smasson

Script to merge this branch without taking into considerations line modifications which contain only blank

svnlogin=...
rev=13136
dir_mrg=trunk_${rev}_e3
dir_ref=trunk_${rev}_e3_ref
# get the trunk@${rev}
svn co -r ${rev} svn+ssh://${svnlogin}@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk $dir_mrg
# copy it
rsync -a $dir_mrg/ $dir_ref/
# merge Sibylle branch (with tailing blank modifications) into dir_mrg
svn merge svn+ssh://${svnlogin}@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3 $dir_mrg
# for all modified files in dir_mrg, keep only modifications of lines with something else than blank
for ff in $( svn status $dir_mrg | grep "^M" | sed -e "s?^M *$dir_mrg/??" )  
do
   diff -u -w $dir_ref/$ff $dir_mrg/$ff > diffpatch   # get the modifications without lines with only blank changes
   patch $dir_ref/$ff diffpatch                       # apply these modifications to dir_ref files
   mv $dir_ref/$ff $dir_mrg/$ff                       # replace modified dir_mrg files by modified dir_ref files
done
rm -rf $dir_ref diffpatch

comment:9 Changed 12 months ago by smasson

In 13217:

better e3: update with trunk@13215 see #2385

comment:10 Changed 12 months ago by smasson

In 13219:

better e3: update with trunk@13218 see #2385

comment:11 Changed 12 months ago by smasson

[13219] passes all sette tests and gives same results as trunk@13218

Current code is : NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3 @ r13219  ( last change @ r13219 )

SETTE validation report generated for :

       NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3 @ r13219 (last changed revision)

       on X64_JEANZAY arch file


!!---------------1st pass------------------!!

   !----restart----!
WGYRE_PISCES_ST              run.stat    restartability  passed :  13219
WGYRE_PISCES_ST              tracer.stat restartability  passed :  13219
WORCA2_ICE_PISCES_ST         run.stat    restartability  passed :  13219
WORCA2_ICE_PISCES_ST         tracer.stat restartability  passed :  13219
WORCA2_OFF_PISCES_ST         tracer.stat restartability  passed :  13219
WAMM12_ST                    run.stat    restartability  passed :  13219
WORCA2_SAS_ICE_ST            run.stat    restartability  passed :  13219
WAGRIF_DEMO_ST               run.stat    restartability  passed :  13219
WSPITZ12_ST                  run.stat    restartability  passed :  13219
WISOMIP_ST                   run.stat    restartability  passed :  13219
WOVERFLOW_ST                 run.stat    restartability  passed :  13219
WLOCK_EXCHANGE_ST            run.stat    restartability  passed :  13219
WVORTEX_ST                   run.stat    restartability  passed :  13219
WICE_AGRIF_ST                run.stat    restartability  passed :  13219

   !----repro----!
WGYRE_PISCES_ST              run.stat    reproducibility passed :  13219
WGYRE_PISCES_ST              tracer.stat reproducibility passed :  13219
WORCA2_ICE_PISCES_ST         run.stat    reproducibility passed :  13219
WORCA2_ICE_PISCES_ST         tracer.stat reproducibility passed :  13219
WORCA2_OFF_PISCES_ST         tracer.stat reproducibility passed :  13219
WAMM12_ST                    run.stat    reproducibility passed :  13219
WORCA2_SAS_ICE_ST            run.stat    reproducibility passed :  13219
WORCA2_ICE_OBS_ST            run.stat    reproducibility passed :  13219
WAGRIF_DEMO_ST               run.stat    reproducibility passed :  13219
WSPITZ12_ST                  run.stat    reproducibility passed :  13219
WISOMIP_ST                   run.stat    reproducibility passed :  13219
WVORTEX_ST                   run.stat    reproducibility passed :  13219
WICE_AGRIF_ST                run.stat    reproducibility passed :  13219

   !----agrif check----!
ORCA2 AGRIF vs ORCA2 NOAGRIF run.stat    unchanged  -    passed :  13219 13219

   !----result comparison check----!

check result differences between :
VALID directory : /gpfsscratch/rech/fqx/reee217/better_e3_13217/NEMO_VALIDATION at rev 13219
and
REFERENCE directory : /gpfswork/rech/fqx/reee217/NEMO_ALL_VALIDATIONS/trunk/NEMO_VALIDATION at rev 13218

WGYRE_PISCES_ST       run.stat    files are identical
WGYRE_PISCES_ST       tracer.stat files are identical
WORCA2_ICE_PISCES_ST  run.stat    files are identical
WORCA2_ICE_PISCES_ST  tracer.stat files are identical
WORCA2_OFF_PISCES_ST  tracer.stat files are identical
WAMM12_ST             run.stat    files are identical
WISOMIP_ST            run.stat    files are identical
WORCA2_SAS_ICE_ST     run.stat    files are identical
WAGRIF_DEMO_ST        run.stat    files are identical
WSPITZ12_ST           run.stat    files are identical
WISOMIP_ST            run.stat    files are identical
WVORTEX_ST            run.stat    files are identical
WICE_AGRIF_ST         run.stat    files are identical

comment:12 Changed 12 months ago by smasson

In 13228:

better e3: update with trunk@13227 see #2385

comment:13 Changed 11 months ago by techene

  • Description modified (diff)

comment:14 Changed 11 months ago by techene

  • Description modified (diff)

comment:15 Changed 11 months ago by techene

  • Description modified (diff)

comment:16 Changed 10 months ago by techene

In 13426:

Create a new branch for KERNEL-06 debug see #2385

comment:17 Changed 10 months ago by techene

In 13427:

debug in order to pass non linear SETTE test when agrif in not activated see #2385

comment:18 Changed 10 months ago by techene

In 13430:

qco debug : consequence of the trunk bad commit #2385

comment:19 Changed 10 months ago by techene

In 13437:

debug : e3w initialised properly wrt gdept #2385

comment:20 Changed 10 months ago by techene

[13430] passes all sette tests in qco not involving agrif nor isf nor linear ssh.

[uaw38ip@jean-zay3: sette]$ ./sette_rpt.sh

Current code is : NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3 @ r13426  ( last change @ r13426 )

SETTE validation report generated for : 

       NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3 @ r13426+ (last changed revision)

       on X64_JEANZAY arch file


!!---------------1st pass------------------!!

   !----restart----!   
WGYRE_PISCES_ST              directory                  MISSING :  13426+
WORCA2_ICE_PISCES_ST         run.stat    restartability  passed :  13426+
WORCA2_ICE_PISCES_ST         tracer.stat restartability  passed :  13426+
WORCA2_OFF_PISCES_ST         directory                  MISSING :  13426+
WAMM12_ST                    run.stat    restartability  passed :  13426+
WORCA2_SAS_ICE_ST            directory                  MISSING :  13426+
WAGRIF_DEMO_ST               directory                  MISSING :  13426+
WSPITZ12_ST                  run.stat    restartability  passed :  13426+
WISOMIP_ST                   ocean.output               MISSING :  13426+
WISOMIP_ST                   incomplete test
WOVERFLOW_ST                 run.stat    restartability  passed :  13426+
WLOCK_EXCHANGE_ST            run.stat    restartability  passed :  13426+
WVORTEX_ST                   directory                  MISSING :  13426+
WICE_AGRIF_ST                directory                  MISSING :  13426+

   !----repro----!   
WGYRE_PISCES_ST              directory                  MISSING :  13426+
WORCA2_ICE_PISCES_ST         run.stat    reproducibility passed :  13426+
WORCA2_ICE_PISCES_ST         tracer.stat reproducibility passed :  13426+
WORCA2_OFF_PISCES_ST         directory                  MISSING :  13426+
WAMM12_ST                    run.stat    reproducibility passed :  13426+
WORCA2_SAS_ICE_ST            directory                  MISSING :  13426+
WORCA2_ICE_OBS_ST            directory                  MISSING :  13426+
WAGRIF_DEMO_ST               directory                  MISSING :  13426+
WSPITZ12_ST                  run.stat    reproducibility passed :  13426+
WISOMIP_ST                   ocean.output               MISSING :  13426+
WISOMIP_ST                   incomplete test
WVORTEX_ST                   directory                  MISSING :  13426+
WICE_AGRIF_ST                directory                  MISSING :  13426+
Last edited 10 months ago by techene (previous) (diff)

comment:21 Changed 9 months ago by techene

In 13502:

test for SWE developpement integrated into KERNEL-06_2 see #2385

comment:22 Changed 9 months ago by techene

In 13503:

files copied from dev_r12527_Gurvan_ShallowWater see #2385

comment:23 Changed 9 months ago by techene

In 13512:

#2385 add the possibility of having F grid files / variables (needed for SWE and maybe useful for having the vorticity at the right point)

comment:24 Changed 9 months ago by techene

In 13513:

#2527 and #2385 add a symmetric operator for ocean viscosity

comment:25 Changed 8 months ago by techene

In 13592:

#2385 proper link to cfgs/SHARED

comment:26 Changed 8 months ago by techene

In 13597:

#2385 cleanning

comment:27 Changed 8 months ago by techene

In 13599:

#2385 add some comments and cleaning

comment:28 Changed 8 months ago by techene

In 13600:

#2385 adapted for SWE: clean unnecessary USE, remove unwanted features (AGRIF, coupling,…), add constants

comment:29 Changed 8 months ago by techene

In 13603:

#2385 adapted for SWE : some cleaning, bug corrected in the time stepping (more details in the ticket)

comment:30 Changed 8 months ago by techene

In 13604:

#2385 cleaning, relevant features moved to OCE, bug corrected in dynvor

comment:31 Changed 8 months ago by techene

In 13605:

#2385 add diags and diags at F-point

comment:32 Changed 8 months ago by techene

In 13606:

#2385 adapted for SWE

comment:33 Changed 8 months ago by techene

In 13607:

#2385 cosmetics and F-point loops changed

comment:34 Changed 8 months ago by techene

In 13608:

#2385 reordering and remove unnecessary USE - sette test not passed yet

comment:35 Changed 8 months ago by techene

In 13614:

#2385 cleaning

comment:36 Changed 8 months ago by techene

In 13615:

#2385 typo correction

comment:37 Changed 8 months ago by techene

In 13621:

#2385 ln_dynvor=T should be ok

comment:38 Changed 8 months ago by techene

In 13627:

#2385 cosmetics and warning for ENT uncompatibility with vector form

comment:39 Changed 8 months ago by techene

[13615] passes sette tests

Current code is : NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3 @ r13615  ( last change @ r13615 )

SETTE validation report generated for : 

       NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3 @ r13615 (last changed revision)

       on X64_IRENE arch file


!!---------------1st pass------------------!!

   !----restart----!   
WGYRE_PISCES_ST              run.stat    restartability  passed :  13615
WGYRE_PISCES_ST              tracer.stat restartability  passed :  13615
WORCA2_ICE_PISCES_ST         run.stat    restartability  passed :  13615
WORCA2_ICE_PISCES_ST         tracer.stat restartability  passed :  13615
WORCA2_OFF_PISCES_ST         tracer.stat restartability  passed :  13615
WAMM12_ST                    run.stat    restartability  passed :  13615
WORCA2_SAS_ICE_ST            run.stat    restartability  passed :  13615
WAGRIF_DEMO_ST               run.stat    restartability  passed :  13615
WSPITZ12_ST                  run.stat    restartability  passed :  13615
WISOMIP_ST                   run.stat    restartability  passed :  13615
WOVERFLOW_ST                 run.stat    restartability  passed :  13615
WLOCK_EXCHANGE_ST            run.stat    restartability  passed :  13615
WVORTEX_ST                   run.stat    restartability  passed :  13615
WICE_AGRIF_ST                run.stat    restartability  passed :  13615

   !----repro----!   
WGYRE_PISCES_ST              run.stat    reproducibility passed :  13615
WGYRE_PISCES_ST              tracer.stat reproducibility passed :  13615
WORCA2_ICE_PISCES_ST         run.stat    reproducibility passed :  13615
WORCA2_ICE_PISCES_ST         tracer.stat reproducibility passed :  13615
WORCA2_OFF_PISCES_ST         tracer.stat reproducibility passed :  13615
WAMM12_ST                    run.stat    reproducibility passed :  13615
WORCA2_SAS_ICE_ST            run.stat    reproducibility passed :  13615
WORCA2_ICE_OBS_ST            run.stat    reproducibility passed :  13615
WAGRIF_DEMO_ST               run.stat    reproducibility passed :  13615
WSPITZ12_ST                  run.stat    reproducibility passed :  13615
WISOMIP_ST                   run.stat    reproducibility passed :  13615
WVORTEX_ST                   run.stat    reproducibility passed :  13615
WICE_AGRIF_ST                run.stat    reproducibility passed :  13615

   !----agrif check----!   
ORCA2 AGRIF vs ORCA2 NOAGRIF run.stat    unchanged  -    passed :  13615 13615

   !----result comparison check----!   

 No path for comparison specified. Result are not compare with any other revision. 
 To do it please fill NEMO_VALID_REF and NEMO_REV_REF in param.cfg.
Last edited 8 months ago by techene (previous) (diff)

comment:40 Changed 8 months ago by techene

[13627] most of sette tests passes except AGRIF_DEMO does not pass in ene (2nd run). In addition we loose consistancy with 13615 for ISOMIP and GYRE_PISCES i.e. ln_dynvor_ene = T : diff candidate vor_ene in dynvor flux and potential vorticity systematically feed zw[x/y/z] even if ln_sco=F.

Current code is : NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3 @ r13627  ( last change @ r13627 )

SETTE validation report generated for : 

       NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3 @ r13627 (last changed revision)

       on X64_IRENE arch file


!!---------------1st pass------------------!!

   !----restart----!   
WGYRE_PISCES_ST              run.stat    restartability  passed :  13627
WGYRE_PISCES_ST              tracer.stat restartability  passed :  13627
WORCA2_ICE_PISCES_ST         run.stat    restartability  passed :  13627
WORCA2_ICE_PISCES_ST         tracer.stat restartability  passed :  13627
WORCA2_OFF_PISCES_ST         tracer.stat restartability  passed :  13627
WAMM12_ST                    run.stat    restartability  passed :  13627
WORCA2_SAS_ICE_ST            run.stat    restartability  passed :  13627
WAGRIF_DEMO_ST               ocean.output               MISSING :  13627
WAGRIF_DEMO_ST               incomplete test
WSPITZ12_ST                  run.stat    restartability  passed :  13627
WISOMIP_ST                   run.stat    restartability  passed :  13627
WOVERFLOW_ST                 run.stat    restartability  passed :  13627
WLOCK_EXCHANGE_ST            run.stat    restartability  passed :  13627
WVORTEX_ST                   run.stat    restartability  passed :  13627
WICE_AGRIF_ST                run.stat    restartability  passed :  13627

   !----repro----!   
WGYRE_PISCES_ST              run.stat    reproducibility passed :  13627
WGYRE_PISCES_ST              tracer.stat reproducibility passed :  13627
WORCA2_ICE_PISCES_ST         run.stat    reproducibility passed :  13627
WORCA2_ICE_PISCES_ST         tracer.stat reproducibility passed :  13627
WORCA2_OFF_PISCES_ST         tracer.stat reproducibility passed :  13627
WAMM12_ST                    run.stat    reproducibility passed :  13627
WORCA2_SAS_ICE_ST            run.stat    reproducibility passed :  13627
WORCA2_ICE_OBS_ST            run.stat    reproducibility passed :  13627
WAGRIF_DEMO_ST               ocean.output               MISSING :  13627
WAGRIF_DEMO_ST               incomplete test
WSPITZ12_ST                  run.stat    reproducibility passed :  13627
WISOMIP_ST                   run.stat    reproducibility passed :  13627
WVORTEX_ST                   run.stat    reproducibility passed :  13627
WICE_AGRIF_ST                run.stat    reproducibility passed :  13627

   !----agrif check----!   
ORCA2 AGRIF vs ORCA2 NOAGRIF run.stat    unchanged  -    passed :  13627 13627

   !----result comparison check----!   

check result differences between :
VALID directory : /ccc/work/cont003/gen7451/techenes/KERNEL-06_2/r13627/NEMO_VALIDATION at rev 13627
and
REFERENCE directory : /ccc/work/cont003/gen7451/techenes/KERNEL-06_2/r13615/NEMO_VALIDATION at rev 13615

WGYRE_PISCES_ST       run.stat    files are DIFFERENT (results are different after  2  time steps) 
WGYRE_PISCES_ST       tracer.stat files are DIFFERENT (results are different after   time steps)        
WORCA2_ICE_PISCES_ST  run.stat    files are identical  
WORCA2_ICE_PISCES_ST  tracer.stat files are identical  
WORCA2_OFF_PISCES_ST  tracer.stat files are identical  
WAMM12_ST             run.stat    files are identical  
WISOMIP_ST            run.stat    files are DIFFERENT (results are different after  2  time steps) 
WORCA2_SAS_ICE_ST     run.stat    files are identical  
WAGRIF_DEMO_ST        incomplete test
WSPITZ12_ST           run.stat    files are identical  
WISOMIP_ST            run.stat    files are DIFFERENT (results are different after  2  time steps) 
WVORTEX_ST            run.stat    files are identical  
WICE_AGRIF_ST         run.stat    files are identical  

Last edited 8 months ago by techene (previous) (diff)

comment:41 Changed 8 months ago by techene

In 13644:

#2385 come back to previous e3 weighting in ene and ens when qco not activated (SETTE pass)

comment:42 Changed 8 months ago by techene

  • Description modified (diff)

comment:43 Changed 8 months ago by techene

  • Description modified (diff)

comment:44 Changed 8 months ago by techene

  • Description modified (diff)

comment:45 Changed 8 months ago by techene

  • Description modified (diff)

comment:46 Changed 8 months ago by techene

  • Description modified (diff)

comment:47 Changed 8 months ago by techene

  • Description modified (diff)

comment:48 Changed 8 months ago by jchanut

In 13678:

#2385, qco with AGRIF

comment:49 Changed 8 months ago by jchanut

In 13680:

#2385, effectively add VORTEX ssh initialization and key_qco. Save first guess (prior update) r3x arrays: Restored correct value of surface w.

comment:50 Changed 8 months ago by jchanut

In 13683:

#2385, AGRIF. Duplicate now r3x in after r3x arrays at initialization (as done with std vvl)

comment:51 Changed 8 months ago by jchanut

In 13689:

#2385, Missing ssh initialization for vortex

comment:52 Changed 8 months ago by jchanut

In 13692:

#2385, revert to standard VORTEX cpp keys, i.e. remove "key_qco"

comment:53 Changed 8 months ago by jchanut

In 13693:

#2385, change r3x update with AGRIF: Avoid passing arguments to a subroutine while swapping grids

comment:54 Changed 8 months ago by techene

In 13698:

#2385 update qco names after agrif required changes

comment:55 Changed 8 months ago by techene

In 13706:

#2385 #2555 and #2527 shallow water test case now runs properly

comment:56 Changed 8 months ago by techene

In 13732:

#2385 clean dom_qco_zgr : Kaa is no longer needed as an argument

comment:57 Changed 8 months ago by techene

In 13734:

#2385 : cleaning comments and OFF/stpmlf

comment:58 Changed 8 months ago by techene

In 13735:

#2385 : cleaning comments

comment:59 Changed 8 months ago by techene

In 13736:

#2385 qco e3f bug correction : use a dedicated fe3mask instead of fmask which values are not 0 or 1

comment:60 Changed 8 months ago by techene

In 13737:

#2385 hf bug correction (only used by qco) : use a dedicated fe3mask instead of fmask which values are not 0 or 1

comment:61 Changed 8 months ago by techene

In 13740:

#2385 remove Kaa from arguments

comment:62 Changed 7 months ago by techene

In 13757:

#2385 initilise ssh separately to remove domqco.F90 duplicates

comment:63 Changed 7 months ago by techene

In 13761:

#2385 set ssh separately from istate variables to remove domqco.F90 duplicates

comment:64 Changed 7 months ago by techene

In 13762:

#2385 set ssh separately from istate variables to remove domqco.F90 duplicates

comment:65 Changed 7 months ago by techene

In 14018:

#2385 branch updated with trunk 13970

comment:66 Changed 7 months ago by techene

In 14023:

#2385 problem : branch updated with trunk 13986

comment:67 Changed 7 months ago by jchanut

In 14027:

Remove circular dependency between dynspg_ts and agrif_oce_inter, #2385p

comment:68 Changed 7 months ago by techene

In 14050:

#2385 branch updated with trunk 14033 sette test ok except ORCA2_ICE_OBS + changes the results

comment:69 Changed 7 months ago by techene

In 14051:

#2385 branch updated with trunk 14045 (pb in ORCA2_ICE_OBS to fix later)

comment:70 Changed 7 months ago by techene

In 14052:

#2385 branch updated with trunk 14051

comment:71 Changed 7 months ago by techene

In 14053:

#2385 added to the trunk

comment:72 Changed 7 months ago by techene

In 14118:

#2385 bug fixes for qco

comment:73 Changed 6 months ago by techene

In 14137:

#2385 : swe is now working (SWE/restart.F90 and SWE/stpctl.F90 moved as subroutines of OCE/IOM/restart.F90 and OCE/stpctl.F90)

comment:74 Changed 6 months ago by techene

In 14139:

#2385 SWE associated update in OCE

comment:75 Changed 6 months ago by techene

In 14141:

#2385 and #2480 : revise check compatibilities

comment:76 Changed 6 months ago by techene

In 14143:

#2385 add key_linssh equivalent to ln_linssh using domzr_substitute

comment:77 Changed 6 months ago by jchanut

In 14148:

#2385, qco and agrif TOP (missing substitutes)

comment:78 Changed 6 months ago by techene

In 14179:

#2385 restart with qco bug fix for euler 1st and RK3

comment:79 Changed 6 months ago by techene

In 14180:

#2385 correct F-point variables names

comment:80 Changed 6 months ago by techene

In 14183:

#2385 add key_linssh or key_qco using domzgr_substitute - only sette tested

comment:81 Changed 6 months ago by techene

In 14184:

#2385 add key_linssh or key_qco using domzgr_substitute - only sette tested

comment:82 Changed 6 months ago by techene

In 14204:

#2385 SWG bug fix

comment:83 Changed 6 months ago by techene

In 14205:

#2385 cosmetics and cleaning

comment:84 Changed 6 months ago by jchanut

In 14233:

#2385, prevent from overflow values with een scheme, nn_e3f_typ=1 and key_qco/key_linssh

comment:85 Changed 2 months ago by nemo

  • Milestone changed from 2020 WP to Unscheduled
Note: See TracTickets for help on using tickets.