--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2012/05/14 16:47:27 1.2 +++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2012/07/27 21:07:13 1.4 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.2 2012/05/14 16:47:27 dgoldberg Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.4 2012/07/27 21:07:13 heimbach Exp $ C $Name: $ @@ -50,7 +50,8 @@ & STREAMICE_calve_to_mask, ! & STREAMICE_construct_matrix, & STREAMICE_lower_cg_tol, - & streamice_CFL_factor + & streamice_CFL_factor, + & streamice_adjDump NAMELIST /STREAMICE_PARM02/ & shelf_max_draft, @@ -102,6 +103,7 @@ streamice_max_nl_iter = 100 streamice_n_sub_regularize = 4 streamice_CFL_factor = .5 + streamice_adjDump = 0. STREAMICEthickInit = 'FILE' STREAMICEthickFile = ' ' @@ -174,16 +176,16 @@ & 'STREAMICE_READPARMS: read first param block' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT , 1) - READ(UNIT=iUnit,NML=STREAMICE_PARM02) IF (TRIM(STREAMICEthickInit) .eq. "PARAM") THEN + READ(UNIT=iUnit,NML=STREAMICE_PARM02) WRITE(msgBuf,'(A)') & 'STREAMICE_READPARMS: read second param block' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT , 1) - READ(UNIT=iUnit,NML=STREAMICE_PARM03) ENDIF + READ(UNIT=iUnit,NML=STREAMICE_PARM03) WRITE(msgBuf,'(A)') & 'STREAMICE_READPARMS: read third param block' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,