Changeset 6595 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2016-05-22T08:57:02+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: add namusr_def, domain size read in file, interface with arguments for hgr_read and usr_def_hgr

Location:

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbc_oce.F90 (modified) (2 diffs)
• sbcana.F90 (deleted)
• sbcmod.F90 (modified) (5 diffs)

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

@@ -30 +30 @@
    !!----------------------------------------------------------------------
    !                                   !!* namsbc namelist *
-   LOGICAL , PUBLIC ::   ln_ana         !: user defined formulation
+   LOGICAL , PUBLIC ::   ln_usr         !: user defined formulation
    LOGICAL , PUBLIC ::   ln_flx         !: flux         formulation
    LOGICAL , PUBLIC ::   ln_blk_clio    !: CLIO bulk    formulation
@@ -72 +72 @@
    !!           switch definition (improve readability)
    !!----------------------------------------------------------------------
-   INTEGER , PUBLIC, PARAMETER ::   jp_ana     = 1        !: user defined                  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

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -87 +87 @@
       INTEGER ::   icpt   ! local integer
       !!
-      NAMELIST/namsbc/ nn_fsbc  , ln_ana   , ln_flx, ln_blk_clio, ln_blk_core, ln_blk_mfs,   &
+      NAMELIST/namsbc/ nn_fsbc  , ln_usr   , ln_flx, ln_blk_clio, ln_blk_core, ln_blk_mfs,   &
          &             ln_cpl   , ln_mixcpl, nn_components      , nn_limflx  ,               &
          &             ln_traqsr, ln_dm2dc ,                                                 &  
@@ -125 +125 @@
          WRITE(numout,*) '           frequency update of sbc (and ice)             nn_fsbc     = ', nn_fsbc
          WRITE(numout,*) '           Type of air-sea fluxes : '
-         WRITE(numout,*) '              user defined formulation                   ln_ana        = ', ln_ana
+         WRITE(numout,*) '              user defined formulation                   ln_usr        = ', ln_usr
          WRITE(numout,*) '              flux         formulation                   ln_flx        = ', ln_flx
          WRITE(numout,*) '              CLIO bulk    formulation                   ln_blk_clio   = ', ln_blk_clio
@@ -220 +220 @@
       !
       icpt = 0
-      IF( ln_ana          ) THEN   ;   nsbc = jp_ana     ; icpt = icpt + 1   ;   ENDIF       ! user defined         formulation
+      IF( ln_usr          ) THEN   ;   nsbc = jp_usr     ; icpt = icpt + 1   ;   ENDIF       ! user defined         formulation
       IF( ln_flx          ) THEN   ;   nsbc = jp_flx     ; icpt = icpt + 1   ;   ENDIF       ! flux                 formulation
       IF( ln_blk_clio     ) THEN   ;   nsbc = jp_clio    ; icpt = icpt + 1   ;   ENDIF       ! CLIO bulk            formulation
@@ -234 +234 @@
          WRITE(numout,*)
          SELECT CASE( nsbc )
-         CASE( jp_ana     )   ;   WRITE(numout,*) '   user defined formulation'
+         CASE( jp_usr     )   ;   WRITE(numout,*) '   user defined formulation'
          CASE( jp_flx     )   ;   WRITE(numout,*) '   flux formulation'
          CASE( jp_clio    )   ;   WRITE(numout,*) '   CLIO bulk formulation'
@@ -331 +331 @@
       SELECT CASE( nsbc )                                ! Compute ocean surface boundary condition
       !                                                  ! (i.e. utau,vtau, qns, qsr, emp, sfx)
-      CASE( jp_ana   )   ;   CALL usr_def_sbc ( kt )                    ! user defined formulation 
+      CASE( jp_usr   )   ;   CALL usr_def_sbc ( kt )                    ! user defined formulation 
       CASE( jp_flx   )   ;   CALL sbc_flx     ( kt )                    ! flux formulation
       CASE( jp_clio  )   ;   CALL sbc_blk_clio( kt )                    ! bulk formulation : CLIO for the ocean