Changeset 372

Timestamp:

2005-12-29T11:51:26+01:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_036 : CT : auto-tasking version of the time splitting & explicit surface pressure gradient

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -18 +18 @@
    USE dynspg_flt     ! surface pressure gradient     (dyn_spg_flt routine)
    USE dynspg_rl      ! surface pressure gradient     (dyn_spg_rl  routine)
-   USE dynspg_flt_jki ! surface pressure gradient  (dyn_spgflt_jki routine)
+   USE dynspg_exp_jki ! surface pressure gradient (dyn_spg_exp_jki routine)
+   USE dynspg_ts_jki  ! surface pressure gradient (dyn_spg_ts_jki  routine)
+   USE dynspg_flt_jki ! surface pressure gradient (dyn_spg_flt_jki routine)
    USE trdmod         ! ocean dynamics trends
    USE trdmod_oce     ! ocean variables trends
@@ -83 +85 @@
          IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' spg2 - Ua: ', mask1=umask, &
                &                    tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
+         CALL dyn_spg_exp_jki( kt )
+         IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' spg10- Ua: ', mask1=umask, &
+               &                    tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
+         CALL dyn_spg_ts_jki ( kt )
+         IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' spg12- Ua: ', mask1=umask, &
+               &                    tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
          CALL dyn_spg_flt_jki( kt, kindic )
-         IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' spg4 - Ua: ', mask1=umask, &
-               &                    tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
-      CASE ( 0 )                                       ! explicit
+         IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' spg13- Ua: ', mask1=umask, &
+               &                    tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
+      CASE (  0 )                                       ! explicit
          CALL dyn_spg_exp    ( kt )
-      CASE ( 1 )                                       ! time-splitting
+      CASE (  1 )                                       ! time-splitting
          CALL dyn_spg_ts     ( kt )
-      CASE ( 2 )                                       ! filtered
+      CASE (  2 )                                       ! filtered
          CALL dyn_spg_flt    ( kt, kindic )
-      CASE ( 3 )                                       ! rigid lid
+      CASE (  3 )                                       ! rigid lid
          CALL dyn_spg_rl     ( kt, kindic )
-      CASE ( 4 )                                       ! filtered with j-k-i loop
+
+      CASE ( 10 )                                       ! explicit with j-k-i loop
+         CALL dyn_spg_exp_jki( kt )
+      CASE ( 11 )                                       ! time-splitting with j-k-i loop
+         CALL dyn_spg_ts_jki ( kt )
+      CASE ( 12 )                                       ! filtered with j-k-i loop
          CALL dyn_spg_flt_jki( kt, kindic )
       END SELECT
@@ -101 +114 @@
       IF( l_trddyn )   THEN
          SELECT CASE ( nspg )
-         CASE ( 0, 1, 3 )
+         CASE ( 0, 1, 3, 10, 11 )
             ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)
             ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
-         CASE( 2 )
+         CASE( 2, 12 )
             z2dt = 2. * rdt
             IF( neuler == 0 .AND. kt == nit000 ) z2dt = rdt
@@ -166 +179 @@
       IF( lk_dynspg_flt)   nspg =  2
       IF( lk_dynspg_rl )   nspg =  3
-      IF( lk_dynspg_flt .AND. lk_jki )   nspg =  4
+      IF( lk_jki       )   nspg =  nspg + 10
+      IF( nspg == 13   )   nspg =  3
+
+      IF( lk_esopa     )   nspg = -1
 
      IF(lwp) THEN
          WRITE(numout,*)
-         IF( nspg == -1 )   WRITE(numout,*) '              ESOPA test All scheme used except rigid-lid'
-         IF( nspg ==  0 )   WRITE(numout,*) '              explicit free surface'
-         IF( nspg ==  1 )   WRITE(numout,*) '              free surface with time splitting scheme'
-         IF( nspg ==  2 )   WRITE(numout,*) '              filtered free surface'
-         IF( nspg ==  3 )   WRITE(numout,*) '              rigid-lid'
-         IF( nspg ==  4 )   WRITE(numout,*) '              filtered free surface with j-k-i loop'
+         IF( nspg == -1 )   WRITE(numout,*) '     ESOPA test All scheme used except rigid-lid'
+         IF( nspg ==  0 )   WRITE(numout,*) '     explicit free surface'
+         IF( nspg ==  1 )   WRITE(numout,*) '     free surface with time splitting scheme'
+         IF( nspg ==  2 )   WRITE(numout,*) '     filtered free surface'
+         IF( nspg ==  3 )   WRITE(numout,*) '     rigid-lid'
+         IF( nspg == 10 )   WRITE(numout,*) '     explicit free surface with j-k-i loop'
+         IF( nspg == 11 )   WRITE(numout,*) '     time splitting free surface with j-k-i loop'
+         IF( nspg == 12 )   WRITE(numout,*) '     filtered free surface with j-k-i loop'
       ENDIF