Changeset 3640 for branches

Timestamp:

2012-11-23T14:57:56+01:00 (11 years ago)

Author:

pabouttier

Message:

Missing allocation/deallocation in TAM routines - See ticket #1013

Location:

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC

Files:

• SBC/sbcmod_tam.F90 (modified) (1 diff)
• TRA/eosbn2_tam.F90 (modified) (1 diff)
• TRA/trabbl_tam.F90 (modified) (4 diffs)
• TRA/traqsr_tam.F90 (modified) (1 diff)
• dotprodfld.F90 (modified) (1 diff)

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/SBC/sbcmod_tam.F90

@@ -247 +247 @@
 !!      CALL sbc_ice_lim_2_adj_tst( kumadt ) ! LIM 2.0 ice model
 !!      CALL sbc_ice_lim_adj_tst( kumadt )   ! LIM 3.0 ice model
+#if defined key_gyre
       CALL sbc_gyre_adj_tst( kumadt )      ! analytical formulation : GYRE configuration
+#endif
 !!      CALL sbc_ana_adj_tst( kumadt )       ! analytical formulation : uniform sbc
       CALL sbc_flx_adj_tst( kumadt )        ! flux formulation

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TRA/eosbn2_tam.F90

@@ -769 +769 @@
          !
       END SELECT
+      CALL wrk_dealloc( jpi, jpj, zws )
       !
    END SUBROUTINE eos_insitu_2d_tan

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TRA/trabbl_tam.F90

@@ -96 +96 @@
          ALLOCATE( utr_bbl_tl  (jpi,jpj), vtr_bbl_tl  (jpi,jpj), &
             &      ahu_bbl_tl  (jpi,jpj), ahv_bbl_tl  (jpi,jpj), &
+            &      ahu_bbl_0_tl  (jpi,jpj), ahv_bbl_0_tl  (jpi,jpj), &
             &      STAT= ierr(1) )
          ll_alloctl = .TRUE.
@@ -103 +104 @@
          ALLOCATE( utr_bbl_ad  (jpi,jpj), vtr_bbl_ad  (jpi,jpj), &
             &      ahu_bbl_ad  (jpi,jpj), ahv_bbl_ad  (jpi,jpj), &
+            &      ahu_bbl_0_ad  (jpi,jpj), ahv_bbl_0_ad  (jpi,jpj), &
             &      STAT= ierr(2) )
          ll_allocad = .TRUE.
@@ -125 +127 @@
       IF ( ( kmode == 0 ) .OR. ( kmode == 1 ) .AND. ( ll_alloctl ) ) THEN
          DEALLOCATE( utr_bbl_tl, vtr_bbl_tl, &
-            &      ahu_bbl_tl, ahv_bbl_tl, &
+            &      ahu_bbl_0_tl, ahv_bbl_0_tl, &
             &      STAT= ierr(1) )
          ll_alloctl = .FALSE.
@@ -133 +135 @@
          DEALLOCATE( utr_bbl_ad, vtr_bbl_ad, &
             &      ahu_bbl_ad, ahv_bbl_ad, &
+            &      ahu_bbl_0_ad, ahv_bbl_0_ad, &
             &      STAT= ierr(2) )
          ll_allocad = .FALSE.

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/TRA/traqsr_tam.F90

@@ -484 +484 @@
       qsr_hc_b_ad(:,:,:) = 0._wp
 
+      CALL wrk_dealloc( jpi, jpj,      zekb, zekg, zekr        )
+      CALL wrk_dealloc( jpi, jpj, jpk, ze0ad, ze1ad, ze2ad, ze3ad, zeaad )
+
       IF( nn_timing == 1 )  CALL timing_stop('tra_qsr_adj')
 

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/dotprodfld.F90

@@ -61 +61 @@
          & pvec2
       !! * Local declarations
-      dot_product_3d = glob_sum(pvec1(:,:,:) * pvec2(:,:,:))!= glob_sum( &
-         !&                       PACK( pvec1(nldi:nlei,nldj:nlej,:),.TRUE.) * &
-         !&                       PACK( pvec2(nldi:nlei,nldj:nlej,:),.TRUE.),  &
-         !&                       (nlei-nldi+1) * (nlej-nldj+1) * jpk )
+
+      dot_product_3d = glob_sum( &
+         &                       PACK( pvec1(nldi:nlei,nldj:nlej,:),.TRUE.) * &
+         &                       PACK( pvec2(nldi:nlei,nldj:nlej,:),.TRUE.),  &
+         &                       (nlei-nldi+1) * (nlej-nldj+1) * jpk )
 
    END FUNCTION dot_product_3d