Changeset 8037


Ignore:
Timestamp:
2017-05-17T19:56:19+02:00 (3 years ago)
Author:
jwhile
Message:

Further merge of CICE_with_keyasminc

Location:
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

    r7979 r8037  
    4040#endif 
    4141#if defined key_cice && defined key_asminc 
    42    USE sbc_ice          ! Surface boundary condition for ice. 
     42   USE sbc_ice, ONLY : & ! CICE Ice model variables 
     43   & ndaice_da, nfresh_da, nfsalt_da 
    4344#endif 
    4445   USE sbc_oce          ! Surface boundary condition variables. 
  • branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

    r7961 r8037  
    116116    
    117117   ! 
     118    
     119   ! 
     120   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ndaice_da          !: NEMO fresh water flux to ocean due to data assim 
     121   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfresh_da          !: NEMO salt flux to ocean due to data assim 
     122   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfsalt_da          !: NEMO ice concentration change/second from data assim 
     123       
    118124#endif 
    119125    
     
    169175                ss_iov(jpi,jpj)       , fr_iu(jpi,jpj)        , fr_iv(jpi,jpj)        , & 
    170176                a_i(jpi,jpj,ncat)     , topmelt(jpi,jpj,ncat) , botmelt(jpi,jpj,ncat) , & 
     177                ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , & 
     178                STAT= ierr(1) ) 
    171179                sstfrz(jpi,jpj)       , STAT= ierr(1) ) 
    172180   ! Alex West: Allocating tn_ice with 5 categories.  When NEMO is used with CICE, this variable 
  • branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r6500 r8037  
    5656                fresh_ai,fhocn_ai,fswthru_ai,frzmlt,             & 
    5757                flatn_f,fsurfn_f,fcondtopn_f,                    & 
     58                daice_da,fresh_da,fsalt_da,                    & 
    5859                uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   & 
    5960                swvdr,swvdf,swidr,swidf,Tf,                      & 
     
    301302  
    302303      CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 
     304 
     305      ! Initialize fresh water and salt fluxes from data assim    
     306      !  and data assimilation index to cice  
     307      nfresh_da(:,:) = 0.0    
     308      nfsalt_da(:,:) = 0.0    
     309      ndaice_da(:,:) = 0.0          
    303310      ! 
    304311      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
     
    450457      ENDIF 
    451458 
     459#if defined key_asminc 
     460!Ice concentration change (from assimilation) 
     461      ztmp(:,:)=ndaice_da(:,:)*tmask(:,:,1) 
     462      Call nemo2cice(ztmp,daice_da,'T', 1. ) 
     463#endif  
     464 
    452465! Snowfall 
    453466! Ensure fsnow is positive (as in CICE routine prepare_forcing) 
     
    712725         snwice_fmass (:,:) = ( snwice_mass(:,:) - snwice_mass_b(:,:) ) / dt 
    713726      ENDIF 
     727 
     728#if defined key_asminc 
     729! Import fresh water and salt flux due to seaice da 
     730      CALL cice2nemo(fresh_da, nfresh_da,'T',1.0) 
     731      CALL cice2nemo(fsalt_da, nfsalt_da,'T',1.0) 
     732#endif 
    714733 
    715734! Release work space 
Note: See TracChangeset for help on using the changeset viewer.