Changeset 4282

Timestamp:

2013-11-20T12:34:36+01:00 (10 years ago)

Author:

cbricaud

Message:

changes to make compatibility of dev_r3856_MERCATOR3_QSRMEAN24H with offline TOP/PISCES

Location:

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO

Files:

• LIM_SRC_2/ice_2.F90 (modified) (1 diff)
• LIM_SRC_2/iceini_2.F90 (modified) (1 diff)
• OPA_SRC/SBC/sbc_oce.F90 (modified) (1 diff)
• TOP_SRC/trcini.F90 (modified) (2 diffs)

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/LIM_SRC_2/ice_2.F90

@@ -198 +198 @@
    !!   Default option         Empty module        NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
+   LOGICAL , PUBLIC::  ltrcdm2dc_ice = .FALSE.              !: In case of Diurnal Cycle short wave, compute a Daily Mean short waves flux
 #endif
    !!-----------------------------------------------------------------

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

@@ -72 +72 @@
          &     'use more ocean levels or less ice layers/categories.' )
 
+      ! When Diurnal cycle, core bulk and LIM2  are activated, 
+      ! a daily mean qsr is computed for tracer/biogeochemistery model                                 !
+      IF( ltrcdm2dc ) ltrcdm2dc_ice = .TRUE.
+
       !                                ! Open the namelist file 
       CALL ctl_opn( numnam_ice, 'namelist_ice', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp ) 

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

@@ -130 +130 @@
          &      ssv_m  (jpi,jpj) , sss_m  (jpi,jpj), ssh_m(jpi,jpj) , STAT=ierr(4) )
          !
-         IF( ltrcdm2dc ) ALLOCATE( qsr_mean(jpi,jpj) , STAT=ierr(5) )
+      IF( ltrcdm2dc ) ALLOCATE( qsr_mean(jpi,jpj) , STAT=ierr(5) )
          !
       sbc_oce_alloc = MAXVAL( ierr )

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    USE oce_trc         ! shared variables between ocean and passive tracers
-   USE ice_2           ! LIM sea-ice variables
    USE trc             ! passive tracers common variables
    USE trcrst          ! passive tracers restart
@@ -77 +76 @@
          CALL ctl_warn( ' Diurnal cycle on physics but not in PISCES or LOBSTER ' )
          ltrcdm2dc     = .TRUE.
-         ltrcdm2dc_ice = .TRUE.
-      ELSE
-         CALL ctl_stop( ' The diurnal cycle is not compatible with PISCES ' ) 
       ENDIF