Changeset 6134

Timestamp:

2015-12-18T16:01:55+01:00 (8 years ago)

Author:

lovato

Message:

Add changes proposed in ticket #1252 and #1645 (related to runoff data sharing)

Location:

branches/2015/dev_merge_2015/NEMOGCM

Files:

• CONFIG/SHARED/namelist_top_ref (modified) (1 diff)
• NEMO/OFF_SRC/dtadyn.F90 (modified) (1 diff)
• NEMO/OFF_SRC/nemogcm.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/ASM/asminc.F90 (modified) (1 diff)
• NEMO/OPA_SRC/DIA/diawri.F90 (modified) (1 diff)
• NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (1 diff)

branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_top_ref

@@ -132 +132 @@
 $namtrc_bdy
    cn_trc_dflt     =  'neumann'    !  OBC applied by default to all tracers
-   cn_trc          =  'none'       !  Boundary conditions appled to the active tracers (see namtrc)
+   cn_trc          =  'none'       !  Boundary conditions used for tracers with data files (selected in namtrc)
 
    nn_trcdmp_bdy   = 0     !  Use damping timescales defined in nambdy of namelist

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -358 +358 @@
                 jf_rnf = jfld + 1  ;  jfld  = jf_rnf
          slf_d(jf_rnf) = sn_rnf
+         ! Activate runoff key of sbc_oce
+         ln_rnf = .true.
+         WRITE(numout,*) 'dta_dyn : Activate the runoff data structure from ocean core ( force ln_rnf = .true.) '
+         WRITE(numout,*)
       ELSE
          rnf (:,:) = 0._wp

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -52 +52 @@
    USE trcrst
    USE diaptr         ! Need to initialise this as some variables are used in if statements later
+   USE sbc_oce, ONLY: ln_rnf
+   USE sbcrnf
 
    IMPLICIT NONE
@@ -94 +96 @@
       !                            !-----------------------!
       istp = nit000
+      !
+      ! Initialize arrays of runoffs structures and read data from the namelist
+      IF ( ln_rnf ) CALL sbc_rnf(istp)
       ! 
       CALL iom_init( cxios_context )            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -634 +634 @@
                &                                  rhd, gru , grv , grui, grvi     )    ! of t, s, rd at the last ocean level
 
-#if defined key_zdfkpp
-            CALL eos( tsn, rhd, fsdept_n(:,:,:) )                      ! Compute rhd
-!!gm fabien            CALL eos( tsn, rhd )                      ! Compute rhd
-#endif
-
             DEALLOCATE( t_bkginc )
             DEALLOCATE( s_bkginc )

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -967 +967 @@
 
       IF(  .NOT.ln_linssh  ) THEN             
-         CALL histwrite( id_i, "vovvldep", kt, fsdept_n(:,:,:), jpi*jpj*jpk, idex )!  T-cell depth 
-         CALL histwrite( id_i, "vovvle3t", kt, fse3t_n (:,:,:), jpi*jpj*jpk, idex )!  T-cell thickness  
+         CALL histwrite( id_i, "vovvldep", kt, gdept_n(:,:,:), jpi*jpj*jpk, idex )!  T-cell depth 
+         CALL histwrite( id_i, "vovvle3t", kt, e3t_n (:,:,:) , jpi*jpj*jpk, idex )!  T-cell thickness  
       END IF 
       ! 3. Close the file

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -54 +54 @@
    REAL(wp)                   ::   rn_hrnf           !: runoffs, depth over which enhanced vertical mixing is used
    REAL(wp)          , PUBLIC ::   rn_avt_rnf        !: runoffs, value of the additional vertical mixing coef. [m2/s]
-   REAL(wp)                   ::   rn_rfact          !: multiplicative factor for runoff
+   REAL(wp)          , PUBLIC ::   rn_rfact          !: multiplicative factor for runoff
 
    LOGICAL , PUBLIC ::   l_rnfcpl = .false.   !: runoffs recieved from oasis