Changeset 14224 for NEMO/trunk/tests

Timestamp:

2020-12-19T15:49:56+01:00 (4 years ago)

Author:

smasson

Message:

trunk: minor bugfix in CANAL and with ln_dyn_trd

Location:

NEMO/trunk/tests/CANAL

Files:

• EXPREF/file_def_nemo-oce.xml (modified) (1 diff)
• EXPREF/namelist_cfg (modified) (1 diff)
• MY_SRC/usrdef_istate.F90 (modified) (2 diffs)

NEMO/trunk/tests/CANAL/EXPREF/file_def_nemo-oce.xml

@@ -16 +16 @@
      <field field_ref="ssh"  />
      <field field_ref="socegrad"  />
-     <field field_ref="eken_int"  />
+     <field field_ref="ke_int"  />
      <field field_ref="relvor"  />
      <field field_ref="potvor"  />

NEMO/trunk/tests/CANAL/EXPREF/namelist_cfg

@@ -231 +231 @@
 &namdyn_vor    !   Vorticity / Coriolis scheme                          (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_dynvor_ene = .false.  !  energy conserving scheme
-   ln_dynvor_ens = .false.  !  enstrophy conserving scheme
-   ln_dynvor_mix = .false.  !  mixed scheme
-   ln_dynvor_een = .false.  !  energy & enstrophy scheme
-r_enT = .false.  !  energy conserving scheme (T-point)
-   ln_dynvor_eeT = .true.   !  energy conserving scheme (een using e3t)
-      nn_e3f_typ = 0             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)
+   ln_dynvor_ene = .false. !  energy    conserving scheme
+   ln_dynvor_ens = .false. !  enstrophy conserving scheme
+   ln_dynvor_mix = .false. !  mixed scheme
+   ln_dynvor_enT = .false. !  energy conserving scheme (T-point)
+   ln_dynvor_eeT =  .true. !  energy conserving scheme (een using e3t)
+   ln_dynvor_een = .false. !  energy & enstrophy scheme
+   !
+   nn_e3f_typ = 0          !  type of e3f (EEN, ENE, ENS, MIX only)  =0  e3f = mi(mj(e3t))/4
+   !                       !                                         =1  e3f = mi(mj(e3t))/mi(mj( tmask))
 /
 !-----------------------------------------------------------------------

NEMO/trunk/tests/CANAL/MY_SRC/usrdef_istate.F90

@@ -76 +76 @@
       CASE(-1)    ! stratif at rest
 
-         ! sea level:
-         pssh(:,:) = 0.
          ! temperature:
          pts(:,:,1,jp_tem) = 25. !!30._wp
@@ -146 +144 @@
          ! salinity:  
          DO jk=1, jpkm1
-            pts(:,:,jk,jp_sal) = pssh(:,:)
+            pts(:,:,jk,jp_sal) = gphit(:,:)
          END DO
          ! velocities: