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 2986 for branches/2011/dev_NOC_2011_MERGE/NEMOGCM – NEMO

Ignore:
Timestamp:
2011-10-24T17:58:09+02:00 (13 years ago)
Author:
acc
Message:

Branch dev_NOC_2011_MERGE. #874. Step 4: Merge in changes from 2011/dev_r2787_NOCS_NEPTUNE branch

Location:
branches/2011/dev_NOC_2011_MERGE/NEMOGCM
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm

    r2364 r2986  
    2222# Note use of -Bstatic because the library root directories are not accessible to the back-end compute nodes 
    2323%NCDF_LIB            -L%HDF5_HOME/lib -L%NCDF_HOME/lib -Bstatic -lnetcdf -lhdf5_fortran -lhdf5_hl -lhdf5 -Bdynamic -lz 
    24 %FC                  mpif90 
     24%FC                  ifort 
    2525%FCFLAGS             -r8 -O3 -xT -ip -vec-report0 
    2626%FFLAGS              -r8 -O3 -xT -ip -vec-report0 
    27 %LD                  mpif90 
     27%LD                  ifort 
    2828%FPPFLAGS            -P -C -traditional 
    29 %LDFLAGS 
     29%LDFLAGS             -lmpi 
    3030%AR                  ar  
    3131%ARFLAGS             -r 

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist

    r2980 r2986  
    865865    salfixmin = -9999      !  Minimum salinity after applying the increments 
    866866/ 
     867!----------------------------------------------------------------------- 
     868&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     869!----------------------------------------------------------------------- 
     870   ! Suggested lengthscale values are those of Eby & Holloway (1994) for a coarse model 
     871   ln_neptsimp       = .false.  ! yes/no use simplified neptune 
     872 
     873   ln_smooth_neptvel = .false.  ! yes/no smooth zunep, zvnep 
     874   rn_tslse          =  1.2e4   ! value of lengthscale L at the equator 
     875   rn_tslsp          =  3.0e3   ! value of lengthscale L at the pole 
     876   ! Specify whether to ramp down the Neptune velocity in shallow 
     877   ! water, and if so the depth range controlling such ramping down 
     878   ln_neptramp       = .false.  ! ramp down Neptune velocity in shallow water 
     879   rn_htrmin         =  100.0   ! min. depth of transition range 
     880   rn_htrmax         =  200.0   ! max. depth of transition range 
     881/ 

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

    r2980 r2986  
    865865    salfixmin = -9999      !  Minimum salinity after applying the increments 
    866866/ 
     867!----------------------------------------------------------------------- 
     868&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     869!----------------------------------------------------------------------- 
     870   ! Suggested lengthscale values are those of Eby & Holloway (1994) for a coarse model 
     871   ln_neptsimp       = .true.   ! yes/no use simplified neptune 
     872 
     873   ln_smooth_neptvel = .false.  ! yes/no smooth zunep, zvnep 
     874   rn_tslse          =  1.2e4   ! value of lengthscale L at the equator 
     875   rn_tslsp          =  3.0e3   ! value of lengthscale L at the pole 
     876   ! Specify whether to ramp down the Neptune velocity in shallow 
     877   ! water, and if so the depth range controlling such ramping down 
     878   ln_neptramp       = .true.   ! ramp down Neptune velocity in shallow water 
     879   rn_htrmin         =  100.0   ! min. depth of transition range 
     880   rn_htrmax         =  200.0   ! max. depth of transition range 
     881/ 

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

    r2980 r2986  
    880880    salfixmin = -9999      !  Minimum salinity after applying the increments 
    881881/ 
     882!----------------------------------------------------------------------- 
     883&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     884!----------------------------------------------------------------------- 
     885   ! Suggested lengthscale values are those of Eby & Holloway (1994) for a coarse model 
     886   ln_neptsimp       = .false.  ! yes/no use simplified neptune 
     887 
     888   ln_smooth_neptvel = .false.  ! yes/no smooth zunep, zvnep 
     889   rn_tslse          =  1.2e4   ! value of lengthscale L at the equator 
     890   rn_tslsp          =  3.0e3   ! value of lengthscale L at the pole 
     891   ! Specify whether to ramp down the Neptune velocity in shallow 
     892   ! water, and if so the depth range controlling such ramping down 
     893   ln_neptramp       = .false.  ! ramp down Neptune velocity in shallow water 
     894   rn_htrmin         =  100.0   ! min. depth of transition range 
     895   rn_htrmax         =  200.0   ! max. depth of transition range 
     896/ 

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist

    r2980 r2986  
    870870    salfixmin = -9999      !  Minimum salinity after applying the increments 
    871871/ 
     872!----------------------------------------------------------------------- 
     873&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     874!----------------------------------------------------------------------- 
     875   ! Suggested lengthscale values are those of Eby & Holloway (1994) for a coarse model 
     876   ln_neptsimp       = .false.  ! yes/no use simplified neptune 
     877 
     878   ln_smooth_neptvel = .false.  ! yes/no smooth zunep, zvnep 
     879   rn_tslse          =  1.2e4   ! value of lengthscale L at the equator 
     880   rn_tslsp          =  3.0e3   ! value of lengthscale L at the pole 
     881   ! Specify whether to ramp down the Neptune velocity in shallow 
     882   ! water, and if so the depth range controlling such ramping down 
     883   ln_neptramp       = .false.  ! ramp down Neptune velocity in shallow water 
     884   rn_htrmin         =  100.0   ! min. depth of transition range 
     885   rn_htrmax         =  200.0   ! max. depth of transition range 
     886/ 

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r2715 r2986  
    6666   USE c1d             ! 1D configuration 
    6767   USE step_c1d        ! Time stepping loop for the 1D configuration 
     68   USE dynnept         ! simplified form of Neptune effect 
    6869#if defined key_top 
    6970   USE trcini          ! passive tracer initialisation 
    … …  
    296297      IF( lk_obc        )   CALL     obc_init   ! Open boundaries  
    297298      IF( lk_bdy        )   CALL     bdy_init   ! Unstructured open boundaries 
     299 
     300                            CALL flush(numout) 
     301                            CALL dyn_nept_init  ! simplified form of Neptune effect 
     302                            CALL flush(numout) 
    298303 
    299304                            CALL  istate_init   ! ocean initial state (Dynamics and tracers) 

  • branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90

    r2715 r2986  
    3636#endif 
    3737   USE asminc           ! assimilation increments    (tra_asm_inc, dyn_asm_inc routines) 
     38   USE dynnept          ! simplified form of Neptune effect 
    3839 
    3940   IMPLICIT NONE 
    … …  
    220221      IF(  ln_asmiau .AND. & 
    221222         & ln_dyninc       )   CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment 
     223      IF( ln_neptsimp )        CALL dyn_nept_cor( kstp )    ! subtract Neptune velocities (simplified) 
    222224                               CALL dyn_adv( kstp )         ! advection (vector or flux form) 
    223225                               CALL dyn_vor( kstp )         ! vorticity term including Coriolis 
    224226                               CALL dyn_ldf( kstp )         ! lateral mixing 
     227      IF( ln_neptsimp )        CALL dyn_nept_cor( kstp )    ! add Neptune velocities (simplified) 
    225228#if defined key_agrif 
    226229      IF(.NOT. Agrif_Root())   CALL Agrif_Sponge_dyn        ! momemtum sponge 
Note: See TracChangeset for help on using the changeset viewer.