Changeset 2777 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90

Timestamp:

2011-06-07T11:55:02+02:00 (13 years ago)

Author:

smasson

Message:

LIM3 compiling and (partly?) running in v3_3_1, see ticket#817

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90

@@ -180 +180 @@
       CALL fld_read( kt, nn_fsbc, sf )        ! input fields provided at the current time-step
 
-#if defined key_lim3
-      tatm_ice(:,:) = sf(jp_tair)%fnow(:,:,1)                  ! LIM3: make Tair available in sea-ice
-#endif
       !                                                        ! surface ocean fluxes computed with CLIO bulk formulea
       IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce_core( sf, sst_m, ssu_m, ssv_m )
@@ -472 +469 @@
 !!gm end
 
+#if defined key_lim3
+      tatm_ice(:,:) = sf(jp_tair)%fnow(:,:,1)   ! LIM3: make Tair available in sea-ice. WARNING allocated after call to ice_init
+#endif
       ! ----------------------------------------------------------------------------- !
       !    Wind components and module relative to the moving ocean ( U10m - U_ice )   !
@@ -882 +882 @@
          &                    30,31,32,33,34                )   .OR.  &  
          iwrk_not_released(2, 1)                                  )   &
-         CALL ctl_stop('TURB_CORE_1Z: failed to release workspace arrays')
+         CALL ctl_stop('TURB_CORE_2Z: failed to release workspace arrays')
       !
     END SUBROUTINE TURB_CORE_2Z