Changeset 8899

Timestamp:

2017-12-05T14:26:11+01:00 (7 years ago)

Author:

hadlh

Message:

Removed unecessary print statements and stopped the passing back of salf and freshwater fluxes as these are output in CICE now.

Location:

branches/UKMO/GO6_package_r8356_CICEnudging/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

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

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

@@ -73 +73 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   botmelt            !: category botmelt
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ndaice_da        !: NEMO ice conc rate of change
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   nfresh_da         !: NEMO fresh water flux to ocean due to data assim 
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   nfsalt_da          !: NEMO salt flux to ocean due to data assim 
 
 #if defined  key_lim3
@@ -165 +163 @@
                 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) , &
-                sstfrz(jpi,jpj)       , ndaice_da(jpi,jpj), nfresh_da(jpi,jpj), &
-      nfsalt_da(jpi,jpj), STAT= ierr(1) )
+                sstfrz(jpi,jpj)       , ndaice_da(jpi,jpj), STAT= ierr(1) )
    ! Alex West: Allocating tn_ice with 5 categories.  When NEMO is used with CICE, this variable
    ! represents top layer ice temperature, which is multi-category.

branches/UKMO/GO6_package_r8356_CICEnudging/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,             &
-                flatn_f,fsurfn_f,fcondtopn_f,daice_da,fresh_da,fsalt_da, &
+                flatn_f,fsurfn_f,fcondtopn_f,daice_da, &
                 uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   &
                 swvdr,swvdf,swidr,swidf,Tf,                      &
@@ -223 +223 @@
       ENDIF  
 
-      ! Initialize fresh water and salt fluxes from data assim  
-      !  and data assimilation index to cice
-      nfresh_da(:,:) = 0.0
-      nfsalt_da(:,:) = 0.0
+      ! Initialize  data assimilation index for cice
       ndaice_da(:,:) = 0.0
       
@@ -462 +459 @@
 !Ice concentration change (from assimilation) 
       ztmp(:,:)=ndaice_da(:,:)*tmask(:,:,1)  
-      write(numout,*) 'PE/Ar/Max/Min daice_dat ', nproc, narea, maxval(ztmp), minval(ztmp) 
-      write(numout,*) 'PE/Ar/Max/Min daice_dat ', nproc, narea, maxval(ndaice_da), minval(ndaice_da)
       CALL nemo2cice(ztmp, daice_da,'T',1.)
 
@@ -728 +723 @@
          snwice_fmass (:,:) = ( snwice_mass(:,:) - snwice_mass_b(:,:) ) / dt
       ENDIF
-
-! Import fresh water and salt flux due to seaice da
-      CALL cice2nemo(fresh_da, nfresh_da,'T',1.0)
-      CALL cice2nemo(fsalt_da, nfsalt_da,'T',1.0)
-      write(numout,*) 'Max/Min nfresh_da ', maxval(nfresh_da), minval(nfresh_da)
-      write(numout,*) 'Max/Min nfresh_da ', maxval(nfsalt_da), minval(nfsalt_da)
 
 ! Release work space