Changeset 7277 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

Timestamp:

2016-11-21T09:55:07+01:00 (8 years ago)

Author:

flavoni

Message:

update 2016 branch with simplif-2

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) (2 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

@@ -30 +30 @@
    !!----------------------------------------------------------------------
    !                                   !!* namsbc namelist *
-   LOGICAL , PUBLIC ::   ln_ana         !: analytical boundary condition flag
-   LOGICAL , PUBLIC ::   ln_flx         !: flux      formulation
-   LOGICAL , PUBLIC ::   ln_blk_clio    !: CLIO bulk formulation
-   LOGICAL , PUBLIC ::   ln_blk_core    !: CORE bulk formulation
-   LOGICAL , PUBLIC ::   ln_blk_mfs     !: MFS  bulk formulation
+   LOGICAL , PUBLIC ::   ln_usr         !: user defined formulation
+   LOGICAL , PUBLIC ::   ln_flx         !: flux         formulation
+   LOGICAL , PUBLIC ::   ln_blk_clio    !: CLIO bulk    formulation
+   LOGICAL , PUBLIC ::   ln_blk_core    !: CORE bulk    formulation
+   LOGICAL , PUBLIC ::   ln_blk_mfs     !: MFS  bulk    formulation
 #if defined key_oasis3
    LOGICAL , PUBLIC ::   lk_oasis = .TRUE.  !: OASIS used
@@ -72 +72 @@
    !!           switch definition (improve readability)
    !!----------------------------------------------------------------------
-   INTEGER , PUBLIC, PARAMETER ::   jp_gyre    = 0        !: GYRE analytical               formulation
-   INTEGER , PUBLIC, PARAMETER ::   jp_ana     = 1        !: analytical                    formulation
+   INTEGER , PUBLIC, PARAMETER ::   jp_usr     = 1        !: user defined                  formulation
    INTEGER , PUBLIC, PARAMETER ::   jp_flx     = 2        !: flux                          formulation
    INTEGER , PUBLIC, PARAMETER ::   jp_clio    = 3        !: CLIO bulk                     formulation