Changeset 2614

Timestamp:

2011-02-25T17:33:25+01:00 (13 years ago)

Author:

trackstand2

Message:

Changes in TOP/CFC for dynamic memory

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO

Files:

• OPA_SRC/nemogcm.F90 (modified) (3 diffs)
• TOP_SRC/CFC/trcsms_cfc.F90 (modified) (6 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -560 +560 @@
       USE trdmld_trc,   ONLY: trd_mld_trc_alloc
 #endif
+#if defined key_cfc
+     USE trcsms_cfc,   ONLY: trc_sms_cfc_alloc
+#endif
       ! ...end of TOP-related alloc routines
 
       ! LOBSTER-related alloc routines...
+#if defined key_lobster
       USE sms_lobster,  ONLY: sms_lobster_alloc
+#endif
       ! ...end of LOBSTER-related alloc routines
 
@@ -625 +630 @@
 #if defined key_ldfslp   ||   defined key_esopa
       ierr = ierr + dyn_ldf_bilapg_alloc()
-#endif
-#if defined key_dtasal   ||   defined key_esopa
-      ierr = ierr + dta_sal_alloc()
 #endif
 #if defined key_dtatem   ||   defined key_esopa
@@ -707 +709 @@
       ierr = ierr + trd_mld_trc_alloc()
 #endif
+#if defined key_cfc
+     ierr = ierr + trc_sms_cfc_alloc()
+#endif
       ! ...end of TOP-related alloc routines
 
       ! Start of LOBSTER-related alloc routines
+#if defined key_lobster
       ierr = ierr + sms_lobster_alloc()
+#endif
       ! ...end of LOBSTER-related alloc routines
 

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -25 +25 @@
    PRIVATE
 
-   PUBLIC   trc_sms_cfc       ! called in ???    
+   PUBLIC   trc_sms_cfc         ! called in ???    
+   PUBLIC   trc_sms_cfc_alloc   ! called in nemogcm.F90
 
    INTEGER , PUBLIC, PARAMETER ::   jpyear = 150   ! temporal parameter 
@@ -34 +35 @@
    INTEGER , PUBLIC    ::   npyear         ! Number of years read in CFC1112 file
    
-   REAL(wp), PUBLIC, DIMENSION(jpyear,jphem, 2    ) ::   p_cfc    ! partial hemispheric pressure for CFC          
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)              ::   xphem    ! spatial interpolation factor for patm
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj     ,jp_cfc) ::   qtr_cfc  ! flux at surface
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj     ,jp_cfc) ::   qint_cfc ! cumulative flux 
+   REAL(wp), PUBLIC, DIMENSION(jpyear,jphem, 2    )      ::   p_cfc    ! partial hemispheric pressure for CFC
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   xphem    ! spatial interpolation factor for patm
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   qtr_cfc  ! flux at surface
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   qint_cfc ! cumulative flux 
 
    REAL(wp), DIMENSION(4,2) ::   soa   ! coefficient for solubility of CFC [mol/l/atm]
@@ -59 +60 @@
 CONTAINS
 
+   FUNCTION trc_sms_cfc_alloc()
+      !!----------------------------------------------------------------------
+      !!                     ***  ROUTINE trc_sms_cfc_alloc  ***
+      !!----------------------------------------------------------------------
+      INTEGER :: trc_sms_cfc_alloc
+      !!----------------------------------------------------------------------
+
+      ALLOCATE(xphem(jpi,jpj),           &
+               qtr_cfc(jpi,jpj,jp_cfc),  &
+               qint_cfc(jpi,jpj,jp_cfc), &
+               Stat=trc_sms_cfc_alloc)
+
+      IF(trc_sms_cfc_alloc /= 0)THEN
+         CALL ctl_warn('trc_sms_cfc_alloc : failed to allocate arrays.')
+      END IF
+
+   END FUNCTION trc_sms_cfc_alloc
+
+
    SUBROUTINE trc_sms_cfc( kt )
       !!----------------------------------------------------------------------
@@ -75 +95 @@
       !!                CFC concentration in pico-mol/m3
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: ztrcfc => wrk_3d_1        ! use for CFC sms trend
+      !!
       INTEGER, INTENT( in ) ::   kt    ! ocean time-step index
       !!
@@ -90 +113 @@
 
       REAL(wp), DIMENSION(jphem,jp_cfc)   ::   zpatm       ! atmospheric function
-      REAL(wp), DIMENSION(jpi,jpj,jpk)    ::   ztrcfc      ! use for CFC sms trend
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(3, 1))THEN
+         CALL ctl_stop('trc_sms_cfc : requested workspace array unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 )   CALL trc_cfc_cst
@@ -191 +218 @@
       END IF
 
+      IF(.NOT. wrk_release(3, 1))THEN
+         CALL ctl_stop('trc_sms_cfc : failed to release workspace array.')
+      END IF
+
    END SUBROUTINE trc_sms_cfc