Changeset 4229 for branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D

Timestamp:

2013-11-18T12:36:11+01:00 (11 years ago)

Author:

cbricaud

Message:

merge UKMO branch into dev_MERCATOR_UKMO_2013

Location:

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D

Files:

• c1d.F90 (modified) (2 diffs)
• domc1d.F90 (copied) (copied from branches/2013/dev_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90)
• dtauvd.F90 (copied) (copied from branches/2013/dev_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90)
• dyndmp.F90 (copied) (copied from branches/2013/dev_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90)
• step_c1d.F90 (modified) (3 diffs)

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90

@@ -4 +4 @@
    !! Ocean domain  :  1D configuration
    !!=====================================================================
-   !! History :   2.0  !  2004-09  (C. Ethe)  Original code
-   !!             3.0  !  2008-04 (G. Madec)  adaptation to SBC
+   !! History :   2.0  !  2004-09 (C. Ethe)     Original code
+   !!             3.0  !  2008-04 (G. Madec)    adaptation to SBC
+   !!             3.5  !  2013-10 (D. Calvert)  add namelist
    !!----------------------------------------------------------------------
+#if defined key_c1d
+   !!----------------------------------------------------------------------
+   !!   'key_c1d'                                   1D column configuration
+   !!----------------------------------------------------------------------
+   !!   c1d_init       : read in the C1D namelist
+   !!----------------------------------------------------------------------
+   USE in_out_manager   ! I/O manager
+   USE par_kind         ! kind parameters
 
    IMPLICIT NONE
    PRIVATE
 
-#if defined key_c1d
-   LOGICAL, PUBLIC, PARAMETER ::   lk_c1d = .TRUE.    !: 1D config. flag activated
-#else
-   LOGICAL, PUBLIC, PARAMETER ::   lk_c1d = .FALSE.   !: 1D config. flag de-activated
-#endif
+   PUBLIC   c1d_init                                 ! called by nemogcm.F90
+
+   LOGICAL , PUBLIC, PARAMETER ::  lk_c1d = .TRUE.   ! 1D config. flag
+
+   REAL(wp), PUBLIC            ::  rn_lat = 50       ! Column latitude
+   REAL(wp), PUBLIC            ::  rn_lon = -145     ! Column longitude
 
    !!----------------------------------------------------------------------
@@ -22 +32 @@
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!======================================================================
+CONTAINS
+
+   SUBROUTINE c1d_init
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE c1d_init  ***
+      !! 
+      !! ** Purpose :   Initialization of C1D options
+      !!
+      !! ** Method  :   Read namelist namc1d 
+      !!----------------------------------------------------------------------
+      NAMELIST/namc1d/ rn_lat, rn_lon
+      !!----------------------------------------------------------------------
+      !
+      REWIND ( numnam )               ! Read C1D options from namelist
+      READ   ( numnam, namc1d )
+      !
+      IF(lwp) THEN                    ! Control print
+         WRITE(numout,*)
+         WRITE(numout,*) 'c1d_init : Initialize 1D model configuration options'
+         WRITE(numout,*) '~~~~~~~~'
+         WRITE(numout,*) '   Namelist namc1d : set options for the C1D model'
+         WRITE(numout,*) '      column latitude                 rn_lat = ', rn_lat
+         WRITE(numout,*) '      column longitude                rn_lon = ', rn_lon
+      ENDIF
+      !
+      !
+   END SUBROUTINE c1d_init
+
+#else
+   !!----------------------------------------------------------------------
+   !!   Dummy module :                           No use of 1D configuration
+   !!----------------------------------------------------------------------
+   LOGICAL, PUBLIC, PARAMETER ::   lk_c1d = .FALSE.   !: 1D config. flag de-activated
+   REAL                       ::   rn_lat, rn_lon
+CONTAINS
+
+   SUBROUTINE c1d_init               ! Dummy routine
+   END SUBROUTINE c1d_init
+
+#endif
+
+   !!======================================================================
 END MODULE c1d

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

@@ -13 +13 @@
    !!   stp_c1d        : NEMO system time-stepping in c1d case
    !!----------------------------------------------------------------------
-   USE step_oce         ! time stepping definition modules 
+   USE step_oce        ! time stepping definition modules 
 #if defined key_top
-   USE trcstp           ! passive tracer time-stepping      (trc_stp routine)
+   USE trcstp          ! passive tracer time-stepping      (trc_stp routine)
 #endif
    USE dyncor_c1d      ! Coriolis term (c1d case)         (dyn_cor_1d     )
    USE dynnxt_c1d      ! time-stepping                    (dyn_nxt routine)
+   USE dyndmp          ! U & V momentum damping           (dyn_dmp routine)
    USE restart         ! restart 
 
@@ -124 +125 @@
                              CALL tra_sbc    ( kstp )        ! surface boundary condition
       IF( ln_traqsr      )   CALL tra_qsr    ( kstp )        ! penetrative solar radiation qsr
+      IF( ln_tradmp      )   CALL tra_dmp    ( kstp )        ! internal damping trends- tracers
       IF( lk_zdfkpp      )   CALL tra_kpp    ( kstp )        ! KPP non-local tracer fluxes
                              CALL tra_zdf    ( kstp )        ! vertical mixing
@@ -136 +138 @@
                                va(:,:,:) = 0.e0
 
+      IF( ln_dyndmp      )     CALL dyn_dmp    ( kstp )       ! internal damping trends- momentum
                                CALL dyn_cor_c1d( kstp )       ! vorticity term including Coriolis
                                CALL dyn_zdf    ( kstp )       ! vertical diffusion