Changeset 7749

Timestamp:

2017-03-01T16:21:38+01:00 (7 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:

• sbc_ice.F90 (modified) (2 diffs)
• sbcice_cice.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_w_keyasminc/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

@@ -106 +106 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   kn_ice             !: sea-ice surface layer thermal conductivity (on cats)
 
+#if defined key_asminc
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ndaice_da          !: NEMO fresh water flux to ocean due to data assim
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfresh_da          !: NEMO salt flux to ocean due to data assim
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfsalt_da          !: NEMO ice concentration change/second from data assim
+#endif
+
    ! variables used in the coupled interface
    INTEGER , PUBLIC, PARAMETER ::   jpl = ncat
@@ -162 +168 @@
                 ss_iov(jpi,jpj)       , fr_iu(jpi,jpj)        , fr_iv(jpi,jpj)        , &
                 a_i(jpi,jpj,ncat)     , topmelt(jpi,jpj,ncat) , botmelt(jpi,jpj,ncat) , &
+#if defined key_asminc
+                ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , &
+#endif
                 sstfrz(jpi,jpj)       , STAT= ierr(1) )
    ! 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

@@ -55 +55 @@
                 sst,sss,uocn,vocn,ss_tltx,ss_tlty,fsalt_ai,      &
                 fresh_ai,fhocn_ai,fswthru_ai,frzmlt,             &
+#if defined key_asminc                
+                daice_da,                                        &
+#endif
                 flatn_f,fsurfn_f,fcondtopn_f,                    &
                 uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   &
@@ -301 +304 @@
  
       CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 )
+#if defined key_asminc
+      ! Initialize fresh water and salt fluxes from data assim   
+      !  and data assimilation index to cice
+      nfresh_da(:,:) = 0.0   
+      nfsalt_da(:,:) = 0.0   
+      ndaice_da(:,:) = 0.0         
+#endif
       !
       IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init')
@@ -450 +460 @@
       ENDIF
 
+#if defined key_asminc
+!Ice concentration change (from assimilation)
+      ztmp(:,:)=ndaice_da(:,:)*tmask(:,:,1)
+      Call nemo2cice(ztmp,daice_da,'T', 1. )
+#endif 
+
 ! Snowfall
 ! Ensure fsnow is positive (as in CICE routine prepare_forcing)