Changes between Version 9 and Version 10 of 2021WP/KNL-01_Sibylle_RK3_stage1

Timestamp:

2021-03-01T19:28:48+01:00 (3 years ago)

Author:

techene

Comment:

--

2021WP/KNL-01_Sibylle_RK3_stage1

@@ -77 +77 @@
 === Implementation details
 
-''' Code preparation r14418 '''[[BR]]
-3D velocity can be a pointer
+''' Code preparation  '''[[BR]]
+r14418 Allow an advective velocity to be passed as an argument. [[BR]]
+3D velocity can be a pointer.
 {{{
 OCE
@@ -133 +134 @@
 }}}
 
-Results should be exactly the same as the ones from from the trunk. It was not the case for an OVERFLOW. The use of ln_wAimp=T changes ww at the truncature in diawri.F90, and that produces a small error. This has been corrected.
+Results should be exactly the same as the ones from from the trunk. It was not the case for an OVERFLOW. The use of ln_wAimp=T changes ww at the truncature in diawri.F90, and that produces a small error. This has been corrected.[[BR]]
+
+
+
+
+
+
+r14428 Allow vertical advection to be de-activated with an optionnal input argument : no_zad. [[BR]]
+
+3D velocity added as an input argument of advective routines passed through dyn_adv
+{{{
+OCE
+ |--DYN
+     |-- dynadv.F90
+         SUBROUTINE dyn_adv( kt, Kbb, Kmm, puu, pvv, Krhs, pau, pav, paw, no_zad )
+         ...
+         CALL dyn_adv_cen2( kt                , Kmm, puu, pvv, Krhs, pau, pav, paw, no_zad )   ! 2nd order centered scheme 
+         CALL dyn_adv_ubs ( kt           , Kbb, Kmm, puu, pvv, Krhs, pau, pav, paw, no_zad )   ! 3rd order UBS      scheme (UP3) 
+     |-- dynadv_cen2.F90
+         SUBROUTINE dyn_adv_cen2( kt, Kmm, puu, pvv, Krhs, pau, pav, paw, no_zad )  
+         ...       
+         IF( PRESENT( no_zad ) ) THEN  !==  No vertical advection  ==!   (except if linear free surface) 
+            IF( ln_linssh ) THEN                ! linear free surface: advection through the surface z=0 
+               DO_2D( 0, 0, 0, 0 ) 
+                  zzu = 0.5_wp * ( e1e2t(ji,jj) * zpt_w(ji,jj,1) + e1e2t(ji+1,jj) * zpt_w(ji+1,jj,1) ) * puu(ji,jj,1,Kmm) 
+                  zzv = 0.5_wp * ( e1e2t(ji,jj) * zpt_w(ji,jj,1) + e1e2t(ji,jj+1) * zpt_w(ji,jj+1,1) ) * pvv(ji,jj,1,Kmm) 
+                  puu(ji,jj,1,Krhs) = puu(ji,jj,1,Krhs) - zzu * r1_e1e2u(ji,jj)   & 
+                     &                                        / e3u(ji,jj,1,Kmm) 
+                  pvv(ji,jj,1,Krhs) = pvv(ji,jj,1,Krhs) - zzv * r1_e1e2v(ji,jj)   & 
+                     &                                        / e3v(ji,jj,1,Kmm) 
+               END_2D 
+            ENDIF 
+         ! 
+         ELSE                          !==  Vertical advection  ==! 
+            ...
+     |-- dynadv_ubs.F90
+         SUBROUTINE dyn_adv_ubs( kt, Kbb, Kmm, puu, pvv, Krhs, pau, pav, paw, no_zad ) 
+         ...
+         IF( PRESENT( no_zad ) ) THEN  !==  No vertical advection  ==!   (except if linear free surface) 
+            IF( ln_linssh ) THEN                ! linear free surface: advection through the surface z=0 
+               DO_2D( 0, 0, 0, 0 ) 
+                  zzu = 0.5_wp * ( e1e2t(ji,jj) * zpt_w(ji,jj,1) + e1e2t(ji+1,jj) * zpt_w(ji+1,jj,1) ) * puu(ji,jj,1,Kmm)
+                  zzv = 0.5_wp * ( e1e2t(ji,jj) * zpt_w(ji,jj,1) + e1e2t(ji,jj+1) * zpt_w(ji,jj+1,1) ) * pvv(ji,jj,1,Kmm) 
+                  puu(ji,jj,1,Krhs) = puu(ji,jj,1,Krhs) - zzu * r1_e1e2u(ji,jj)   & 
+                     &                                        / e3u(ji,jj,1,Kmm) 
+                  pvv(ji,jj,1,Krhs) = pvv(ji,jj,1,Krhs) - zzv * r1_e1e2v(ji,jj)   & 
+                     &                                        / e3v(ji,jj,1,Kmm) 
+               END_2D 
+            ENDIF 
+         ! 
+         ELSE                          !==  Vertical advection  ==! 
+}}}
+
+Gurvan added a loop optimisation for dynzad.F90
+{{{
+OCE
+ |--DYN
+     |-- dynzad.F90
+All the loops are now gather in a single one.  
+
+}}}
+
+
+''' Baroclinic mode '''
+
 === Documentation updates