New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN – NEMO

Ignore:
Timestamp:
2020-03-13T17:33:02+01:00 (4 years ago)
Author:
charris
Message:

Changes from GO6 package branch (GMED ticket 450):

svn merge -r 11035:11101 svn+ssh://charris@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package

Location:
branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90

    r6487 r12555  
    104104         IF(lwp) WRITE(numout,*) 'div_cur : horizontal velocity divergence and relative vorticity' 
    105105         IF(lwp) WRITE(numout,*) '~~~~~~~   NOT optimal for auto-tasking case' 
     106         IF(lwp .AND. lflush) CALL flush(numout) 
    106107      ENDIF 
    107108 
     
    285286         IF(lwp) WRITE(numout,*) 'div_cur : horizontal velocity divergence and' 
    286287         IF(lwp) WRITE(numout,*) '~~~~~~~   relative vorticity' 
     288         IF(lwp .AND. lflush) CALL flush(numout) 
    287289      ENDIF 
    288290 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90

    r6486 r12555  
    108108      READ  ( numnam_cfg, namdyn_adv, IOSTAT = ios, ERR = 902 ) 
    109109902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_adv in configuration namelist', lwp ) 
    110       IF(lwm) WRITE ( numond, namdyn_adv ) 
     110      IF(lwm .AND. nprint > 2) WRITE ( numond, namdyn_adv ) 
    111111 
    112112      IF(lwp) THEN                    ! Namelist print 
     
    152152         IF( nadv ==  3 )   WRITE(numout,*) '         flux form   : UBS       scheme is used' 
    153153         IF( nadv == -1 )   WRITE(numout,*) '         esopa test: use all advection formulation' 
     154         IF(lflush) CALL flush(numout) 
    154155      ENDIF 
    155156      ! 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90

    r6486 r12555  
    6666         WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection' 
    6767         WRITE(numout,*) '~~~~~~~~~~~~' 
     68         IF(lflush) CALL flush(numout) 
    6869      ENDIF 
    6970      ! 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90

    r6486 r12555  
    9090         IF(lwp) WRITE(numout,*) 'dyn_adv_ubs : UBS flux form momentum advection' 
    9191         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
     92         IF(lwp .AND. lflush) CALL flush(numout) 
    9293      ENDIF 
    9394      ! 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

    r8447 r12555  
    136136         IF(lwp) THEN  
    137137         WRITE(numout,*) " ! restore original density" 
     138         IF(lflush) CALL flush(numout) 
    138139         ENDIF 
    139140         rhd(:,:,:) = z_rhd_st(:,:,:)     ! restore original density 
     
    176177      READ  ( numnam_cfg, namdyn_hpg, IOSTAT = ios, ERR = 902 ) 
    177178902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_hpg in configuration namelist', lwp ) 
    178       IF(lwm) WRITE ( numond, namdyn_hpg ) 
     179      IF(lwm .AND. nprint > 2) WRITE ( numond, namdyn_hpg ) 
    179180      ! 
    180181      IF(lwp) THEN                   ! Control print 
     
    190191         WRITE(numout,*) '      s-coord. (Pressure Jacobian: Cubic polynomial)    ln_hpg_prj    = ', ln_hpg_prj 
    191192         WRITE(numout,*) '      time stepping: centered (F) or semi-implicit (T)  ln_dynhpg_imp = ', ln_dynhpg_imp 
     193         IF(lflush) CALL flush(numout) 
    192194      ENDIF 
    193195      ! 
     
    260262         IF(lwp) WRITE(numout,*) 'dyn:hpg_zco : hydrostatic pressure gradient trend' 
    261263         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   z-coordinate case ' 
     264         IF(lwp .AND. lflush) CALL flush(numout) 
    262265      ENDIF 
    263266 
     
    325328         IF(lwp) WRITE(numout,*) 'dyn:hpg_zps : hydrostatic pressure gradient trend' 
    326329         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   z-coordinate with partial steps - vector optimization' 
     330         IF(lwp .AND. lflush) CALL flush(numout) 
    327331      ENDIF 
    328332 
     
    423427         IF(lwp) WRITE(numout,*) 'dyn:hpg_sco : hydrostatic pressure gradient trend' 
    424428         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, OPA original scheme used' 
     429         IF(lwp .AND. lflush) CALL flush(numout) 
    425430      ENDIF 
    426431 
     
    514519         IF(lwp) WRITE(numout,*) 'dyn:hpg_isf : hydrostatic pressure gradient trend for ice shelf' 
    515520         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, OPA original scheme used' 
     521         IF(lwp .AND. lflush) CALL flush(numout) 
    516522      ENDIF 
    517523 
     
    768774         IF(lwp) WRITE(numout,*) 'dyn:hpg_djc : hydrostatic pressure gradient trend' 
    769775         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, density Jacobian with cubic polynomial scheme' 
     776         IF(lwp .AND. lflush) CALL flush(numout) 
    770777      ENDIF 
    771778 
     
    10011008         IF(lwp) WRITE(numout,*) 'dyn:hpg_prj : hydrostatic pressure gradient trend' 
    10021009         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, cubic spline pressure Jacobian' 
     1010         IF(lwp .AND. lflush) CALL flush(numout) 
    10031011      ENDIF 
    10041012 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

    r6486 r12555  
    8888         IF(lwp) WRITE(numout,*) 'dyn_keg : kinetic energy gradient trend, scheme number=', kscheme 
    8989         IF(lwp) WRITE(numout,*) '~~~~~~~' 
     90         IF(lflush) CALL flush(numout) 
    9091      ENDIF 
    9192 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

    r6486 r12555  
    100100            IF(lwp) WRITE(numout,*) 'dyn_ldf : no lateral diffusion on momentum setup' 
    101101            IF(lwp) WRITE(numout,*) '~~~~~~~ ' 
     102            IF(lflush) CALL flush(numout) 
    102103         ENDIF 
    103104      END SELECT 
     
    139140         WRITE(numout,*) '          horizontal (geopotential)   ln_dynldf_hor   = ', ln_dynldf_hor 
    140141         WRITE(numout,*) '          iso-neutral                 ln_dynldf_iso   = ', ln_dynldf_iso 
     142         IF(lflush) CALL flush(numout) 
    141143      ENDIF 
    142144 
     
    229231         IF( nldf ==  4 )   WRITE(numout,*) '              laplacian and bilaplacian operators' 
    230232         IF( nldf ==  5 )   WRITE(numout,*) '              rotated laplacian and bilaplacian operators' 
     233         IF(lflush) CALL flush(numout) 
    231234      ENDIF 
    232235      ! 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

    r6486 r12555  
    9090         WRITE(numout,*) 'dyn_ldf_bilap : iso-level bilaplacian operator' 
    9191         WRITE(numout,*) '~~~~~~~~~~~~~' 
     92         IF(lwp .AND. lflush) CALL flush(numout) 
    9293      ENDIF 
    9394 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

    r8280 r12555  
    9898         IF(lwp) WRITE(numout,*) 'dyn_ldf_bilapg : horizontal biharmonic operator in s-coordinate' 
    9999         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~' 
     100         IF(lwp .AND. lflush) CALL flush(numout) 
    100101         !                                      ! allocate dyn_ldf_bilapg arrays 
    101102         IF( dyn_ldf_bilapg_alloc() /= 0 )   CALL ctl_stop('STOP', 'dyn_ldf_bilapg: failed to allocate arrays') 
     
    123124            IF(lwp) WRITE(numout,*) ' max slop: u', SQRT( MAXVAL(uslp*uslp)), ' v ', SQRT(MAXVAL(vslp)),  & 
    124125               &                             ' wi', sqrt(MAXVAL(wslpi))     , ' wj', sqrt(MAXVAL(wslpj)) 
     126            IF(lwp .AND. lflush) CALL flush(numout) 
    125127         endif 
    126128!!end 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90

    r6486 r12555  
    127127         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate horizontal diffusive operator' 
    128128         !                                      ! allocate dyn_ldf_bilap arrays 
     129         IF(lflush) CALL flush(numout) 
    129130         IF( dyn_ldf_iso_alloc() /= 0 )   CALL ctl_stop('STOP', 'dyn_ldf_iso: failed to allocate arrays') 
    130131      ENDIF 
     
    151152            IF(lwp) WRITE(numout,*) ' max slop: u', SQRT( MAXVAL(uslp*uslp)), ' v ', SQRT(MAXVAL(vslp)),  & 
    152153               &                             ' wi', sqrt(MAXVAL(wslpi))     , ' wj', sqrt(MAXVAL(wslpj)) 
     154            IF(lwp .AND. lflush) CALL flush(numout) 
    153155         endif 
    154156!!end 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap.F90

    r6486 r12555  
    7070         IF(lwp) WRITE(numout,*) 'dyn_ldf : iso-level harmonic (laplacian) operator' 
    7171         IF(lwp) WRITE(numout,*) '~~~~~~~ ' 
     72         IF(lflush) CALL flush(numout) 
    7273      ENDIF 
    7374      !                                                ! =============== 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90

    r6486 r12555  
    126126      READ  ( numnam_cfg, namdyn_nept, IOSTAT = ios, ERR = 902 ) 
    127127902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_nept in configuration namelist', lwp ) 
    128       IF(lwm) WRITE ( numond, namdyn_nept ) 
     128      IF(lwm .AND. nprint > 2) WRITE ( numond, namdyn_nept ) 
    129129 
    130130      IF(lwp) THEN                      ! Control print 
     
    145145            WRITE(numout,*) 
    146146         ENDIF 
     147         IF(lflush) CALL flush(numout) 
    147148      ENDIF 
    148149      ! 
     
    304305      CALL lbc_lnk( zunep, 'U', -1.0_wp ) 
    305306      CALL lbc_lnk( zvnep, 'V', -1.0_wp ) 
    306       WRITE(numout,*) '      zunep: min, max       = ', unemin,unemax 
    307       WRITE(numout,*) '      zvnep: min, max       = ', vnemin,vnemax 
    308       WRITE(numout,*) 
     307      IF(lwp .AND. nprint > 0) THEN 
     308         WRITE(numout,*) '      zunep: min, max       = ', unemin,unemax 
     309         WRITE(numout,*) '      zvnep: min, max       = ', vnemin,vnemax 
     310         WRITE(numout,*) 
     311      ENDIF 
    309312 
    310313      !!  Compute, once and for all, the horizontal divergence (zhdivnep) 
     
    328331         END DO 
    329332      END DO 
    330       WRITE(numout,*) '   zhdivnep: min, max       = ', zhdivmin,zhdivmax 
    331       WRITE(numout,*) '   zmrotnep: min, max       = ', zmrotmin,zmrotmax 
    332       WRITE(numout,*) 
     333 
     334      IF(lwp .AND. nprint > 0) THEN 
     335         WRITE(numout,*) '   zhdivnep: min, max       = ', zhdivmin,zhdivmax 
     336         WRITE(numout,*) '   zmrotnep: min, max       = ', zmrotmin,zmrotmax 
     337         WRITE(numout,*) 
     338         IF(lflush) CALL flush(numout) 
     339      ENDIF 
    333340 
    334341!!    Deallocate temporary workspace arrays, which are all local to 
     
    384391      IF(lwp) WRITE(numout,*) 'horizontal velocity divergence and' 
    385392      IF(lwp) WRITE(numout,*) 'relative vorticity of Neptune flow' 
     393      IF(lwp .AND. lflush) CALL flush(numout) 
    386394#if defined key_noslip_accurate 
    387395   !!---------------------------------------------------------------------- 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

    r6487 r12555  
    119119         IF(lwp) WRITE(numout,*) 'dyn_nxt : time stepping' 
    120120         IF(lwp) WRITE(numout,*) '~~~~~~~' 
     121         IF(lflush) CALL flush(numout) 
    121122      ENDIF 
    122123 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

    r6486 r12555  
    231231         WRITE(numout,*) '     Free surface with time splitting       lk_dynspg_ts  = ', lk_dynspg_ts 
    232232         WRITE(numout,*) '     Filtered free surface cst volume       lk_dynspg_flt = ', lk_dynspg_flt 
     233         IF(lflush) CALL flush(numout) 
    233234      ENDIF 
    234235 
     
    266267         IF( nspg ==  1 )   WRITE(numout,*) '     free surface with time splitting scheme' 
    267268         IF( nspg ==  2 )   WRITE(numout,*) '     filtered free surface' 
     269         IF(lflush) CALL flush(numout) 
    268270      ENDIF 
    269271 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90

    r9583 r12555  
    7575         ! 
    7676         IF( lk_vvl .AND. lwp ) WRITE(numout,*) '              lk_vvl=T : spg is included in dynhpg' 
     77         IF(lflush) CALL flush(numout) 
    7778      ENDIF 
    7879 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

    r9321 r12555  
    120120         IF(lwp) WRITE(numout,*) 'dyn_spg_flt : surface pressure gradient trend' 
    121121         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   (free surface constant volume case)' 
     122         IF(lwp .AND. lflush) CALL flush(numout) 
    122123        
    123124         ! set to zero free surface specific arrays 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r9321 r12555  
    195195         IF(lwp) WRITE(numout,*) '~~~~~~~~~~   free surface with time splitting' 
    196196         IF(lwp) WRITE(numout,*) 
     197         IF(lflush) CALL flush(numout) 
    197198         ! 
    198199         IF (neuler==0) ll_init=.TRUE. 
     
    10881089      READ  ( numnam_cfg, namsplit, IOSTAT = ios, ERR = 902 ) 
    10891090902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsplit in configuration namelist', lwp ) 
    1090       IF(lwm) WRITE ( numond, namsplit ) 
     1091      IF(lwm .AND. nprint > 2) WRITE ( numond, namsplit ) 
    10911092      ! 
    10921093      !         ! Max courant number for ext. grav. waves 
     
    11611162      IF(lwp) WRITE(numout,*) '     Barotropic time step [s] is :', rdtbt 
    11621163      IF(lwp) WRITE(numout,*) '     Maximum Courant number is   :', zcmax 
     1164      IF(lwp .AND. lflush) CALL flush(numout) 
    11631165      ! 
    11641166      IF ((.NOT.ln_bt_av).AND.(.NOT.ln_bt_fw)) THEN 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

    r8280 r12555  
    234234         IF(lwp) WRITE(numout,*) 'dyn:vor_ene : vorticity term: energy conserving scheme' 
    235235         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
     236         IF(lflush) CALL flush(numout) 
    236237      ENDIF 
    237238 
     
    346347         IF(lwp) WRITE(numout,*) 'dyn:vor_mix : vorticity term: mixed energy/enstrophy conserving scheme' 
    347348         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
     349         IF(lflush) CALL flush(numout) 
    348350      ENDIF 
    349351 
     
    463465         IF(lwp) WRITE(numout,*) 'dyn:vor_ens : vorticity term: enstrophy conserving scheme' 
    464466         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
     467         IF(lflush) CALL flush(numout) 
    465468      ENDIF 
    466469 
     
    587590         IF(lwp) WRITE(numout,*) 'dyn:vor_een : vorticity term: energy and enstrophy conserving scheme' 
    588591         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
     592         IF(lflush) CALL flush(numout) 
    589593#if ! defined key_vvl 
    590594         IF( .NOT.ALLOCATED(ze3f) ) THEN 
     
    731735      READ  ( numnam_cfg, namdyn_vor, IOSTAT = ios, ERR = 902 ) 
    732736902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_vor in configuration namelist', lwp ) 
    733       IF(lwm) WRITE ( numond, namdyn_vor ) 
     737      IF(lwm .AND. nprint >2) WRITE ( numond, namdyn_vor ) 
    734738 
    735739      IF(lwp) THEN                    ! Namelist print 
     
    743747         WRITE(numout,*) '           enstrophy and energy conserving scheme     ln_dynvor_een = ', ln_dynvor_een 
    744748         WRITE(numout,*) '           enstrophy and energy conserving scheme (old) ln_dynvor_een_old= ', ln_dynvor_een_old 
     749         IF(lflush) CALL flush(numout) 
    745750      ENDIF 
    746751 
     
    798803         IF( nvor ==  3 )   WRITE(numout,*) '         vorticity scheme : energy and enstrophy conserving scheme' 
    799804         IF( nvor == -1 )   WRITE(numout,*) '         esopa test: use all lateral physics options' 
     805         IF(lflush) CALL flush(numout) 
    800806      ENDIF 
    801807      ! 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

    r6486 r12555  
    7474         IF(lwp)WRITE(numout,*) 
    7575         IF(lwp)WRITE(numout,*) 'dyn_zad : arakawa advection scheme' 
     76         IF(lwp .AND. lflush) CALL flush(numout) 
    7677      ENDIF 
    7778 
     
    188189         IF(lwp)WRITE(numout,*) 
    189190         IF(lwp)WRITE(numout,*) 'dyn_zad_zts : arakawa advection scheme with sub-timesteps' 
     191         IF(lwp .AND. lflush) CALL flush(numout) 
    190192      ENDIF 
    191193 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90

    r6486 r12555  
    136136         IF( nzdf ==  0 )   WRITE(numout,*) '              Explicit time-splitting scheme' 
    137137         IF( nzdf ==  1 )   WRITE(numout,*) '              Implicit (euler backward) scheme' 
     138         IF(lflush) CALL flush(numout) 
    138139      ENDIF 
    139140      ! 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90

    r6486 r12555  
    7373         WRITE(numout,*) 'dyn_zdf_exp : vertical momentum diffusion - explicit operator' 
    7474         WRITE(numout,*) '~~~~~~~~~~~ ' 
     75         IF(lflush) CALL flush(numout) 
    7576      ENDIF 
    7677 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

    r6795 r12555  
    8181         IF(lwp) WRITE(numout,*) 'dyn_zdf_imp : vertical momentum diffusion implicit operator' 
    8282         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ ' 
     83         IF(lwp .AND. lflush) CALL flush(numout) 
    8384         ! 
    8485         IF( lk_vvl ) THEN   ;    r_vvl = 1._wp       ! Variable volume indicator 
  • branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

    r8400 r12555  
    8787         IF(lwp) WRITE(numout,*) 'ssh_nxt : after sea surface height' 
    8888         IF(lwp) WRITE(numout,*) '~~~~~~~ ' 
     89         IF(lwp .AND. lflush) CALL flush(numout) 
    8990         ! 
    9091      ENDIF 
     
    184185         IF(lwp) WRITE(numout,*) 'wzv : now vertical velocity ' 
    185186         IF(lwp) WRITE(numout,*) '~~~~~ ' 
     187         IF(lwp .AND. lflush) CALL flush(numout) 
    186188         ! 
    187189         wn(:,:,jpk) = 0._wp                  ! bottom boundary condition: w=0 (set once for all) 
     
    265267         IF(lwp) WRITE(numout,*) 'ssh_swp : Asselin time filter and swap of sea surface height' 
    266268         IF(lwp) WRITE(numout,*) '~~~~~~~ ' 
     269         IF(lwp .AND. lflush) CALL flush(numout) 
    267270      ENDIF 
    268271 
Note: See TracChangeset for help on using the changeset viewer.