Changeset 6647

Timestamp:

2016-05-31T16:40:26+02:00 (8 years ago)

Author:

frrh

Message:

Try to reorganise to avoid clashes with other GO6 package branches.
Also reinstate incorrectly dleted $Id line in DIA/diadct.F90 apparently deleted
by originial medusa branch at rev 5726 when it should merely have reformatted it
or left it alone completely.

Location:

branches/UKMO/dev_r5518_RH_MEDUSA_Stable/NEMOGCM

Files:

• CONFIG/cfg.txt (modified) (2 diffs)
• NEMO/OPA_SRC/DIA/diadct.F90 (modified) (2 diffs)
• NEMO/TOP_SRC/trcini.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_RH_MEDUSA_Stable/NEMOGCM/CONFIG/cfg.txt

@@ -1 +1 @@
 GYRE_PISCES OPA_SRC TOP_SRC
+ORCA2_OFF_MEDUSA OPA_SRC OFF_SRC TOP_SRC
 ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
 GYRE_XIOS OPA_SRC
@@ -11 +12 @@
 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
-ORCA2_OFF_MEDUSA OPA_SRC OFF_SRC TOP_SRC

branches/UKMO/dev_r5518_RH_MEDUSA_Stable/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -112 +112 @@
   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   ::  transports_2d  
 
+   !! $Id$
 CONTAINS
 
@@ -1297 +1298 @@
    LOGICAL, PUBLIC, PARAMETER ::   lk_diadct = .FALSE.    !: diamht flag
    PUBLIC 
+   !! $Id$
 CONTAINS
 

branches/UKMO/dev_r5518_RH_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -156 +156 @@
         !
         IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
+#if !defined key_medusa
             !
-#if defined key_medusa
-            IF(lwp) WRITE(numout,*) 'AXY: calling wrk_alloc'
-            IF(lwp) CALL flush(numout)
-#endif
             CALL wrk_alloc( jpi, jpj, jpk, ztrcdta )    ! Memory allocation
             !
-#if defined key_medusa
-            IF(lwp) WRITE(numout,*) 'AXY: calling trc_dta'
-            IF(lwp) CALL flush(numout)
-#endif
             DO jn = 1, jptra
                IF( ln_trc_ini(jn) ) THEN      ! update passive tracers arrays with input data read from file
@@ -172 +165 @@
                   CALL trc_dta( nit000, sf_trcdta(jl),rf_trfac(jl) )   ! read tracer data at nit000
                   ztrcdta(:,:,:) = sf_trcdta(jl)%fnow(:,:,:)
-                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:)  
+                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:) 
+                  IF( .NOT.ln_trcdmp .AND. .NOT.ln_trcdmp_clo ) THEN      !== deallocate data structure   ==!
+                     !                                                    (data used only for initialisation)
+                     IF(lwp) WRITE(numout,*) 'trc_dta: deallocate data arrays as they are only used to initialize the run'
+                                                  DEALLOCATE( sf_trcdta(jl)%fnow )     !  arrays in the structure
+                     IF( sf_trcdta(jl)%ln_tint )  DEALLOCATE( sf_trcdta(jl)%fdta )
+                     !
+                  ENDIF
+               ENDIF
+            ENDDO
+            CALL wrk_dealloc( jpi, jpj, jpk, ztrcdta )
+
+#else
+            IF(lwp) WRITE(numout,*) 'AXY: calling wrk_alloc'
+            IF(lwp) CALL flush(numout)
+
+            CALL wrk_alloc( jpi, jpj, jpk, ztrcdta )    ! Memory allocation
+               !
+            IF(lwp) WRITE(numout,*) 'AXY: calling trc_dta'
+            IF(lwp) CALL flush(numout)
+
+            DO jn = 1, jptra
+               IF( ln_trc_ini(jn) ) THEN      ! update passive tracers arrays with input data read from file
+                  jl = n_trc_index(jn)
+                  CALL trc_dta( nit000, sf_trcdta(jl),rf_trfac(jl) )   ! read tracer data at nit000
+                  ztrcdta(:,:,:) = sf_trcdta(jl)%fnow(:,:,:)
+                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:) 
                   IF( .NOT.ln_trcdmp .AND. .NOT. ln_trcdmp_clo ) THEN      !== deallocate data structure   ==!
                      !                                                    (data used only for initialisation)
@@ -182 +201 @@
                ENDIF
             ENDDO
-#if defined key_medusa
+
             IF(lwp) WRITE(numout,*) 'AXY: calling wrk_dealloc'
             IF(lwp) CALL flush(numout)