Changeset 13189 for NEMO/branches/2020/dev_r12472_ASINTER-05_Masson_CurrentFeedback/cfgs/C1D_PAPA

Timestamp:

2020-07-01T11:27:25+02:00 (4 years ago)

Author:

smasson

Message:

dev_r12472_ASINTER-05_Masson_CurrentFeedback: update with trunk@13136, see #2156

Location:

NEMO/branches/2020/dev_r12472_ASINTER-05_Masson_CurrentFeedback

Files:

• . (modified) (1 prop)
• cfgs/C1D_PAPA/EXPREF/file_def_nemo-oce.xml (modified) (1 diff)
• cfgs/C1D_PAPA/EXPREF/namelist_cfg (modified) (2 diffs)
• cfgs/C1D_PAPA/MY_SRC/usrdef_zgr.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12472_ASINTER-05_Masson_CurrentFeedback

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette

NEMO/branches/2020/dev_r12472_ASINTER-05_Masson_CurrentFeedback/cfgs/C1D_PAPA/EXPREF/file_def_nemo-oce.xml

@@ -53 +53 @@
         <file id="file4" name_suffix="_grid_W" description="ocean W grid variables" >
           <field field_ref="e3w" />
-          <field field_ref="woce"         name="wo"       />
           <field field_ref="avt"          name="difvho"   />
         </file>

NEMO/branches/2020/dev_r12472_ASINTER-05_Masson_CurrentFeedback/cfgs/C1D_PAPA/EXPREF/namelist_cfg

@@ -49 +49 @@
 &namdom        !   time and space domain
 !-----------------------------------------------------------------------
+   ln_linssh   = .true.   !  =T  linear free surface  ==>>  model level are fixed in time
+   !
    rn_Dt      =  360.     !  time step for the dynamics and tracer
 /
@@ -358 +360 @@
 &namdyn_spg    !   surface pressure gradient                            (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_dynspg_ts   = .true.   ! split-explicit free surface
-      ln_bt_fw      = .false.     ! Forward integration of barotropic Eqs.
-      ln_bt_av      = .true.     ! Time filtering of barotropic variables
 /
 !-----------------------------------------------------------------------

NEMO/branches/2020/dev_r12472_ASINTER-05_Masson_CurrentFeedback/cfgs/C1D_PAPA/MY_SRC/usrdef_zgr.F90

@@ -30 +30 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -157 +159 @@
          pe3vw(:,:,jk) = pe3w_1d (jk)
       END DO
-      DO jj = 1, jpj                      ! bottom scale factors and depth at T- and W-points
-         DO ji = 1, jpi
-            ik = k_bot(ji,jj)
-            pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) )
-            pe3t (ji,jj,ik  ) = pdepw(ji,jj,ik+1) - pdepw(ji,jj,ik)
-            pe3t (ji,jj,ik+1) = pe3t (ji,jj,ik  ) 
-            !
-            pdept(ji,jj,ik  ) = pdepw(ji,jj,ik  ) + pe3t (ji,jj,ik  ) * 0.5_wp
-            pdept(ji,jj,ik+1) = pdepw(ji,jj,ik+1) + pe3t (ji,jj,ik+1) * 0.5_wp
-            pe3w (ji,jj,ik+1) = pdept(ji,jj,ik+1) - pdept(ji,jj,ik)              ! = pe3t (ji,jj,ik  )
-         END DO
-      END DO         
+      ! bottom scale factors and depth at T- and W-points
+      DO_2D_11_11
+         ik = k_bot(ji,jj)
+         pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) )
+         pe3t (ji,jj,ik  ) = pdepw(ji,jj,ik+1) - pdepw(ji,jj,ik)
+         pe3t (ji,jj,ik+1) = pe3t (ji,jj,ik  ) 
+         !
+         pdept(ji,jj,ik  ) = pdepw(ji,jj,ik  ) + pe3t (ji,jj,ik  ) * 0.5_wp
+         pdept(ji,jj,ik+1) = pdepw(ji,jj,ik+1) + pe3t (ji,jj,ik+1) * 0.5_wp
+         pe3w (ji,jj,ik+1) = pdept(ji,jj,ik+1) - pdept(ji,jj,ik)              ! = pe3t (ji,jj,ik  )
+      END_2D        
       !                                   ! bottom scale factors and depth at  U-, V-, UW and VW-points
       !                                   ! usually Computed as the minimum of neighbooring scale factors

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette