Changeset 7749


Ignore:
Timestamp:
2017-03-01T16:21:38+01:00 (4 years ago)
Author:
kingr
Message:

Adding code changes from UKMO/dev_r5518_coupling_GSI7_GSI8_landice_with_key_asminc

Location:
branches/UKMO/dev_r5518_GO6_package_w_keyasminc/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_w_keyasminc/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

    r6498 r7749  
    106106   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   kn_ice             !: sea-ice surface layer thermal conductivity (on cats) 
    107107 
     108#if defined key_asminc 
     109   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ndaice_da          !: NEMO fresh water flux to ocean due to data assim 
     110   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfresh_da          !: NEMO salt flux to ocean due to data assim 
     111   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfsalt_da          !: NEMO ice concentration change/second from data assim 
     112#endif 
     113 
    108114   ! variables used in the coupled interface 
    109115   INTEGER , PUBLIC, PARAMETER ::   jpl = ncat 
     
    162168                ss_iov(jpi,jpj)       , fr_iu(jpi,jpj)        , fr_iv(jpi,jpj)        , & 
    163169                a_i(jpi,jpj,ncat)     , topmelt(jpi,jpj,ncat) , botmelt(jpi,jpj,ncat) , & 
     170#if defined key_asminc 
     171                ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , & 
     172#endif 
    164173                sstfrz(jpi,jpj)       , STAT= ierr(1) ) 
    165174   ! Alex West: Allocating tn_ice with 5 categories.  When NEMO is used with CICE, this variable 
  • branches/UKMO/dev_r5518_GO6_package_w_keyasminc/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r6500 r7749  
    5555                sst,sss,uocn,vocn,ss_tltx,ss_tlty,fsalt_ai,      & 
    5656                fresh_ai,fhocn_ai,fswthru_ai,frzmlt,             & 
     57#if defined key_asminc                 
     58                daice_da,                                        & 
     59#endif 
    5760                flatn_f,fsurfn_f,fcondtopn_f,                    & 
    5861                uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   & 
     
    301304  
    302305      CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 
     306#if defined key_asminc 
     307      ! Initialize fresh water and salt fluxes from data assim    
     308      !  and data assimilation index to cice 
     309      nfresh_da(:,:) = 0.0    
     310      nfsalt_da(:,:) = 0.0    
     311      ndaice_da(:,:) = 0.0          
     312#endif 
    303313      ! 
    304314      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
     
    450460      ENDIF 
    451461 
     462#if defined key_asminc 
     463!Ice concentration change (from assimilation) 
     464      ztmp(:,:)=ndaice_da(:,:)*tmask(:,:,1) 
     465      Call nemo2cice(ztmp,daice_da,'T', 1. ) 
     466#endif  
     467 
    452468! Snowfall 
    453469! Ensure fsnow is positive (as in CICE routine prepare_forcing) 
Note: See TracChangeset for help on using the changeset viewer.