Changeset 5299 for branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2015-05-27T18:17:08+02:00 (9 years ago)

Author:

smasson

Message:

dev_r5218_CNRS17_coupling: bugfixes

File:

• branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (3 diffs)

branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -309 +309 @@
 
 
-      IF( nn_components /= jp_iam_sas ) THEN
-
-                               CALL sbc_ssm_init               ! Sea-surface mean fields initialisation
-      ELSE
-      !
-      ! sas currently uses surface temperature and salinity in tsn array
-      ! for initialisation
-      ! and ub, vb arrays in ice dynamics
-      ! so allocate enough of arrays to use
-      !
-         ierr3 = 0
-         jpm = MAX(jp_tem, jp_sal)
-         ALLOCATE( tsn(jpi,jpj,1,jpm), STAT=ierr0 )
-         ALLOCATE( ub(jpi,jpj,1)     , STAT=ierr1 )
-         ALLOCATE( vb(jpi,jpj,1)     , STAT=ierr2 )
-         IF ( nn_ice == 1 ) ALLOCATE( tsb(jpi,jpj,1,jpm), STAT=ierr3 )
-         ierr = ierr0 + ierr1 + ierr2 + ierr3
-         IF( ierr > 0 ) THEN
-            CALL ctl_stop('sbc_ssm_init: unable to allocate surface arrays')
-         ENDIF
-
-      ENDIF
+      IF( nn_components /= jp_iam_sas )   &
+         &                     CALL sbc_ssm_init               ! Sea-surface mean fields initialisation
       !
       IF( ln_ssr           )   CALL sbc_ssr_init               ! Sea-Surface Restoring initialisation
@@ -393 +373 @@
       CASE( jp_clio  )   ;   CALL sbc_blk_clio( kt )                    ! bulk formulation : CLIO for the ocean
       CASE( jp_core  )   
-                             IF( nn_components == jp_iam_sas ) &
-                                CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )     !  OASIS-coupled ice
+         IF( nn_components == jp_iam_sas ) &
+            &                CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: SAS receiving fields from OPA 
                              CALL sbc_blk_core( kt )                    ! bulk formulation : CORE for the ocean
                                                                         ! from oce: sea surface variables (sst_m, sss_m,  ssu_m,  ssv_m)
@@ -400 +380 @@
                                                                         !
       CASE( jp_mfs   )   ;   CALL sbc_blk_mfs ( kt )                    ! bulk formulation : MFS for the ocean
-      CASE( jp_none  )   ;   CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   ! OASIS-coupled ice
-                                                         ! fluxes qsr, qns, emp, sfx,utau, vtau
-                                                         ! sss_m, ssu_m, ssv_m)
+      CASE( jp_none  ) 
+         IF( nn_components == jp_iam_opa ) &
+                             CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: OPA receiving fields from SAS
       CASE( jp_esopa )                                
                              CALL sbc_ana     ( kt )                    ! ESOPA, test ALL the formulations