New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14924 for NEMO/branches/2021 – NEMO

Changeset 14924 for NEMO/branches/2021


Ignore:
Timestamp:
2021-05-28T16:07:37+02:00 (3 years ago)
Author:
mathiot
Message:

ticket #2669 : off topic again, I plugged in the fix for the oasis case made by Christrian.

Location:
NEMO/branches/2021/ticket2669_isf_fluxes/src/OCE
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/ticket2669_isf_fluxes/src/OCE/ISF/isfpar.F90

    r14917 r14924  
    99   !!            3.4  !  2013-03  (P. Mathiot) Merging + parametrization 
    1010   !!            4.1  !  2019-09  (P. Mathiot) Restructuration 
     11   !!            4.2  !  2021-05  (C. Ethe   ) Test and fix oasis case 
    1112   !!---------------------------------------------------------------------- 
    1213 
    … …  
    177178      CASE ( 'oasis' ) 
    178179         ! 
     180         ALLOCATE( sf_isfpar_fwf(1), STAT=ierr ) 
     181         ALLOCATE( sf_isfpar_fwf(1)%fnow(jpi,jpj,1), sf_isfpar_fwf(1)%fdta(jpi,jpj,1,2) ) 
     182         CALL fld_fill( sf_isfpar_fwf, (/ sn_isfpar_fwf /), cn_isfdir, 'isf_par_init', 'read fresh water flux isf data', 'namisf' ) 
     183         ! 
    179184         IF(lwp) WRITE(numout,*) 
    180185         IF(lwp) WRITE(numout,*) '      ==>>>    isf melt provided by OASIS (cn_isfmlt_par = oasis)' 

  • NEMO/branches/2021/ticket2669_isf_fluxes/src/OCE/ISF/isfstp.F90

    r14916 r14924  
    262262      IF ( l_isfoasis .AND. ln_isf ) THEN 
    263263         ! 
    264          CALL ctl_stop( 'namelist combination ln_cpl and ln_isf not tested' ) 
    265          ! 
    266264         ! NEMO coupled to ATMO model with isf cavity need oasis method for melt computation  
    267265         IF ( ln_isfcav_mlt .AND. TRIM(cn_isfcav_mlt) /= 'oasis' ) CALL ctl_stop( 'cn_isfcav_mlt = oasis is the only option availble if fwf send by oasis' ) 
    268266         IF ( ln_isfpar_mlt .AND. TRIM(cn_isfpar_mlt) /= 'oasis' ) CALL ctl_stop( 'cn_isfpar_mlt = oasis is the only option availble if fwf send by oasis' ) 
    269          ! 
    270          ! oasis melt computation not tested (coded but not tested) 
    271          IF ( ln_isfcav_mlt .OR. ln_isfpar_mlt ) THEN 
    272             IF ( TRIM(cn_isfcav_mlt) == 'oasis' ) CALL ctl_stop( 'cn_isfcav_mlt = oasis not tested' ) 
    273             IF ( TRIM(cn_isfpar_mlt) == 'oasis' ) CALL ctl_stop( 'cn_isfpar_mlt = oasis not tested' ) 
    274          END IF 
    275267         ! 
    276268         ! oasis melt computation with cavity open and cavity parametrised (not coded) 

  • NEMO/branches/2021/ticket2669_isf_fluxes/src/OCE/SBC/sbccpl.F90

    r14834 r14924  
    285285         &                  sn_rcv_charn , sn_rcv_taw   , sn_rcv_bhd  , sn_rcv_tusd  , sn_rcv_tvsd,    & 
    286286         &                  sn_rcv_wdrag , sn_rcv_qns   , sn_rcv_emp  , sn_rcv_rnf   , sn_rcv_cal  ,   & 
    287          &                  sn_rcv_iceflx, sn_rcv_co2   , sn_rcv_icb  , sn_rcv_isf   , sn_rcv_ts_ice !!, sn_rcv_qtrice 
     287         &                  sn_rcv_iceflx, sn_rcv_co2   , sn_rcv_icb  , sn_rcv_isf   , sn_rcv_ts_ice,  & !!, sn_rcv_qtrice 
     288         &                  sn_rcv_mslp 
    288289 
    289290      !!--------------------------------------------------------------------- 
    … …  
    528529         IF(lwp) WRITE(numout,*) 
    529530         IF(lwp) WRITE(numout,*) '   iceshelf received from oasis ' 
    530          CALL ctl_stop('STOP','not coded') 
    531       ENDIF 
     531      ENDIF 
     532      ! 
    532533      ! 
    533534      !                                                      ! ------------------------- ! 
Note: See TracChangeset for help on using the changeset viewer.