updated for CM use

git-svn-id: https://access-svn.nci.org.au/svn/cice/branches/access/cice5@298 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

compile/comp_access-cm.RJ.nP-mct

@@ -86,10 +86,13 @@ if ( $ACCESS == 'yes' ) then
   echo CPL_INCS: $CPL_INCS
 endif
 
+### For multi-Layer ice (standard) configuration
+setenv N_ILYR 1                # 4 for standard multi-layer ice. for ktherm=0, zero-layer thermodynamics
+
 ### Location and name of the generated exectuable
 setenv DATESTR `date +%Y%m%d`
 setenv BINDIR $SYSTEMDIR/bin
-setenv EXE cice5_${CHAN}-mct.${DATESTR}.RJ_${nproc}p
+setenv EXE cice5_${CHAN}-mct.${DATESTR}.RJ_${nproc}p_${N_ILYR}lyr
 
 ### Where this model is compiled
 setenv OBJDIR $SRCDIR/compile/build_${CHAN}_{$nproc}p-mct
@@ -108,9 +111,6 @@ set NYGLOB = `echo $RES | sed s/.\*x//`
 echo NXGLOB: $NXGLOB
 echo NYGLOB: $NYGLOB
 
-### For multi-Layer ice (standard) configuration
-setenv N_ILYR 1                # 4 for standard multi-layer ice. for ktherm=0, zero-layer thermodynamics
-
 # Recommendations:
 #   NTASK equals nprocs in ice_in
 #   use processor_shape = slenderX1 or slenderX2 in ice_in

drivers/access/ice_constants.F90

@@ -35,11 +35,9 @@ module ice_constants
                                         ! freshwater value needed for enthalpy
 #endif
          depressT  = 0.054_dbl_kind   ,&! Tf:brine salinity ratio (C/ppt)
-!ars599: 26032014 new code (CODE: dragio)
-!	use new code, mark out #ifndef AusCOM
-!#ifndef AusCOM
+#ifndef AusCOM
          dragio    = 0.00536_dbl_kind ,&! ice-ocn drag coefficient
-!#endif
+#endif
          albocn    = 0.06_dbl_kind      ! ocean albedo
 
       real (kind=dbl_kind), parameter, public :: &
@@ -98,6 +96,7 @@ module ice_constants
       ! since this modules name is ice_constants
 !ars599: 26032014: change to public
       real (kind=dbl_kind), public :: &
+         dragio   , & ! ice-ocn drag coefficient
          Tocnfrz ! freezing temp of seawater (C),
                  ! used as Tsfcn for open water
 #endif