Changeset 2251

Timestamp:

05/26/14 12:41:58 (10 years ago)

Author:

aclsce

Message:

Modifed IPSLCM6 NEMO sources to fit with NEMO revision 4624

Location:

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO

Files:

• limistate.F90 (modified) (1 diff)
• sbccpl.F90 (modified) (1 diff)
• sbcmod.F90 (modified) (3 diffs)
• trc_oce.F90 (modified) (4 diffs)
• zdftke.F90 (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/limistate.F90

@@ -504 +504 @@
       READ  ( numnam_ice_cfg, namiceini, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp )
-      WRITE ( numoni, namiceini )
+      IF(lwm) WRITE ( numoni, namiceini )
 
       ! Define the initial parameters

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/sbccpl.F90

@@ -247 +247 @@
       READ  ( numnam_cfg, namsbc_cpl, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_cpl in configuration namelist', lwp )
-      WRITE ( numond, namsbc_cpl )
+      IF(lwm) WRITE ( numond, namsbc_cpl )
 
       IF(lwp) THEN                        ! control print

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/sbcmod.F90

@@ -63 +63 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO-consortium (2011) 
-   !! $Id: sbcmod.F90 4230 2013-11-18 11:57:11Z cetlod $
+   !! $Id: sbcmod.F90 4624 2014-04-28 12:09:03Z acc $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -101 +101 @@
       READ  ( numnam_cfg, namsbc, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc in configuration namelist', lwp )
-      WRITE ( numond, namsbc )
+      IF(lwm) WRITE ( numond, namsbc )
 
       !                          ! overwrite namelist parameter using CPP key information
@@ -153 +153 @@
       IF(lwp) WRITE(numout,*) '              Fluxes distributed linearly over ice categories ln_iceflx_linear = ', ln_iceflx_linear
 #endif
+      !
+#if defined key_top && ! defined key_offline
+      ltrcdm2dc = (ln_dm2dc .AND. ln_blk_core .AND. nn_ice==2)
+      IF( ltrcdm2dc )THEN
+         IF(lwp)THEN
+            WRITE(numout,*)"analytical diurnal cycle, core bulk formulation and LIM2 use: "
+            WRITE(numout,*)"Diurnal cycle on physics but not in passive tracers"
+         ENDIF
+      ENDIF
+#else 
+      ltrcdm2dc =  .FALSE.
+#endif
+
       !
       !                              ! allocate sbc arrays

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/trc_oce.F90

@@ -67 +67 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: trc_oce.F90 3770 2013-02-04 10:51:28Z cetlod $ 
+   !! $Id: trc_oce.F90 4623 2014-04-22 15:21:41Z acc $ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -178 +178 @@
       zrgb(1,61) = 10.000   ;   zrgb(2,61) = 0.47804   ;   zrgb(3,61) = 0.27178   ;   zrgb(4,61) = 0.56870
       !
+      !
       prgb(:,:) = zrgb(2:4,:)
       !
@@ -270 +271 @@
       !!----------------------------------------------------------------------
       !
-      ! It is not necessary to compute anything bellow the following depth
+      ! It is not necessary to compute anything below the following depth
       zhext = prldex * ( LOG(10._wp) * zprec + LOG(pqsr_frc) )
       !
@@ -276 +277 @@
       pjl = jpkm1
       DO jk = jpkm1, 1, -1
-         zem = MAXVAL( fsdepw(:,:,jk+1) * tmask(:,:,jk) )
-         IF( zem >= zhext )   pjl = jk                       ! last T-level reached by Qsr
+         IF(SUM(tmask(:,:,jk)) > 0 ) THEN
+            zem = MAXVAL( fsdepw(:,:,jk+1) * tmask(:,:,jk) )
+            IF( zem >= zhext )   pjl = jk                       ! last T-level reached by Qsr
+         ELSE
+            pjl = jk                                            ! or regional sea-bed depth 
+         ENDIF
       END DO
       !

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/zdftke.F90

@@ -707 +707 @@
       READ  ( numnam_cfg, namzdf_tke, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tke in configuration namelist', lwp )
-      WRITE ( numond, namzdf_tke )
+      IF(lwm) WRITE ( numond, namzdf_tke )
       !
       ri_cri   = 2._wp    / ( 2._wp + rn_ediss / rn_ediff )   ! resulting critical Richardson number