Changeset 2125 for branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA

Timestamp:

2010-09-27T12:22:04+02:00 (14 years ago)

Author:

cbricaud

Message:

modification: don't allocate fdta arrays when time-interpollation is not used

Location:

branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA

Files:

• dtasal.F90 (modified) (1 diff)
• dtatem.F90 (modified) (1 diff)

branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -114 +114 @@
              CALL ctl_stop( 'dta_sal: unable to allocate sf_sal structure' )   ;   RETURN
          ENDIF
-         ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk) )
-         ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2) )
-
+
+#if defined key_orca_lev10
+         ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpkdta)   )
+         IF( sn_sal%ln_tint ) ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpkdta,2) )
+#else
+         ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk)   )
+         IF( sn_sal%ln_tint ) ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2) )
+#endif
          ! fill sf_sal with sn_sal and control print
          CALL fld_fill( sf_sal, (/ sn_sal /), cn_dir, 'dta_sal', 'Salinity data', 'namdta_sal' )

branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA/dtatem.F90

@@ -122 +122 @@
 #if defined key_orca_lev10
          ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpkdta)   )
-         ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpkdta,2) )
+         IF( sn_tem%ln_tint ) ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpkdta,2) )
 #else
          ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)   )
-         ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2) )
+         IF( sn_tem%ln_tint ) ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2) )
 #endif
          ! fill sf_tem with sn_tem and control print