Changeset 2998 for branches

Timestamp:

2011-10-26T13:31:26+02:00 (12 years ago)

Author:

charris

Message:

#662 Minor change to CICE interface code, plus more careful checking for options not currently available with CICE.

Location:

branches/2011/dev_r2802_UKMO8_cice/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcice_cice.F90 (modified) (1 diff)
• sbcmod.F90 (modified) (1 diff)

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

@@ -340 +340 @@
 
 ! Freezing/melting potential
-! Calculated over NEMO leapfrog timestep (hence 2*dt), so uses tb as 
-! frzmlt then used in timestep going tb to ta.
-
-     nfrzmlt(:,:)=rau0*rcp*fse3t(:,:,1)*(Tocnfrz-sst_m(:,:))/(2.0*dt)
+! Calculated over NEMO leapfrog timestep (hence 2*dt), so uses tb in 
+! frzmlt which is then applied in going from tb to ta.
+! May be better using sst_m if not coupling to CICE every time-step
+
+!     nfrzmlt(:,:)=rau0*rcp*fse3t(:,:,1)*(Tocnfrz-sst_m(:,:))/(2.0*dt)
+     nfrzmlt(:,:)=rau0*rcp*fse3t(:,:,1)*(Tocnfrz-tsb(:,:,1,jp_tem))/(2.0*dt)
+
      ztmp(:,:) = nfrzmlt(:,:)
      CALL nemo2cice(ztmp,frzmlt,'T', 1. )

branches/2011/dev_r2802_UKMO8_cice/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -148 +148 @@
       IF( ( nn_ice == 2 .OR. nn_ice ==3 ) .AND. .NOT.( ln_blk_clio .OR. ln_blk_core .OR. lk_cpl ) )   &
          &   CALL ctl_stop( 'LIM sea-ice model requires a bulk formulation or coupled configuration' )
-      IF( nn_ice == 4 .AND. .NOT.( ln_flx .OR. ln_blk_core .OR. lk_cpl ) )   &
-         &   CALL ctl_stop( 'CICE sea-ice model requires ln_blk_core, ln_flx or ln_cpl' )
+      IF( nn_ice == 4 .AND. .NOT.( ln_blk_core .OR. lk_cpl ) )   &
+         &   CALL ctl_stop( 'CICE sea-ice model requires ln_blk_core or lk_cpl' )
+      IF( nn_ice == 4 .AND. ( .NOT. ( cp_cfg == 'orca' ) .OR. lk_agrif ) )   &
+         &   CALL ctl_stop( 'CICE sea-ice model currently only available in a global ORCA configuration without AGRIF' )
       
       IF( ln_dm2dc )   nday_qsr = -1   ! initialisation flag