Changeset 3176

Timestamp:

2011-11-24T12:55:59+01:00 (12 years ago)

Author:

charris

Message:

Removal of references to tn and tb since they no longer exist in NEMO. Also a bit of tidying and some extra consistency checks between NEMO and CICE options.

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -43 +43 @@
                 swvdr,swvdf,swidr,swidf
    USE ice_forcing, only: frcvdr,frcvdf,frcidr,frcidf
+   USE ice_atmo, only: calc_strair
+   USE ice_therm_vertical, only: calc_Tsfc
 
    USE CICE_InitMod
@@ -143 +145 @@
 
 ! Initialize CICE
-      call CICE_Initialize
+      CALL CICE_Initialize
+
+! Do some CICE consistency checks
+     IF ( (nsbc == 2) .OR. (nsbc == 5) ) THEN
+        IF ( calc_strair .OR. calc_Tsfc ) THEN
+           CALL ctl_stop( 'STOP', 'cice_sbc_init : Forcing option requires calc_strair=F and calc_Tsfc=F in ice_in' )
+        ENDIF
+     ELSEIF (nsbc == 4) THEN
+        IF ( .NOT. (calc_strair .AND. calc_Tsfc) ) THEN
+           CALL ctl_stop( 'STOP', 'cice_sbc_init : Forcing option requires calc_strair=T and calc_Tsfc=T in ice_in' )
+        ENDIF
+     ENDIF
+
 
 ! allocate sbc_ice and sbc_cice arrays
@@ -153 +167 @@
          tsn(:,:,:,jp_tem) = MAX (tsn(:,:,:,jp_tem),Tocnfrz)
          tsb(:,:,:,jp_tem) = tsn(:,:,:,jp_tem)
-         tn(:,:,:) = MAX (tn(:,:,:),Tocnfrz)
-         tb(:,:,:) = tn(:,:,:)
       ENDIF