Changeset 10404


Ignore:
Timestamp:
2018-12-18T10:05:53+01:00 (22 months ago)
Author:
smasson
Message:

trunk: compatibility with oasis3-mct v4

Location:
NEMO/trunk/src/OCE/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/SBC/cpl_oasis3.F90

    r10112 r10404  
    142142      INTEGER :: id_part 
    143143      INTEGER :: paral(5)       ! OASIS3 box partition 
    144       INTEGER :: ishape(2,2)    ! shape of arrays passed to PSMILe 
     144      INTEGER :: ishape(4)    ! shape of arrays passed to PSMILe 
    145145      INTEGER :: ji,jc,jm       ! local loop indicees 
    146146      CHARACTER(LEN=64) :: zclname 
     
    181181      !     nl* is set to the global values 1 and jp*glo. 
    182182      ! 
    183       ishape(:,1) = (/ 1, nlei-nldi+1 /) 
    184       ishape(:,2) = (/ 1, nlej-nldj+1 /) 
     183      ishape(1) = 1 
     184      ishape(2) = nlei-nldi+1 
     185      ishape(3) = 1 
     186      ishape(4) = nlej-nldj+1 
    185187      ! 
    186188      ! ... Allocate memory for data exchange 
     
    242244#endif 
    243245                  IF( ln_ctl ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_Out 
    244                   CALL oasis_def_var (ssnd(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 0 /),   & 
     246                  CALL oasis_def_var (ssnd(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 1 /),   & 
    245247                     &                OASIS_Out          , ishape , OASIS_REAL, nerror ) 
    246248                  IF ( nerror /= OASIS_Ok ) THEN 
     
    287289#endif 
    288290                  IF( ln_ctl ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_In 
    289                   CALL oasis_def_var (srcv(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 0 /),   & 
     291                  CALL oasis_def_var (srcv(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 1 /),   & 
    290292                     &                OASIS_In           , ishape , OASIS_REAL, nerror ) 
    291293                  IF ( nerror /= OASIS_Ok ) THEN 
  • NEMO/trunk/src/OCE/SBC/sbccpl.F90

    r10068 r10404  
    16671667         zsprecip(:,:) = frcv(jpr_ievp)%z3(:,:,1) - frcv(jpr_semp)%z3(:,:,1) 
    16681668         ztprecip(:,:) = frcv(jpr_semp)%z3(:,:,1) - frcv(jpr_sbpr)%z3(:,:,1) + zsprecip(:,:) 
     1669      CASE( 'none'      )       ! Not available as for now: needs additional coding below when computing zevap_oce  
     1670      !                         ! since fields received are not defined with none option 
     1671         CALL ctl_stop( 'STOP', 'sbccpl/sbc_cpl_ice_flx: some fields are not defined. Change sn_rcv_emp value in namelist namsbc_cpl' ) 
    16691672      END SELECT 
    16701673 
     
    19431946            &            / (  1.- ( alb_oce_mix(:,:  ) * ziceld(:,:)       & 
    19441947            &                     + palbi      (:,:,1) * picefr(:,:) ) ) 
     1948      CASE( 'none'      )       ! Not available as for now: needs additional coding   
     1949      !                         ! since fields received, here zqsr_tot,  are not defined with none option 
     1950         CALL ctl_stop( 'STOP', 'sbccpl/sbc_cpl_ice_flx: some fields are not defined. Change sn_rcv_qsr value in namelist namsbc_cpl' ) 
    19451951      END SELECT 
    19461952      IF( ln_dm2dc .AND. ln_cpl ) THEN   ! modify qsr to include the diurnal cycle 
Note: See TracChangeset for help on using the changeset viewer.