Changeset 6176

Timestamp:

2015-12-29T16:06:25+01:00 (8 years ago)

Author:

kingr

Message:

Commented out CICE to NEMO variable which break fcm build

File:

• branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_with_key_asminc/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_with_key_asminc/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,             &
-                daice_da,fresh_da,fsalt_da,                      &
+!                daice_da,fresh_da,fsalt_da,                      &
+                daice_da,                                        &
                 flatn_f,fsurfn_f,fcondtopn_f,                    &
                 uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   &
@@ -725 +726 @@
       ENDIF
 
-#if defined key_asminc
+!#if defined key_asminc
 ! Import fresh water and salt flux due to seaice da
-      ztmp(:,:)=nfresh_da(:,:)*tmask(:,:,1)
-      CALL cice2nemo(fresh_da, ztmp,'T',1.0)
-      ztmp(:,:)=nfsalt_da(:,:)*tmask(:,:,1)
-      CALL cice2nemo(fsalt_da, ztmp,'T',1.0)
-#endif
+!      CALL cice2nemo(fresh_da, nfresh_da,'T',1.0)
+!      CALL cice2nemo(fsalt_da, nfsalt_da,'T',1.0)
+!#endif
 
 ! Release work space