Changeset 3653 for branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC

Timestamp:

2012-11-26T11:58:31+01:00 (12 years ago)

Author:

cetlod

Message:

commit the changes from LOCEAN & UKMO merge, see ticket #1021

Location:

branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC

Files:

• par_cfc.F90 (modified) (2 diffs)
• trcrst_cfc.F90 (deleted)
• trcsms_cfc.F90 (modified) (5 diffs)
• trcwri_cfc.F90 (copied) (copied from branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90)

branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90

@@ -10 +10 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-   USE par_lobster, ONLY : jp_lobster      !: number of tracers in LOBSTER
-   USE par_lobster, ONLY : jp_lobster_2d   !: number of 2D diag in LOBSTER
-   USE par_lobster, ONLY : jp_lobster_3d   !: number of 3D diag in LOBSTER
-   USE par_lobster, ONLY : jp_lobster_trd  !: number of biological diag in LOBSTER
-
    USE par_pisces , ONLY : jp_pisces       !: number of tracers in PISCES
    USE par_pisces , ONLY : jp_pisces_2d    !: number of 2D diag in PISCES
@@ -22 +17 @@
    IMPLICIT NONE
 
-   INTEGER, PARAMETER ::   jp_lc      = jp_lobster     + jp_pisces     !: cumulative number of passive tracers
-   INTEGER, PARAMETER ::   jp_lc_2d   = jp_lobster_2d  + jp_pisces_2d  !:
-   INTEGER, PARAMETER ::   jp_lc_3d   = jp_lobster_3d  + jp_pisces_3d  !:
-   INTEGER, PARAMETER ::   jp_lc_trd  = jp_lobster_trd + jp_pisces_trd !:
+   INTEGER, PARAMETER ::   jp_lc      =  jp_pisces     !: cumulative number of passive tracers
+   INTEGER, PARAMETER ::   jp_lc_2d   =  jp_pisces_2d  !:
+   INTEGER, PARAMETER ::   jp_lc_3d   =  jp_pisces_3d  !:
+   INTEGER, PARAMETER ::   jp_lc_trd  =  jp_pisces_trd !:
    
 #if defined key_cfc

branches/2012/dev_LOCEAN_UKMO_2012/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -13 +13 @@
    !!----------------------------------------------------------------------
    !!   trc_sms_cfc  :  compute and add CFC suface forcing to CFC trends
-   !!   trc_cfc_cst  :  sets constants for CFC surface forcing computation
+   !!   cfc_init     :  sets constants for CFC surface forcing computation
    !!----------------------------------------------------------------------
    USE oce_trc       ! Ocean variables
@@ -99 +99 @@
       ENDIF
 
-      IF( kt == nittrc000 )   CALL trc_cfc_cst
+      IF( kt == nittrc000 )   CALL cfc_init
 
       ! Temporal interpolation
@@ -176 +176 @@
          !                                                  !----------------!
       END DO                                                !  end CFC loop  !
-      !                                                     !----------------!
+      !
+      IF( lrst_trc ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'trc_sms_cfc : cumulated input function fields written in ocean restart file ',   &
+            &                    'at it= ', kt,' date= ', ndastp
+         IF(lwp) WRITE(numout,*) '~~~~'
+         DO jn = jp_cfc0, jp_cfc1
+            CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) )
+         END DO
+      ENDIF
+      !                                              
       IF( ln_diatrc ) THEN
         !
@@ -200 +210 @@
 
 
-   SUBROUTINE trc_cfc_cst
+   SUBROUTINE cfc_init
       !!---------------------------------------------------------------------
-      !!                     ***  trc_cfc_cst  ***  
+      !!                     ***  cfc_init  ***  
       !!
       !! ** Purpose : sets constants for CFC model
       !!---------------------------------------------------------------------
+      INTEGER :: jn
 
       ! coefficient for CFC11 
@@ -245 +256 @@
       sca(4,2) =  -0.067430
 
-   END SUBROUTINE trc_cfc_cst
+      IF( ln_rsttr ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) ' Read specific variables from CFC model '
+         IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~'
+         !
+         DO jn = jp_cfc0, jp_cfc1
+            CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) ) 
+         END DO
+      ENDIF
+      IF(lwp) WRITE(numout,*)
+      !
+   END SUBROUTINE cfc_init