Changeset 2795


Ignore:
Timestamp:
2011-07-07T15:21:12+02:00 (9 years ago)
Author:
acc
Message:

First set of changes for simplified laplacian Neptune, see ticket #843

Location:
branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/CONFIG/GYRE/EXP00/namelist

    r2715 r2795  
    863863    salfixmin = -9999      !  Minimum salinity after applying the increments 
    864864/ 
     865!----------------------------------------------------------------------- 
     866&nam_dynnept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     867!----------------------------------------------------------------------- 
     868   ln_neptsimp          = .false.  ! yes/no use simplified neptune 
     869 
     870   ln_smoothtopo        = .false.  ! yes/no smooth tsu, tsv 
     871   rn_tslse             =  1.2e4   ! value of L at the equator 
     872   rn_tslsp             =  3.0e3   ! value of L at the pole 
     873/ 
  • branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

    r2715 r2795  
    863863    salfixmin = -9999      !  Minimum salinity after applying the increments 
    864864/ 
     865!----------------------------------------------------------------------- 
     866&nam_dynnept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     867!----------------------------------------------------------------------- 
     868   ln_neptsimp          = .false.  ! yes/no use simplified neptune 
     869 
     870   ln_smoothtopo        = .false.  ! yes/no smooth tsu, tsv 
     871   rn_tslse             =  1.2e4   ! value of L at the equator 
     872   rn_tslsp             =  3.0e3   ! value of L at the pole 
     873/ 
  • branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm

    r2670 r2795  
    1  bld::tool::fppkeys key_trabbl key_vectopt_loop key_orca_r2 key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_dtatem key_dtasal key_tradmp key_zdftke key_zdfddm key_zdftmx key_iomput  
     1 bld::tool::fppkeys key_mpp_mpi key_trabbl key_vectopt_loop key_orca_r2 key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_dtatem key_dtasal key_tradmp key_zdftke key_zdfddm key_zdftmx key_iomput  
  • branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

    r2715 r2795  
    878878    salfixmin = -9999      !  Minimum salinity after applying the increments 
    879879/ 
     880!----------------------------------------------------------------------- 
     881&nam_dynnept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     882!----------------------------------------------------------------------- 
     883   ln_neptsimp          = .false.  ! yes/no use simplified neptune 
     884 
     885   ln_smoothtopo        = .false.  ! yes/no smooth tsu, tsv 
     886   rn_tslse             =  1.2e4   ! value of L at the equator 
     887   rn_tslsp             =  3.0e3   ! value of L at the pole 
     888/ 
  • branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/CONFIG/POMME/EXP00/namelist

    r2650 r2795  
    868868    salfixmin = -9999      !  Minimum salinity after applying the increments 
    869869/ 
     870!----------------------------------------------------------------------- 
     871&nam_dynnept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
     872!----------------------------------------------------------------------- 
     873   ln_neptsimp          = .false.  ! yes/no use simplified neptune 
     874 
     875   ln_smoothtopo        = .false.  ! yes/no smooth tsu, tsv 
     876   rn_tslse             =  1.2e4   ! value of L at the equator 
     877   rn_tslsp             =  3.0e3   ! value of L at the pole 
     878/ 
  • branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r2715 r2795  
    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_r2787_NOCS_NEPTUNE/NEMOGCM/NEMO/OPA_SRC/step.F90

    r2715 r2795  
    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_cor_topo( 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_cor_topo( 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.