Changeset 2224 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC

Timestamp:

2010-10-12T16:04:22+02:00 (14 years ago)

Author:

rblod

Message:

Correct update from the trunk of DEV_r2106_LOCEAN2010

Location:

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC

Files:

• cpl_oasis3.F90 (modified) (1 diff)
• sbccpl.F90 (modified) (6 diffs)
• sbcice_lim_2.F90 (modified) (1 diff)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -27 +27 @@
    USE mod_prism_proto              ! OASIS3 prism module
    USE mod_prism_def_partition_proto! OASIS3 prism module for partitioning
-   USE mod_prism_grids_writing      ! OASIS3 prism module for writing grid files
    USE mod_prism_put_proto          ! OASIS3 prism module for snding
    USE mod_prism_get_proto          ! OASIS3 prism module for receiving
-   USE mod_prism_grids_writing      ! OASIS3 prism module for writing grids
    USE par_oce                      ! ocean parameters
    USE dom_oce                      ! ocean space and time domain

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -40 +40 @@
    USE restart         !
    USE oce   , ONLY : tn, un, vn
-   USE phycst, ONLY : rt0, rcp
    USE albedo          !
    USE in_out_manager  ! I/O manager
@@ -153 +152 @@
    INTEGER , DIMENSION(        jprcv) ::   nrcvinfo           ! OASIS info argument
 
+#if ! defined key_lim2 && ! defined key_lim3
+   ! quick patch to be able to run the coupled model without sea-ice...
+   INTEGER, PARAMETER               ::   jpl = 1 
+   REAL(wp), DIMENSION(jpi,jpj    ) ::   hicif, hsnif, u_ice, v_ice,fr1_i0,fr2_i0
+   REAL(wp), DIMENSION(jpi,jpj,jpl) ::   tn_ice, alb_ice
+   REAL(wp)                         ::  lfus
+#endif
+
    !! Substitution
 #  include "vectopt_loop_substitute.h90"
@@ -254 +261 @@
 
       ! default definitions of srcv
-      srcv(:)%laction = .FALSE.   ;   srcv(:)%clgrid = 'T'   ;   srcv(:)%nsgn = 1
+      srcv(:)%laction = .FALSE.   ;   srcv(:)%clgrid = 'T'   ;   srcv(:)%nsgn = 1.
 
       !                                                      ! ------------------------- !
@@ -439 +446 @@
       
       ! default definitions of nsnd
-      ssnd(:)%laction = .FALSE.   ;   ssnd(:)%clgrid = 'T'   ;   ssnd(:)%nsgn = 1
+      ssnd(:)%laction = .FALSE.   ;   ssnd(:)%clgrid = 'T'   ;   ssnd(:)%nsgn = 1.
          
       !                                                      ! ------------------------- !
@@ -492 +499 @@
       ssnd(jps_ocz1)%clname = 'O_OCurz1'   ;   ssnd(jps_ivz1)%clname = 'O_IVelz1'
       !
-      ssnd(jps_ocx1:jps_ivz1)%nsgn = -1    ! vectors: change of the sign at the north fold
+      ssnd(jps_ocx1:jps_ivz1)%nsgn = -1.   ! vectors: change of the sign at the north fold
 
       IF( cn_snd_crt(4) /= 'T' )   CALL ctl_stop( 'cn_snd_crt(4) must be equal to T' )
@@ -714 +721 @@
          !                                                       ! non solar heat flux over the ocean (qns)
          IF( srcv(jpr_qnsoce)%laction )   qns(:,:) = frcv(:,:,jpr_qnsoce)
-         IF( srcv(jpr_qnsmix)%laction )   qns(:,:) = frcv(:,:,jpr_qnsmix)        
-         qns(:,:) = qns(:,:) - frcv(:,:,jpr_snow) * lfus              ! add the latent heat of solid precip. melting 
+         IF( srcv(jpr_qnsmix)%laction )   qns(:,:) = frcv(:,:,jpr_qnsmix)  
+         ! add the latent heat of solid precip. melting
+         IF( srcv(jpr_snow  )%laction )   qns(:,:) = qns(:,:) - frcv(:,:,jpr_snow) * lfus              
 
          !                                                       ! solar flux over the ocean          (qsr)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -180 +180 @@
          ENDIF
 #if defined key_coupled
-         IF( ksbc == 5    )             CALL sbc_cpl_ice_flx( frld   ,                               &
+         IF( ksbc == 5    )             CALL sbc_cpl_ice_flx( reshape( frld, (/jpi,jpj,1/) ),        &
       &                                                       qns_tot, qns_ice, qsr_tot , qsr_ice,   &
       &                                                       emp_tot, emp_ice, dqns_ice, sprecip,   &