Changeset 6030


Ignore:
Timestamp:
2015-12-10T17:12:15+01:00 (5 years ago)
Author:
acc
Message:

Branch dev_r5836_NOC3_vvl_by_default. Bugfixes and updates towards successful SETTE testing. Still does not pass tests but making some progress

Location:
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg

    r6004 r6030  
    9292   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked 
    9393   ln_apr_dyn  = .false.    !  Patm gradient added in ocean & ice Eqs.   (T => fill namsbc_apr ) 
     94   ln_traqsr   = .false.   !  Light penetration (T) or not (F) 
    9495 
    9596/ 
     
    129130&namtra_qsr    !   penetrative solar radiation 
    130131!----------------------------------------------------------------------- 
    131    ln_traqsr   = .false.   !  Light penetration (T) or not (F) 
    132132   nn_chldta   =      0    !  RGB : Chl data (=1) or cst value (=0) 
    133133/ 
  • branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

    r6004 r6030  
    106106      USE oce, ONLY:  zts    => tsa 
    107107      USE oce, ONLY:  zuslp  => ua   , zvslp  => va 
    108       USE oce, ONLY:  zwslpi => ua_sv , zwslpj => va_sv 
    109108      USE oce, ONLY:  zu     => ub   , zv     => vb,  zw => rke 
    110109      ! 
    111110      INTEGER, INTENT(in) ::   kt   ! ocean time-step index 
    112111      ! 
     112       REAL(wp), DIMENSION(jpi,jpj,jpk     )  :: zwslpi, zwslpj 
    113113!      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts)  :: zts 
    114114!      REAL(wp), DIMENSION(jpi,jpj,jpk     )  :: zuslp, zvslp, zwslpi, zwslpj 
  • branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

    r6004 r6030  
    323323      ENDIF 
    324324      ! 
    325       un_b(:,:) = e3u_a(:,:,jk) * un(:,:,1) * umask(:,:,1) 
    326       ub_b(:,:) = e3u_b(:,:,jk) * ub(:,:,1) * umask(:,:,1) 
    327       vn_b(:,:) = e3v_a(:,:,jk) * vn(:,:,1) * vmask(:,:,1) 
    328       vb_b(:,:) = e3v_b(:,:,jk) * vb(:,:,1) * vmask(:,:,1) 
     325      un_b(:,:) = e3u_a(:,:,1) * un(:,:,1) * umask(:,:,1) 
     326      ub_b(:,:) = e3u_b(:,:,1) * ub(:,:,1) * umask(:,:,1) 
     327      vn_b(:,:) = e3v_a(:,:,1) * vn(:,:,1) * vmask(:,:,1) 
     328      vb_b(:,:) = e3v_b(:,:,1) * vb(:,:,1) * vmask(:,:,1) 
    329329      DO jk = 2, jpkm1 
    330330         un_b(:,:) = un_b(:,:) + e3u_a(:,:,jk) * un(:,:,jk) * umask(ji,jj,jk) 
  • branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

    r6004 r6030  
    44   !! Initialization of tidal forcing 
    55   !!====================================================================== 
    6    !! History :  9.0  !  2007  (O. Le Galloudec)  Original code 
     6   !! History :  9.0  !  07  (O. Le Galloudec)  Original code 
    77   !!---------------------------------------------------------------------- 
    88#if defined key_tide 
     
    1010   !!   'key_tide' :                                        tidal potential 
    1111   !!---------------------------------------------------------------------- 
    12    !!   upd_tide      : update tidal potential 
     12   !!   upd_tide       : update tidal potential 
    1313   !!---------------------------------------------------------------------- 
    14    USE oce            ! ocean dynamics and tracers variables 
    15    USE dom_oce        ! ocean space and time domain 
    16    USE in_out_manager ! I/O units 
    17    USE phycst         ! physical constant 
    18    USE sbctide        ! tide potential variable 
    19    USE tideini  , ONLY:  ln_tide_ramp, rdttideramp 
     14   USE oce             ! ocean dynamics and tracers variables 
     15   USE dom_oce         ! ocean space and time domain 
     16   USE in_out_manager  ! I/O units 
     17   USE phycst          ! physical constant 
     18   USE sbctide         ! tide potential variable 
     19   USE tideini, ONLY: ln_tide_ramp, rdttideramp 
    2020 
    2121   IMPLICIT NONE 
     
    3131CONTAINS 
    3232 
    33    SUBROUTINE upd_tide( kt, kit, kbaro, koffset ) 
     33   SUBROUTINE upd_tide( kt, kit, time_offset ) 
    3434      !!---------------------------------------------------------------------- 
    3535      !!                 ***  ROUTINE upd_tide  *** 
     
    4242      !!----------------------------------------------------------------------       
    4343      INTEGER, INTENT(in)           ::   kt      ! ocean time-step index 
    44       INTEGER, INTENT(in), OPTIONAL ::   kit     ! external mode sub-time-step index (lk_dynspg_ts=T only) 
    45       INTEGER, INTENT(in), OPTIONAL ::   kbaro   ! number of sub-time-step           (lk_dynspg_ts=T only) 
    46       INTEGER, INTENT(in), OPTIONAL ::   koffset ! time offset in number  
    47       !                                          ! of sub-time-steps                 (lk_dynspg_ts=T only) 
     44      INTEGER, INTENT(in), OPTIONAL ::   kit     ! external mode sub-time-step index (lk_dynspg_ts=T) 
     45      INTEGER, INTENT(in), OPTIONAL ::   time_offset ! time offset in number  
     46                                                     ! of internal steps             (lk_dynspg_ts=F) 
     47                                                     ! of external steps             (lk_dynspg_ts=T) 
    4848      ! 
    4949      INTEGER  ::   joffset      ! local integer 
     
    5757      ! 
    5858      joffset = 0 
    59       IF( PRESENT( koffset ) )   joffset = koffset 
     59      IF( PRESENT( time_offset ) )   joffset = time_offset 
    6060      ! 
    61       IF( PRESENT( kit ) .AND. PRESENT( kbaro ) )   THEN 
    62          zt = zt + ( kit + 0.5_wp * ( joffset - 1 ) ) * rdt / REAL( kbaro, wp ) 
     61      IF( PRESENT( kit ) )   THEN 
     62         zt = zt + ( kit +  joffset - 1 ) * rdt / REAL( nn_baro, wp ) 
    6363      ELSE 
    6464         zt = zt + joffset * rdt 
     
    7474      IF( ln_tide_ramp ) THEN         ! linear increase if asked 
    7575         zt = ( kt - nit000 ) * rdt 
    76          IF( PRESENT( kit ) .AND. PRESENT( kbaro ) )   zt = zt + kit * rdt / REAL( kbaro, wp ) 
     76         IF( PRESENT( kit ) )   zt = zt + ( kit + joffset -1) * rdt / REAL( nn_baro, wp ) 
    7777         zramp = MIN(  MAX( zt / (rdttideramp*rday) , 0._wp ) , 1._wp  ) 
    7878         pot_astro(:,:) = zramp * pot_astro(:,:) 
     
    8686  !!---------------------------------------------------------------------- 
    8787CONTAINS 
    88   SUBROUTINE upd_tide( kt, kit, kbaro, koffset )          ! Empty routine 
     88  SUBROUTINE upd_tide( kt, kit, time_offset )  ! Empty routine 
    8989    INTEGER, INTENT(in)           ::   kt      !  integer  arg, dummy routine 
    9090    INTEGER, INTENT(in), OPTIONAL ::   kit     !  optional arg, dummy routine 
    91     INTEGER, INTENT(in), OPTIONAL ::   kbaro   !  optional arg, dummy routine 
    92     INTEGER, INTENT(in), OPTIONAL ::   koffset !  optional arg, dummy routine 
     91    INTEGER, INTENT(in), OPTIONAL ::   time_offset !  optional arg, dummy routine 
    9392    WRITE(*,*) 'upd_tide: You should not have seen this print! error?', kt 
    9493  END SUBROUTINE upd_tide 
     94 
    9595#endif 
    9696 
  • branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

    r6004 r6030  
    148148            CALL lbc_lnk( tsb(:,:,:,jn), 'T', 1._wp )  
    149149            CALL lbc_lnk( tsn(:,:,:,jn), 'T', 1._wp ) 
     150            CALL lbc_lnk( tsa(:,:,:,jn), 'T', 1._wp ) 
    150151         END DO 
    151152      ENDIF      
  • branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/SETTE/sette.sh

    r5836 r6030  
    168168    set_namelist namelist_cfg ln_clobber .true. 
    169169    set_namelist namelist_cfg nn_fwb 0 
    170     set_namelist namelist_cfg nn_solv 2 
     170#   set_namelist namelist_cfg nn_solv 2 
    171171    set_namelist namelist_cfg jpni 2 
    172172    set_namelist namelist_cfg jpnj 2 
     
    192192    set_namelist namelist_cfg ln_clobber .true. 
    193193    set_namelist namelist_cfg nn_fwb 0 
    194     set_namelist namelist_cfg nn_solv 2 
     194#   set_namelist namelist_cfg nn_solv 2 
    195195    set_namelist namelist_cfg jpni 2 
    196196    set_namelist namelist_cfg jpnj 2 
     
    238238    set_namelist namelist_cfg ln_ctl .false. 
    239239    set_namelist namelist_cfg ln_clobber .true. 
    240     set_namelist namelist_cfg nn_solv 2 
     240#   set_namelist namelist_cfg nn_solv 2 
    241241    set_namelist namelist_cfg jpni 1 
    242242    set_namelist namelist_cfg jpnj 4 
     
    265265    set_namelist namelist_cfg ln_ctl .false. 
    266266    set_namelist namelist_cfg ln_clobber .true. 
    267     set_namelist namelist_cfg nn_solv 2 
     267#   set_namelist namelist_cfg nn_solv 2 
    268268    set_namelist namelist_cfg jpni 2 
    269269    set_namelist namelist_cfg jpnj 2 
     
    304304    set_namelist namelist_cfg jpnj 4 
    305305    set_namelist namelist_cfg jpnij 8 
    306     set_namelist namelist_cfg nn_solv 2 
     306#   set_namelist namelist_cfg nn_solv 2 
    307307    set_namelist namelist_top_cfg ln_trcdta .false. 
    308308    set_namelist namelist_top_cfg ln_diatrc .false. 
     
    340340    set_namelist namelist_cfg jpnj 4 
    341341    set_namelist namelist_cfg jpnij 8 
    342     set_namelist namelist_cfg nn_solv 2 
     342#   set_namelist namelist_cfg nn_solv 2 
    343343    set_namelist namelist_top_cfg ln_diatrc .false. 
    344344    set_namelist namelist_top_cfg ln_rsttr .true. 
     
    398398    set_namelist namelist_cfg jpnj 4 
    399399    set_namelist namelist_cfg jpnij 16 
    400     set_namelist namelist_cfg nn_solv 2 
     400#   set_namelist namelist_cfg nn_solv 2 
    401401    set_namelist namelist_top_cfg ln_trcdta .false. 
    402402    set_namelist namelist_top_cfg ln_diatrc .false. 
     
    437437    set_namelist namelist_cfg jpnj 8 
    438438    set_namelist namelist_cfg jpnij 16 
    439     set_namelist namelist_cfg nn_solv 2 
     439#   set_namelist namelist_cfg nn_solv 2 
    440440    set_namelist namelist_top_cfg ln_trcdta .false. 
    441441    set_namelist namelist_top_cfg ln_diatrc .false. 
     
    658658    set_namelist namelist_cfg jpnj 2 
    659659    set_namelist namelist_cfg jpnij 4 
    660     set_namelist namelist_cfg nn_solv 2 
     660#   set_namelist namelist_cfg nn_solv 2 
    661661    if [ ${USING_MPMD} == "yes" ] ; then 
    662662       set_xio_using_server iodef.xml true 
     
    682682    set_namelist namelist_cfg jpnj 2 
    683683    set_namelist namelist_cfg jpnij 4 
    684     set_namelist namelist_cfg nn_solv 2 
     684#   set_namelist namelist_cfg nn_solv 2 
    685685    set_namelist namelist_cfg cn_ocerst_in \"O2L3_LONG_00000075_restart\" 
    686686    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3_LONG_00000075_restart_ice\" 
     
    723723    set_namelist namelist_cfg jpnj 4 
    724724    set_namelist namelist_cfg jpnij 16 
    725     set_namelist namelist_cfg nn_solv 2 
     725#   set_namelist namelist_cfg nn_solv 2 
    726726    if [ ${USING_MPMD} == "yes" ] ; then 
    727727       set_xio_using_server iodef.xml true 
     
    748748    set_namelist namelist_cfg jpnj 8 
    749749    set_namelist namelist_cfg jpnij 16 
    750     set_namelist namelist_cfg nn_solv 2 
     750#   set_namelist namelist_cfg nn_solv 2 
    751751    if [ ${USING_MPMD} == "yes" ] ; then 
    752752       set_xio_using_server iodef.xml true 
     
    10191019    set_namelist namelist_cfg ln_clobber .true. 
    10201020    set_namelist namelist_cfg nn_fwb 0 
    1021     set_namelist namelist_cfg nn_solv 2 
     1021#   set_namelist namelist_cfg nn_solv 2 
    10221022    set_namelist namelist_cfg jpni 2 
    10231023    set_namelist namelist_cfg jpnj 2 
     
    10431043    set_namelist namelist_cfg ln_clobber .true. 
    10441044    set_namelist namelist_cfg nn_fwb 0 
    1045     set_namelist namelist_cfg nn_solv 2 
     1045#   set_namelist namelist_cfg nn_solv 2 
    10461046    set_namelist namelist_cfg jpni 2 
    10471047    set_namelist namelist_cfg jpnj 2 
     
    10881088    set_namelist namelist_cfg ln_ctl .false. 
    10891089    set_namelist namelist_cfg ln_clobber .true. 
    1090     set_namelist namelist_cfg nn_solv 2 
     1090#   set_namelist namelist_cfg nn_solv 2 
    10911091    set_namelist namelist_cfg jpni 1 
    10921092    set_namelist namelist_cfg jpnj 4 
     
    11151115    set_namelist namelist_cfg ln_ctl .false. 
    11161116    set_namelist namelist_cfg ln_clobber .true. 
    1117     set_namelist namelist_cfg nn_solv 2 
     1117#   set_namelist namelist_cfg nn_solv 2 
    11181118    set_namelist namelist_cfg jpni 2 
    11191119    set_namelist namelist_cfg jpnj 2 
     
    11541154    set_namelist namelist_cfg jpnj 4 
    11551155    set_namelist namelist_cfg jpnij 16 
    1156     set_namelist namelist_cfg nn_solv 2    
     1156#   set_namelist namelist_cfg nn_solv 2    
    11571157    set_namelist namelist_cfg ln_t3d .true. 
    11581158    set_namelist namelist_cfg ln_s3d .true. 
     
    11931193    set_namelist namelist_cfg jpnj 8 
    11941194    set_namelist namelist_cfg jpnij 16 
    1195     set_namelist namelist_cfg nn_solv 2 
     1195#   set_namelist namelist_cfg nn_solv 2 
    11961196    set_namelist namelist_cfg ln_t3d .true. 
    11971197    set_namelist namelist_cfg ln_s3d .true. 
     
    13471347    set_namelist namelist_cfg jpnj 2 
    13481348    set_namelist namelist_cfg jpnij 4 
    1349     set_namelist namelist_cfg nn_solv 2 
     1349#   set_namelist namelist_cfg nn_solv 2 
    13501350# 
    13511351    set_namelist 1_namelist_cfg cn_exp \"O2LP_LONG\" 
     
    13801380 
    13811381    set_namelist namelist_cfg jpnij 4 
    1382     set_namelist namelist_cfg nn_solv 2 
     1382#   set_namelist namelist_cfg nn_solv 2 
    13831383    set_namelist 1_namelist_cfg cn_exp \"O2LP_SHORT\" 
    13841384    set_namelist 1_namelist_cfg nn_it000 151 
     
    14321432    set_namelist namelist_cfg jpnj 4 
    14331433    set_namelist namelist_cfg jpnij 16 
    1434     set_namelist namelist_cfg nn_solv 2 
     1434#   set_namelist namelist_cfg nn_solv 2 
    14351435# 
    14361436    set_namelist 1_namelist_cfg nn_it000 1 
     
    14641464    set_namelist namelist_cfg jpnj 8 
    14651465    set_namelist namelist_cfg jpnij 16 
    1466     set_namelist namelist_cfg nn_solv 2 
     1466#   set_namelist namelist_cfg nn_solv 2 
    14671467# 
    14681468    set_namelist 1_namelist_cfg nn_it000 1 
Note: See TracChangeset for help on using the changeset viewer.