Changeset 14915 for NEMO/branches

Timestamp:

2021-05-27T17:21:14+02:00 (3 years ago)

Author:

gsamson

Message:

minimum set of bugfixes and changes to get C1D_PAPA compiling and running with MPI; ticket #2680

Location:

NEMO/branches/2021/ticket2680_C1D_PAPA

Files:

• cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90 (modified) (2 diffs)
• src/OCE/C1D/dtauvd.F90 (modified) (1 diff)
• src/OCE/C1D/step_c1d.F90 (modified) (4 diffs)
• src/OCE/LBC/mppini.F90 (modified) (1 diff)

NEMO/branches/2021/ticket2680_C1D_PAPA/cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90

@@ -71 +71 @@
       kk_cfg = 0
 
-      ! Global Domain size:  C1D domain is 3 x 3 grid-points x 75 or vertical levels
-      kpi = 3
-      kpj = 3
+      ! Global Domain size:  C1D domain is 1 x 1 grid-points x 75 or vertical levels
+      kpi = 1
+      kpj = 1
       kpk = 75 
       !                             ! Set the lateral boundary condition of the global domain
-      ldIperio =  .TRUE.   ;   ldJperio = .TRUE.   ! C1D configuration : 3x3 basin with cyclic Est-West and Norht-South condition
+      ldIperio =  .TRUE.   ;   ldJperio = .TRUE.   ! C1D configuration : 1x1 basin with cyclic Est-West and Norht-South condition
       ldNFold  = .FALSE.   ;   cdNFtype = '-'
       !
@@ -89 +89 @@
          WRITE(numout,*) '         z-partial-step coordinate flag        ln_zps = ', ln_zps
          WRITE(numout,*) '         s-coordinate flag                     ln_sco = ', ln_sco
-         WRITE(numout,*) '      C1D domain = 3 x 3 x75 grid-points                '
+         WRITE(numout,*) '      C1D domain = 1 x 1 x 75 grid-points                '
          WRITE(numout,*) '         resulting global domain size :        jpiglo = ', kpi
          WRITE(numout,*) '                                               jpjglo = ', kpj

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/C1D/dtauvd.F90

@@ -26 +26 @@
    PUBLIC   dta_uvd        ! called by istate.F90 and dyndmp.90
 
-   LOGICAL , PUBLIC ::   ln_uvd_init     ! Flag to initialise with U & V current data
-   LOGICAL , PUBLIC ::   ln_uvd_dyndmp   ! Flag for Newtonian damping toward U & V current data
+   LOGICAL , PUBLIC ::   ln_uvd_init   = .FALSE.   ! Flag to initialise with U & V current data
+   LOGICAL , PUBLIC ::   ln_uvd_dyndmp = .FALSE.   ! Flag for Newtonian damping toward U & V current data
 
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_uvd   ! structure for input U & V current (file information and data)

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/C1D/step_c1d.F90

@@ -15 +15 @@
    !!----------------------------------------------------------------------
    USE step_oce        ! time stepping definition modules
-   USE step, ONLY : Nbb, Nnn, Naa, Nrhs ! time level indices
+   USE stpmlf, ONLY : Nbb, Nnn, Naa, Nrhs ! time level indices
 #if defined key_top
    USE trcstp          ! passive tracer time-stepping      (trc_stp routine)
 #endif
    USE dyncor_c1d      ! Coriolis term (c1d case)         (dyn_cor_1d     )
-   USE dynatf          ! time filtering                   (dyn_atf routine)
+   USE dynatf_qco      ! time filtering                   (dyn_atf routine)
    USE dyndmp          ! U & V momentum damping           (dyn_dmp routine)
    USE restart         ! restart
@@ -76 +76 @@
       !  VERTICAL PHYSICS
                          CALL zdf_phy( kstp, Nbb, Nnn, Nrhs  )    ! vertical physics update (bfr, avt, avs, avm + MLD)
-
+#if ! defined key_linssh
       IF(.NOT.ln_linssh )   CALL ssh_nxt       ( kstp, Nbb, Nnn, ssh, Naa )  ! after ssh (includes call to div_hor)
       IF(.NOT.ln_linssh )   CALL dom_vvl_sf_nxt( kstp, Nbb, Nnn,      Naa )  ! after vertical scale factors
 
       IF(.NOT.ln_linssh )   CALL wzv           ( kstp, Nbb, Nnn, Naa, ww )  ! now cross-level velocity
+#endif
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! diagnostics and outputs
@@ -121 +122 @@
       IF( ln_zdfosm  )  CALL dyn_osm    ( kstp,      Nnn      , uu, vv, Nrhs )  ! OSMOSIS non-local velocity fluxes
                         CALL dyn_zdf    ( kstp, Nbb, Nnn, Nrhs, uu, vv, Naa  )  ! vertical diffusion
-                        CALL dyn_atf    ( kstp, Nbb, Nnn, Naa , uu, vv, e3t, e3u, e3v )  ! time filtering of "now" fields
-      IF(.NOT.ln_linssh)CALL ssh_atf    ( kstp, Nbb, Nnn, Naa , ssh )                    ! time filtering of "now" sea surface height
+                        CALL dyn_atf_qco( kstp, Nbb, Nnn, Naa , uu, vv )        ! time filtering of "now" fields
+      IF(.NOT.ln_linssh)CALL ssh_atf    ( kstp, Nbb, Nnn, Naa , ssh )           ! time filtering of "now" sea surface height
       IF( kstp == nit000 .AND. ln_linssh) THEN
          ssh(:,:,Naa) = ssh(:,:,Nnn)  ! init ssh after in ln_linssh case
@@ -133 +134 @@
       Naa = Nrhs
       !
+#if ! defined key_linssh
       IF(.NOT.ln_linssh)CALL dom_vvl_sf_update( kstp, Nbb, Nnn, Naa )                    ! update of vertical scale factors
-
+#endif
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Control and restarts

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/LBC/mppini.F90

@@ -536 +536 @@
       END DO
       !
-      CALL init_excl_landpt      ! exclude exchanges which contain only land points
+      IF( jpnij > 1) CALL init_excl_landpt      ! exclude exchanges which contain only land points
       !
       ! Save processor layout changes in ascii file