/[MITgcm]/MITgcm/pkg/seaice/SEAICE_OPTIONS.h
ViewVC logotype

Log of /MITgcm/pkg/seaice/SEAICE_OPTIONS.h

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Links to HEAD: (view) (download) (annotate)
Links to MAIN: (view) (download) (annotate)
Sticky Tag:

Revision 1.81 - (view) (download) (annotate) - [select for diffs]
Fri Apr 28 17:20:33 2017 UTC (7 years ago) by mlosch
Branch: MAIN
CVS Tags: HEAD, checkpoint66h, checkpoint66i, checkpoint66j, checkpoint66k, checkpoint66l, checkpoint66m, checkpoint66n, checkpoint66o
Changes since 1.80: +3 -1 lines
Diff to previous 1.80
add new flags for advecting sea ice momentum


Revision 1.80 - (view) (download) (annotate) - [select for diffs]
Tue Jun 14 20:36:07 2016 UTC (7 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint65y, checkpoint65z, checkpoint66a, checkpoint66b, checkpoint66c, checkpoint66d, checkpoint66e, checkpoint66f, checkpoint66g
Changes since 1.79: +11 -7 lines
Diff to previous 1.79
put pkg/seaice Wind-Stress common block within CPP option: SEAICE_EXCLUDE_WIND_STRESS


Revision 1.79 - (view) (download) (annotate) - [select for diffs]
Tue Apr 26 11:09:38 2016 UTC (8 years ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint65w, checkpoint65x
Changes since 1.78: +5 -2 lines
Diff to previous 1.78
add new CPP flag SEAICE_ALLOW_BOTTOMDRAG (undefined) for reference


Revision 1.78 - (view) (download) (annotate) - [select for diffs]
Wed Jan 27 14:06:07 2016 UTC (8 years, 3 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint65t, checkpoint65u, checkpoint65v
Changes since 1.77: +3 -1 lines
Diff to previous 1.77
add flags for new Picard-Krylov solver for sea ice dynamics (but not
yet the solver itself)


Revision 1.77 - (view) (download) (annotate) - [select for diffs]
Wed Jul 1 12:26:48 2015 UTC (8 years, 10 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint65n, checkpoint65o, checkpoint65p, checkpoint65q, checkpoint65r, checkpoint65s
Changes since 1.76: +4 -1 lines
Diff to previous 1.76
 - add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising
   delta with a smooth function in s/r seaice_calc_viscosity
   (no effect on EVP)
 - rename local suffix "sqr" into "sq" for more consistent variable names


Revision 1.76 - (view) (download) (annotate) - [select for diffs]
Mon Jun 15 15:34:46 2015 UTC (8 years, 10 months ago) by mlosch
Branch: MAIN
Changes since 1.75: +7 -9 lines
Diff to previous 1.75
change comments after renaming SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA


Revision 1.75 - (view) (download) (annotate) - [select for diffs]
Wed Oct 1 16:00:51 2014 UTC (9 years, 7 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint65f, checkpoint65g, checkpoint65h, checkpoint65i, checkpoint65j, checkpoint65k, checkpoint65l, checkpoint65m
Changes since 1.74: +7 -1 lines
Diff to previous 1.74
- seaice_cost_final.F : fix ALLOW_COST_ICE case
- SEAICE_OPTIONS.h : document ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA
- cost_hyd.F : add SEAICE_OPTIONS.h, where ALLOW_SEAICE_COST_SMR_AREA is defined


Revision 1.74 - (view) (download) (annotate) - [select for diffs]
Sat Aug 23 20:22:15 2014 UTC (9 years, 8 months ago) by torge
Branch: MAIN
CVS Tags: checkpoint65c, checkpoint65d, checkpoint65e
Changes since 1.73: +22 -1 lines
Diff to previous 1.73
Introducing a new parameterization for grease ice,
 i.e. newly formed sea ice in open water:

What it does:
 The grease ice parameterization delays formation of solid
 sea ice from frazil ice by a time constant and provides a
 dynamic calculation of the initial solid sea ice thickness
 HO as a function of winds, currents and available grease ice
 volume. Grease ice does not significantly reduce heat loss
 from the ocean in winter and area covered by grease is thus
 handled like open water.
 (for details see Smedsrud and Martin, 2014, Ann.Glac.)

How to use:
- enable SEAICE_GREASE in SEAICE_OPTIONS.h
- set SItrName(1) = 'grease' in namelist SEAICE_PARM03 in data.seaice
  then output SItr01 is SItrNameLong(1) = 'grease ice volume fraction',
  with SItrUnit(1) = '[0-1]', which needs to be multiplied by SIheff
  to yield grease ice volume.
- additionally, the actual grease ice layer thickness
  (diagnostic SIgrsLT) can be saved.


Revision 1.73 - (view) (download) (annotate) - [select for diffs]
Thu Mar 7 08:32:48 2013 UTC (11 years, 2 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint64f, checkpoint64g, checkpoint64h, checkpoint64i, checkpoint64j, checkpoint64k, checkpoint64l, checkpoint64m, checkpoint64n, checkpoint64o, checkpoint64p, checkpoint64q, checkpoint64r, checkpoint64s, checkpoint64t, checkpoint64u, checkpoint64v, checkpoint64w, checkpoint64x, checkpoint64y, checkpoint64z, checkpoint65, checkpoint65a, checkpoint65b
Changes since 1.72: +15 -1 lines
Diff to previous 1.72
add some documentation for the flags SEAICE_VECTORIZE_LSR and
SEAICE_VECTORIZE_LSR_ZEBRA


Revision 1.72 - (view) (download) (annotate) - [select for diffs]
Thu Dec 27 23:05:47 2012 UTC (11 years, 4 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint64c, checkpoint64d, checkpoint64e
Changes since 1.71: +1 -8 lines
Diff to previous 1.71
- remove legacy branch code.
- retire SEAICE_GROWTH_LEGACY and
  SEAICE_CAP_HEFF accordingly.


Revision 1.71 - (view) (download) (annotate) - [select for diffs]
Sat Dec 22 00:52:05 2012 UTC (11 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint64b
Changes since 1.70: +6 -8 lines
Diff to previous 1.70
Replace SEAICE_MULTICATEGORY check with "warning" instead of "error+stop".
Update SEAICE_OPTIONS.h for main code and "almost-up-to-date" verification experiments.


Revision 1.70 - (view) (download) (annotate) - [select for diffs]
Tue Dec 18 20:04:28 2012 UTC (11 years, 4 months ago) by dimitri
Branch: MAIN
Changes since 1.69: +1 -6 lines
Diff to previous 1.69
removing obsolete ITD-related SEAICE_MULTICATEGORY lines


Revision 1.69 - (view) (download) (annotate) - [select for diffs]
Sun Dec 16 16:22:22 2012 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.68: +3 -1 lines
Diff to previous 1.68
- add option for SEAICE_LSR to use global (multi-tile) tri-diagonal solver;
  default: not compiled and not used.


Revision 1.68 - (view) (download) (annotate) - [select for diffs]
Thu Nov 15 20:10:03 2012 UTC (11 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint64a
Changes since 1.67: +11 -13 lines
Diff to previous 1.67
fix 1 comment (in ITD option) + move ITD option just after MULTICATEGORY setting


Revision 1.67 - (view) (download) (annotate) - [select for diffs]
Sun Oct 28 10:25:40 2012 UTC (11 years, 6 months ago) by mlosch
Branch: MAIN
Changes since 1.66: +3 -4 lines
Diff to previous 1.66
small fix: move SEAICE_ZETA_SMOOTHREG to where it is potentially useful


Revision 1.66 - (view) (download) (annotate) - [select for diffs]
Mon Oct 22 21:14:06 2012 UTC (11 years, 6 months ago) by heimbach
Branch: MAIN
Changes since 1.65: +12 -1 lines
Diff to previous 1.65
Step 1 of merging ice-thickness distribution (ITD) code from
MITgcm_contrib/torge/itd/code/ to main repository
(author: Torge Martin)


Revision 1.65 - (view) (download) (annotate) - [select for diffs]
Tue Oct 16 06:37:33 2012 UTC (11 years, 6 months ago) by mlosch
Branch: MAIN
Changes since 1.64: +8 -1 lines
Diff to previous 1.64
Add CPP flags for JFNK


Revision 1.64 - (view) (download) (annotate) - [select for diffs]
Tue Apr 10 16:30:37 2012 UTC (12 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63m, checkpoint63n, checkpoint63o, checkpoint63p, checkpoint63q, checkpoint63r, checkpoint63s, checkpoint64
Changes since 1.63: +30 -37 lines
Diff to previous 1.63
- switch both SEAICE_GROWTH_LEGACY & SEAICE_DISABLE_HEATCONSFIX to #undef ;
- update comments; removed obsolete CPP options.


Revision 1.63 - (view) (download) (annotate) - [select for diffs]
Thu Mar 8 01:15:02 2012 UTC (12 years, 2 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint63k, checkpoint63l
Changes since 1.62: +1 -11 lines
Diff to previous 1.62
- remove unpopular check and stop logic for
  MCPHEE_OCEAN_ICE_HEAT_FLUX
  MCPHEE_OCEAN_ICE_HEAT_FLUX
  GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR
- just issue a warning that defaults changed.


Revision 1.62 - (view) (download) (annotate) - [select for diffs]
Sat Mar 3 03:33:02 2012 UTC (12 years, 2 months ago) by gforget
Branch: MAIN
Changes since 1.61: +6 -1 lines
Diff to previous 1.61
- final version of turbulent flux params, as agreed at MIT ice meet:
        SEAICE_mcPheePiston (default is ~ 0.000875)
        SEAICE_mcPheeTaper (default is 0.)
        SEAICE_frazilFrac (defualt is 1.)
        SEAICE_mcPheeStepFunc (default is false)
- changes results at trunction error level.
--------
- retire short lived SEAICEturbFluxFormula (1,2,3,4) and instead
  add SEAICE_mcPheeStepFunc (true replaces SEAICEturbFluxFormula=4)
- seaice_check.F :
        -- map old params to SEAICE_mcPheePiston, SEAICE_mcPheeTaper, SEAICE_frazilFrac
        -- stops to make default change known to common user (that most likely had undef
           MCPHEE_OCEAN_ICE_HEAT_FLUX and GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR)
- SEAICE_OPTIONS.h : define MCPHEE_OCEAN_ICE_HEAT_FLUX and GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR
  that only serve the purpose of stopping in seaice_check to aknowledge the change of defaults.
- seaice_growth.F : use new params.
- SEAICE_PARAMS.h, seaice_init_fixed.F, seaice_readparms.F, seaice_summary.F : handle new params.


Revision 1.61 - (view) (download) (annotate) - [select for diffs]
Mon Feb 13 23:20:36 2012 UTC (12 years, 2 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint63j
Changes since 1.60: +4 -1 lines
Diff to previous 1.60
- simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula.EQ.
   1 or 2, using newly added run time parameter SEAICE_availHeatTaper.
- fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148.
- add permanent SItflux diag that corresponds to TFLUX but includes
   ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget.
- allow activation/testing of a fix for suspected missing term in
   ocn-ice heat budget (to be confirmed). To test this, you want to
   undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param
   SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic.


Revision 1.60 - (view) (download) (annotate) - [select for diffs]
Sat Feb 11 03:35:01 2012 UTC (12 years, 2 months ago) by gforget
Branch: MAIN
Changes since 1.59: +16 -11 lines
Diff to previous 1.59
- unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT
  is now the default, and the old default constant freezing point is recovered with
  SEAICE_tempFrz0    = -1.96,
  SEAICE_dTempFrz_dS = 0.,
- retire SEAICE_freeze that was the old way of specifycing the constant freezing point.
- remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there.
- bug fix (thanks to M. Losch) : the sublimation term that was missing is now
  activated. To reproduce old results that had this bug define SEAICE_DISABLE_SUBLIM.
- bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211)
  was wrong for SIsal0.NE.0. Changes cs32x15 results (see upcoming checkin for detail).
- bug fix (thanks to O. Jahn) : area loss for melting  got messed up in
  seaice_growth r149 for legacy branch (no results change).
- introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code from I. Fenty).
- results did not change except for global_ocean.cs32x15, mostly due to the switch
  to variable freezing point (see upcoming checkin of results for details).


Revision 1.59 - (view) (download) (annotate) - [select for diffs]
Thu Feb 9 03:42:32 2012 UTC (12 years, 3 months ago) by gforget
Branch: MAIN
Changes since 1.58: +2 -9 lines
Diff to previous 1.58
- replace with run time parameters
	SEAICE_doOpenWaterGrowth, SEAICE_doOpenWaterMelt
	SEAICE_areaLossFormula, SEAICE_areaGainFormula
  the now retired CPP switches
	SEAICE_OCN_MELT_ACT_ON_AREA, SEAICE_DO_OPEN_WATER_GROWTH
	SEAICE_DO_OPEN_WATER_MELT, FENTY_AREA_EXPANSION_CONTRACTION
- added checks : retired CPPs and consistency of run time params
- only changes global_ocean.cs32x15 fwd result at truncation level (cgd2d 11)
- couple things left to polish (soon) : seaice_summary and
  d_AREAbyATM, d_AREAbyICE, d_AREAbyOCN diags


Revision 1.58 - (view) (download) (annotate) - [select for diffs]
Tue Feb 7 18:41:09 2012 UTC (12 years, 3 months ago) by gforget
Branch: MAIN
Changes since 1.57: +1 -4 lines
Diff to previous 1.57
pkg/seaice : turbulent flux term specification via run time params.
- replace CPP switches with run time switches to facilitate testing
- retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX, GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR
- added runtime parameter : SEAICEturbFluxFormula
- move Mcphee constants to SEAICE_PARAMS.h
- seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula;
  SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply); remove
  seaice_summary call (moved to seaice_init_fixed)
- seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on
  SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms)
- seaice_summary.F : add missing report of read turbulent flux term set up (and SITRACER).
- seaice_check.F : check range; inform and stop if retired CPPs are used (incl. SEAICE_AGE).
- seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without
	CPP switch, same computation as before for the different options.


Revision 1.57 - (view) (download) (annotate) - [select for diffs]
Tue Feb 7 02:19:14 2012 UTC (12 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.56: +1 -5 lines
Diff to previous 1.56
Remove option SEAICE_SOLVE4TEMP_LEGACY


Revision 1.56 - (view) (download) (annotate) - [select for diffs]
Fri Feb 3 13:34:31 2012 UTC (12 years, 3 months ago) by gforget
Branch: MAIN
Changes since 1.55: +1 -4 lines
Diff to previous 1.55
- removal of the old way of seaice age tracer, which is now replaced by particular cases of SITRACER.
- retired params : SEAICEadvAge, SEAICEadvSchAge, SEAICEdiffKhAge, IceAgeTrFile.
- added to SITRACER : IceAgeTrFile, check pickups, monitor, output.


Revision 1.55 - (view) (download) (annotate) - [select for diffs]
Sat Dec 24 01:09:40 2011 UTC (12 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63h, checkpoint63i
Changes since 1.54: +9 -7 lines
Diff to previous 1.54
move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h",
outside of the #ifdef ALLOW_THISPKG / #endif block.


Revision 1.54 - (view) (download) (annotate) - [select for diffs]
Mon Dec 19 16:22:26 2011 UTC (12 years, 4 months ago) by mlosch
Branch: MAIN
Changes since 1.53: +6 -1 lines
Diff to previous 1.53
More useless code saved for posterity:
FV-discretization of the B-grid LSOR solver, turn on with
SEAICE_LSRBNEW. This solver also involves a slight re-organization
of the calling routine dynsolver, so that B and C-grid code look a
a little more alike.


Revision 1.53 - (view) (download) (annotate) - [select for diffs]
Fri Dec 16 22:52:52 2011 UTC (12 years, 4 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint63g
Changes since 1.52: +3 -1 lines
Diff to previous 1.52
- added SEAICE_HEAT_CONSERV_FIX as undef in SEAICE_OPTIONS.h


Revision 1.52 - (view) (download) (annotate) - [select for diffs]
Fri Oct 21 15:33:25 2011 UTC (12 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63d, checkpoint63e, checkpoint63f
Changes since 1.51: +3 -1 lines
Diff to previous 1.51
add missing "#ifdef ALLOW_SEAICE / #endif"
 (but always include CPP_OPTIONS.h ; to become new standard)


Revision 1.51 - (view) (download) (annotate) - [select for diffs]
Thu Jun 9 20:34:14 2011 UTC (12 years, 11 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint62z, checkpoint63, checkpoint63a, checkpoint63b, checkpoint63c
Changes since 1.50: +8 -1 lines
Diff to previous 1.50
- generic seaice tracer CPP options (ALLOW_SITRACER & ALLOW_SITRACER_ADVCAP).


Revision 1.50 - (view) (download) (annotate) - [select for diffs]
Fri May 27 23:27:15 2011 UTC (12 years, 11 months ago) by gforget
Branch: MAIN
Changes since 1.49: +6 -4 lines
Diff to previous 1.49
- use Ian Fenty's capping formulas for actual ice
  thickness thoughout EVOLUTION branch.
- put treatment pathological case #2) in CPP brackets
  (ALLOW_AVOID_INFINITESIMAL_AREA, undef by default).
- update global_ocean.cs32x15 and 1D_ocean_ice_column
  results accordingly


Revision 1.49 - (view) (download) (annotate) - [select for diffs]
Thu Apr 28 02:06:31 2011 UTC (13 years ago) by ifenty
Branch: MAIN
CVS Tags: checkpoint62x, checkpoint62y
Changes since 1.48: +2 -2 lines
Diff to previous 1.48
Renaming of compile time flag SEAICE_SALINITY to SEAICE_VARIABLE_SALINITY and
SEAICE_salinity to SIsalFRAC.

Added logical checks for the use of the retired variable names in
 seaice_readparms and seaice_check.

 ----------------------------------------------------------------------
 Modified Files:
 	pkg/autodiff/autodiff_restore.F pkg/autodiff/autodiff_store.F
 	pkg/obcs/obcs_apply_seaice.F pkg/seaice/SEAICE.h
 	pkg/seaice/SEAICE_OPTIONS.h pkg/seaice/SEAICE_PARAMS.h
 	pkg/seaice/seaice_ad_check_lev1_dir.h
 	pkg/seaice/seaice_advdiff.F pkg/seaice/seaice_check.F
 	pkg/seaice/seaice_diagnostics_state.F
 	pkg/seaice/seaice_growth.F pkg/seaice/seaice_init_varia.F
 	pkg/seaice/seaice_model.F pkg/seaice/seaice_monitor.F
 	pkg/seaice/seaice_output.F pkg/seaice/seaice_read_pickup.F
 	pkg/seaice/seaice_readparms.F pkg/seaice/seaice_write_pickup.F
 ----------------------------------------------------------------------


Revision 1.48 - (view) (download) (annotate) - [select for diffs]
Mon Mar 7 03:10:18 2011 UTC (13 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62u, checkpoint62v, checkpoint62w
Changes since 1.47: +1 -6 lines
Diff to previous 1.47
remove SEAICE_AGE_VOL


Revision 1.47 - (view) (download) (annotate) - [select for diffs]
Fri Mar 4 19:11:19 2011 UTC (13 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62t
Changes since 1.46: +3 -3 lines
Diff to previous 1.46
remove tabs


Revision 1.46 - (view) (download) (annotate) - [select for diffs]
Wed Feb 23 21:12:45 2011 UTC (13 years, 2 months ago) by dimitri
Branch: MAIN
Changes since 1.45: +3 -1 lines
Diff to previous 1.45
Reverting seaice_growth to v 1.111 in order to have code with exact bit
 compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge
 CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced
 runtime flag SEAICEareaFormula is kept but is inactive
 The code is now consistent with
 MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge/documentation/Seaice_Growth_Forward_and_Adjoint_comparisons.pdf
Modified Files:
 doc/tag-index pkg/seaice/SEAICE_OPTIONS.h
 pkg/seaice/seaice_diagnostics_init.F
 pkg/seaice/seaice_growth.F
 verification/global_ocean.cs32x15/code/SEAICE_OPTIONS.h
 verification/global_ocean.cs32x15/code_ad/SEAICE_OPTIONS.h


Revision 1.45 - (view) (download) (annotate) - [select for diffs]
Mon Feb 14 23:51:07 2011 UTC (13 years, 2 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint62s
Changes since 1.44: +1 -3 lines
Diff to previous 1.44
- replace d_AREAbyOCN with d_AREA, which is now split in d_AREAbyOCN/d_AREAbyATM_cover/d_AREAbyATM_open
- simplify notations -- d_HEFFbyOCNonICE->d_HEFFbyOCN, d_HEFFbyATMonOCN-> d_HEFFbyATM, etc.
- introduce SEAICEareaFormula run time parameter, which selects the recipe for
  computing the ice cover tendency from effective thickness tendencies. It ranges between 1 and 3:
  -SEAICEareaFormula=1	default in LEGACY branch
  -SEAICEareaFormula=2	default in EVOLUTION branch
  -SEAICEareaFormula=3	Ian Fenty's recipe
- remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using SEAICEareaFormula


Revision 1.44 - (view) (download) (annotate) - [select for diffs]
Thu Feb 10 12:01:18 2011 UTC (13 years, 3 months ago) by gforget
Branch: MAIN
Changes since 1.43: +4 -1 lines
Diff to previous 1.43
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's.
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to also melt ice.


Revision 1.43 - (view) (download) (annotate) - [select for diffs]
Wed Feb 9 12:27:14 2011 UTC (13 years, 3 months ago) by gforget
Branch: MAIN
Changes since 1.42: +4 -1 lines
Diff to previous 1.42
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty).


Revision 1.42 - (view) (download) (annotate) - [select for diffs]
Fri Nov 19 22:14:53 2010 UTC (13 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62o, checkpoint62p, checkpoint62q, checkpoint62r
Changes since 1.41: +2 -2 lines
Diff to previous 1.41
changed to "#define SEAICE_GROWTH_LEGACY"
(will set it back to #undef once it's tested in one of the verification exp)


Revision 1.41 - (view) (download) (annotate) - [select for diffs]
Thu Oct 28 23:11:02 2010 UTC (13 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62n
Changes since 1.40: +26 -8 lines
Diff to previous 1.40
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h :
 this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH &
 SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY


Revision 1.40 - (view) (download) (annotate) - [select for diffs]
Wed Oct 6 21:53:44 2010 UTC (13 years, 7 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint62m
Changes since 1.39: +4 -1 lines
Diff to previous 1.39
free drift complementary pieces.


Revision 1.39 - (view) (download) (annotate) - [select for diffs]
Fri Sep 3 23:33:49 2010 UTC (13 years, 8 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint62k, checkpoint62l
Changes since 1.38: +6 -1 lines
Diff to previous 1.38
SEAICE_AGE_VOL: adding option to use volume instead of area for integrating SEAICE_AGE


Revision 1.38 - (view) (download) (annotate) - [select for diffs]
Mon Mar 1 23:46:13 2010 UTC (14 years, 2 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint62c, checkpoint62d, checkpoint62e, checkpoint62f, checkpoint62g, checkpoint62h, checkpoint62i, checkpoint62j
Changes since 1.37: +8 -9 lines
Diff to previous 1.37
indenting #ifdef's for readability


Revision 1.37 - (view) (download) (annotate) - [select for diffs]
Mon Oct 26 08:38:53 2009 UTC (14 years, 6 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint61y, checkpoint61z, checkpoint62, checkpoint62a, checkpoint62b
Changes since 1.36: +7 -1 lines
Diff to previous 1.36
 - add CPP flag to include clipping of zeta in EVP code;
   although clipping of zeta is not necessary for EVP and not recommended
   it was done by default, therefore the flag is defined by default


Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Fri Oct 23 08:10:45 2009 UTC (14 years, 6 months ago) by mlosch
Branch: MAIN
Changes since 1.35: +4 -1 lines
Diff to previous 1.35
 - add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default)


Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Fri Jul 31 03:09:05 2009 UTC (14 years, 9 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint61u, checkpoint61v, checkpoint61w, checkpoint61x
Changes since 1.34: +1 -8 lines
Diff to previous 1.34
removing climatological forcing option and comments from pkg/seaice


Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Thu Jun 4 17:27:17 2009 UTC (14 years, 11 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint61p, checkpoint61q, checkpoint61r, checkpoint61s, checkpoint61t
Changes since 1.33: +8 -1 lines
Diff to previous 1.33
Added SEAICE_CLIM_AIR code, which permits modulation of surface air
temperature and humidity over sea ice based on climatological values.


Revision 1.33 - (view) (download) (annotate) - [select for diffs]
Wed Mar 18 13:48:53 2009 UTC (15 years, 1 month ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint61l, checkpoint61m, checkpoint61n, checkpoint61o
Changes since 1.32: +13 -12 lines
Diff to previous 1.32
change a few defaults:
B-grid flags (not tested in verification, so no effect)
turn on flooding by default
turn on advection of snow by default


Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Wed Dec 17 03:33:29 2008 UTC (15 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint61g, checkpoint61h, checkpoint61i, checkpoint61j, checkpoint61k
Changes since 1.31: +4 -1 lines
Diff to previous 1.31
added sea ice age tracer;  #define SEAICE_AGE in SEAICE_PARAMS.h


Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Wed Jan 16 09:47:44 2008 UTC (16 years, 3 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint59n, checkpoint59o, checkpoint59p, checkpoint59q, checkpoint59r, checkpoint60, checkpoint61, checkpoint61a, checkpoint61b, checkpoint61c, checkpoint61d, checkpoint61e, checkpoint61f
Changes since 1.30: +5 -3 lines
Diff to previous 1.30
  add a new flag SEAICEuseTEM to use a slightly different
  ice rheology (so-called truncated ellipse, that gets rid of tensile stress);
  for now this is only available for the C-grid code and also within
  #ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code
  default is to not use it.


Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Fri Jan 11 19:59:28 2008 UTC (16 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59m
Changes since 1.29: +1 -5 lines
Diff to previous 1.29
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t)
  and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature


Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Fri Dec 14 21:52:01 2007 UTC (16 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59l
Changes since 1.28: +5 -1 lines
Diff to previous 1.28
  - reformulated availHeat in seaice_growth.F to be independent of AREA


Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Wed Dec 5 07:28:29 2007 UTC (16 years, 5 months ago) by dimitri
Branch: MAIN
Changes since 1.27: +2 -29 lines
Diff to previous 1.27
o pkg/seaice: removed SEAICE_FFIELDS.h and seaice_get_forcing.F
  seaice forcing fields can now be read only through pkg/exf


Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Sat Sep 15 01:38:59 2007 UTC (16 years, 7 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59g, checkpoint59h, checkpoint59i, checkpoint59j, checkpoint59k
Changes since 1.26: +4 -1 lines
Diff to previous 1.26
adding ice salinity HSALT as a prognostic variable


Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Tue Sep 4 23:16:37 2007 UTC (16 years, 8 months ago) by dimitri
Branch: MAIN
Changes since 1.25: +9 -11 lines
Diff to previous 1.25
changed/added comments for the SEAICE_TEST_ICE_STRESS_1
and for the EXPLICIT_SSH_SLOPE CPP flags


Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Wed Jul 18 22:53:34 2007 UTC (16 years, 9 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59e, checkpoint59f
Changes since 1.24: +5 -1 lines
Diff to previous 1.24
applied OBCS T/S mask to HEFFM sea ice mask
This fixes pkg/seaice OBCS problem but in my
opinion this information should eventually be transferred
to the GRID.h arrays: hFacC, maskC, etc.


Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Wed Jul 18 22:26:05 2007 UTC (16 years, 9 months ago) by dimitri
Branch: MAIN
Changes since 1.23: +4 -1 lines
Diff to previous 1.23
  * commented out cap of HICE: it helps keep ice thinner
  * reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option


Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Fri May 18 02:46:42 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59c, checkpoint59d
Changes since 1.22: +2 -1 lines
Diff to previous 1.22
remove ALLOW_SEAICE from exf pkg files and add #define ALLOW_RUNOFF
in SEAICE_OPTIONS.h


Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Mon May 14 14:39:21 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59b
Changes since 1.21: +17 -9 lines
Diff to previous 1.21
- case undef SEAICE_EXTERNAL_FORCING & defined SEAICE_EXTERNAL_FLUXES is not
  working with current implemetation: try to make it clear in SEAICE_OPTIONS.h
- limit the number of option combinations: stop if both SEAICE_EXTERNAL_FLUXES
   & ALLOW_ATM_WIND are #undef.
- add corresponding stops in seaice_check.F


Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Mon Apr 30 00:15:09 2007 UTC (17 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59a
Changes since 1.20: +4 -1 lines
Diff to previous 1.20
add all needed EXF #ifdef and define them in SEAICE_OPTIONS.h if not using EXF


Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Mon Apr 16 22:38:15 2007 UTC (17 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59
Changes since 1.19: +2 -2 lines
Diff to previous 1.19
change comments


Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Wed Feb 7 01:07:42 2007 UTC (17 years, 3 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint58v_post, checkpoint58w_post, checkpoint58x_post, checkpoint58y_post
Changes since 1.18: +4 -1 lines
Diff to previous 1.18
added "#undef ALLOW_SEAICE_FLOODING" to SEAICE_OPTIONS.h


Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Wed Dec 20 12:25:15 2006 UTC (17 years, 4 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint58t_post, checkpoint58u_post
Changes since 1.17: +2 -2 lines
Diff to previous 1.17
o fix multi-category seaice:
 - change cpp flag SEAICE_MULTILEVEL to more meaningful name:
   SEAICE_MULTICATEGORY
 - fix short wave heat flux
o replace field areaLoc by scalar variable


Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Tue Dec 19 00:14:47 2006 UTC (17 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.16: +4 -3 lines
Diff to previous 1.16
changes: SEAICE_CGRID is now the default (and allow to use EVP solver)


Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Wed Mar 22 14:55:36 2006 UTC (18 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58c_post, checkpoint58d_post, checkpoint58e_post, checkpoint58f_post, checkpoint58g_post, checkpoint58h_post, checkpoint58i_post, checkpoint58j_post, checkpoint58k_post, checkpoint58l_post, checkpoint58m_post, checkpoint58n_post, checkpoint58o_post, checkpoint58p_post, checkpoint58q_post, checkpoint58r_post, checkpoint58s_post
Changes since 1.15: +2 -2 lines
Diff to previous 1.15
fix typo


Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Mon Mar 20 21:36:12 2006 UTC (18 years, 1 month ago) by mlosch
Branch: MAIN
Changes since 1.14: +7 -1 lines
Diff to previous 1.14
  seaice: add an EVP solver following Hunke and Dukowicz (1997) and the
  documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in
  SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only
  with SEAICE_CGRID defined.
  Use at own risk.


Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Mon Mar 6 13:17:38 2006 UTC (18 years, 2 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint58b_post
Changes since 1.13: +6 -1 lines
Diff to previous 1.13
 - add c-grid version of the dynamic solver:
   + three new routines that are the c-grid substitute lsr, dynsolver
     and ostres
   + put a few fields that were local to dynsolver into global common
     blocks, so that I can move the computation of stresses etc into
     seaice_lsr (saves coding but may break the adjoint; Patrick, I am
     sorry!).
 - replace more hardwired parameters by runtime parameters
 - add ice masks that mask the rhs of the implicit solvers where there
   is no ice (commented out in seaice_dynsolver, because i am not sure
   if this works properly), eventually this should replace the clipping
   of ice velocities in seaice_dynsolver to +/-40cm/s.


Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Fri Jan 27 20:18:37 2006 UTC (18 years, 3 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint58a_post
Changes since 1.12: +9 -1 lines
Diff to previous 1.12
add a cpp-flag to include a simple formula for a salinity
depend freezing point of sea water at the surface


Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Sun Apr 17 00:25:46 2005 UTC (19 years ago) by edhill
Branch: MAIN
CVS Tags: checkpint57u_post, checkpoint57h_done, checkpoint57h_post, checkpoint57h_pre, checkpoint57i_post, checkpoint57j_post, checkpoint57k_post, checkpoint57l_post, checkpoint57m_post, checkpoint57n_post, checkpoint57o_post, checkpoint57p_post, checkpoint57q_post, checkpoint57r_post, checkpoint57s_post, checkpoint57t_post, checkpoint57v_post, checkpoint57w_post, checkpoint57x_post, checkpoint57y_post, checkpoint57y_pre, checkpoint57z_post, checkpoint58
Changes since 1.11: +5 -1 lines
Diff to previous 1.11
 o fix mnc flags in pkg/seaice so that they are "owned" by seaice,
   not mnc -- this mistake was found by JMC and is now corrected


Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Mon Dec 27 20:34:11 2004 UTC (19 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint57c_post, checkpoint57c_pre, checkpoint57d_post, checkpoint57e_post, checkpoint57f_post, checkpoint57f_pre, checkpoint57g_post, checkpoint57g_pre, eckpoint57e_pre
Changes since 1.10: +1 -4 lines
Diff to previous 1.10
o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice


Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Wed Dec 22 00:49:36 2004 UTC (19 years, 4 months ago) by dimitri
Branch: MAIN
Changes since 1.9: +17 -5 lines
Diff to previous 1.9
o pkg/seaice: some test code for ice-modified ocean stress


Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Fri Mar 12 22:18:15 2004 UTC (20 years, 2 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint52m_post, checkpoint52n_post, checkpoint53, checkpoint53a_post, checkpoint53b_post, checkpoint53b_pre, checkpoint53c_post, checkpoint53d_post, checkpoint53d_pre, checkpoint53f_post, checkpoint53g_post, checkpoint54, checkpoint54a_post, checkpoint54a_pre, checkpoint54b_post, checkpoint54c_post, checkpoint54d_post, checkpoint54e_post, checkpoint54f_post, checkpoint55, checkpoint55a_post, checkpoint55b_post, checkpoint55c_post, checkpoint55d_post, checkpoint55d_pre, checkpoint55e_post, checkpoint55f_post, checkpoint55g_post, checkpoint55h_post, checkpoint55i_post, checkpoint55j_post, checkpoint56, checkpoint56a_post, checkpoint56b_post, checkpoint56c_post, checkpoint57, checkpoint57a_post, checkpoint57a_pre, checkpoint57b_post
Changes since 1.8: +3 -4 lines
Diff to previous 1.8
updating verification/lab_sea


Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Mon Nov 24 04:39:48 2003 UTC (20 years, 5 months ago) by dimitri
Branch: MAIN
CVS Tags: branch-netcdf, checkpoint52c_post, checkpoint52d_post, checkpoint52d_pre, checkpoint52e_post, checkpoint52e_pre, checkpoint52f_post, checkpoint52f_pre, checkpoint52h_pre, checkpoint52i_post, checkpoint52i_pre, checkpoint52j_post, checkpoint52j_pre, checkpoint52k_post, checkpoint52l_post, checkpoint52l_pre, hrcube4, hrcube5, hrcube_1, hrcube_2, hrcube_3
Branch point for: netcdf-sm0
Changes since 1.7: +4 -1 lines
Diff to previous 1.7
pkg/seaice option SEAICE_EXTERNAL_FORCING requires pkg/exf


Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Thu Oct 9 04:19:20 2003 UTC (20 years, 7 months ago) by edhill
Branch: MAIN
CVS Tags: checkpoint51i_post, checkpoint51k_post, checkpoint51l_post, checkpoint51l_pre, checkpoint51m_post, checkpoint51n_post, checkpoint51n_pre, checkpoint51o_post, checkpoint51o_pre, checkpoint51p_post, checkpoint51q_post, checkpoint51r_post, checkpoint51s_post, checkpoint51t_post, checkpoint51u_post, checkpoint52, checkpoint52a_post, checkpoint52a_pre, checkpoint52b_post, checkpoint52b_pre, ecco_c52_e35
Branch point for: branch-nonh, checkpoint51n_branch, tg2-branch
Changes since 1.6: +9 -5 lines
Diff to previous 1.6
 o first check-in for the "branch-genmake2" merge
 o verification suite as run on shelley (gcc 3.2.2):

Wed Oct  8 23:42:29 EDT 2003
                T           S           U           V
G D M    c        m  s        m  s        m  s        m  s
E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .
N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d
2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  .

OPTFILE=NONE

Y Y Y Y 13 16 16 16  0 16 16 16 16 16 16 16 16 13 12  0  0 pass  adjustment.128x64x1
Y Y Y Y 16 16 16 16  0 16 16 16 16 16 16  0  0 16 16  0  0 pass  adjustment.cs-32x32x1
Y Y Y Y 16 16 16 16  0 16 16 16 16 16 16 22  0 16 16 22  0 pass  adjust_nlfs.cs-32x32x1
Y Y Y Y -- 13 13 16 16 13 13 13 13 16 16 16 16 16 16 16 16 N/O   advect_cs
Y Y Y Y -- 22 16 16 16 16 16 16 13 16 16 16 16 16 16 16 16 N/O   advect_xy
Y Y Y Y -- 13 16 13 16 16 16 16 16 16 16 22 16 16 16 16 16 N/O   advect_xz
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass  aim.5l_cs
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 16 16 16 16 13 16 pass  aim.5l_Equatorial_Channel
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 13 16 16 13 13 16 pass  aim.5l_LatLon
Y Y Y Y 13 16 16 16 16 16 16 16 16 16 13 12 13 13 16 13 16 pass  exp0
Y Y Y Y 14 16 16 16 16 16 16 16 22 16 16 16 13 16 16 22 16 pass  exp1
Y Y Y Y 13 13 16 13 16 16 16 16 16 13 13 16 16 13 13 13 13 pass  exp2
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass  exp4
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 22 16 pass  exp5
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass  front_relax
Y Y Y Y 14 16 16 13 13 16 16 13 13 16 13 13 16 12 13 13 16 pass  global_ocean.90x40x15
Y Y Y Y 10 16 16 13 13 16 13 16 16 13 13 13 13 16 16 13 16 FAIL  global_ocean.cs32x15
Y Y Y Y  6 11 12 13 13 12 13 16 13  9  9  9  9 10  9  9 11 FAIL  global_ocean_pressure
Y Y Y Y 14 16 16 13 16 16 16 13 13 13 13 13 16 12 16 13 16 pass  global_with_exf
Y Y Y Y 14 16 16 16 16 16 16 16 16 11 13 22 13 16 16  9 16 pass  hs94.128x64x5
Y Y Y Y 13 16 16 16 16 16 16 16 16 11 16 16 16 13 16 22 13 pass  hs94.1x64x5
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 13 13 16 16 22 13 pass  hs94.cs-32x32x5
Y Y Y Y 10 10 16 13 13 16 16 16 22 16 13 13 13 13 13 22 13 FAIL  ideal_2D_oce
Y Y Y Y  8 16 16 16 16 16 16 16 16 13 13  8 16 16 16 16 16 FAIL  internal_wave
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 13 22 13 13 13 22 16 pass  inverted_barometer
Y Y Y Y 12 16 16 16 16 16 16 16 16 16 13 12 13 13 13 13 13 FAIL  lab_sea
Y Y Y Y 11 16 16 16 16 16 16 16 13 13 13 12 13 16 13 12 13 FAIL  natl_box
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass  plume_on_slope
Y Y Y Y 13 16 16 16 16 13 16 16 16 16 16 16 16 13 16 16 16 pass  solid-body.cs-32x32x1


Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Thu Aug 7 02:31:29 2003 UTC (20 years, 9 months ago) by dimitri
Branch: MAIN
CVS Tags: branchpoint-genmake2, checkpoint51f_post, checkpoint51f_pre, checkpoint51g_post, checkpoint51h_pre, checkpoint51i_pre, checkpoint51j_post
Branch point for: branch-genmake2
Changes since 1.5: +4 -0 lines
Diff to previous 1.5
o Added on-the-fly spatial interpolation capability
    "USE_EXF_INTERPOLATION" to pkg/exf.
  - This is a temporary Cartesian-grid hack until
    the super-duper ESMF coupler becomes available.
  - See verification/global_with_exf/README for usage example.
  - Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid
    flags and modified pkg/seaice accordingly.
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
    and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
    non-local transport term.


Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Fri May 23 20:19:15 2003 UTC (20 years, 11 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint50g_post, checkpoint50h_post, checkpoint50i_post, checkpoint51, checkpoint51a_post, checkpoint51b_post, checkpoint51b_pre, checkpoint51c_post, checkpoint51d_post, checkpoint51e_post
Changes since 1.4: +5 -0 lines
Diff to previous 1.4
checkpoint50g_post
o merged with release1_p17 (pkg/seaice and verification/lab_sea)
  - added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
  - LSR sea-ice dynamic solver moved to SouthWest B-grid location and
    made the default because of faster convergence than ADI


Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Tue Feb 18 05:33:55 2003 UTC (21 years, 2 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint48f_post, checkpoint48g_post, checkpoint48h_post, checkpoint48i_post, checkpoint49, checkpoint50, checkpoint50a_post, checkpoint50b_post, checkpoint50b_pre, checkpoint50c_post, checkpoint50c_pre, checkpoint50d_post, checkpoint50d_pre, checkpoint50e_post, checkpoint50e_pre, checkpoint50f_post, checkpoint50f_pre
Changes since 1.3: +1 -1 lines
Diff to previous 1.3
Merging from release1_p12:
o Modifications for using pkg/exf with pkg/seaice
  - improved description of the various forcing configurations
  - added basic radiation bulk formulae to pkg/exf
  - units/sign fix for evap computation in exf_getffields.F
  - updated verification/global_with_exf/results/output.txt
o Added pkg/sbo for computing IERS Special Bureau for the Oceans
  (SBO) core products, including oceanic mass, center-of-mass,
  angular, and bottom pressure (see pkg/sbo/README.sbo).
o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F
  to avoid negative values in shallow regions.
  - updated verification/natl_box/results/output.txt
  - updated verification/lab_sea/results/output.txt
o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F
o Added useSingleCpuIO option (see PARAMS.h).
o Updated useSingleCpuIO option in mdsio_writefield.F to
  work with multi-field files, e.g., for single-file pickup.
o pkg/seaice:
  - bug fix in growth.F: QNET for no shortwave case
  - added HeffFile for specifying initial sea-ice thickness
  - changed SEAICE_EXTERNAL_FLUXES wind stress implementation
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf,
  kpp_transport_t.F, forward_step.F, and the_main_loop.F
o pkg/seaice:
  - adjoint-friendly modifications
  - added a SEAICE_WRITE_PICKUP at end of the_model_main.F


Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Sat Dec 28 10:11:11 2002 UTC (21 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint47f_post, checkpoint47g_post, checkpoint47h_post, checkpoint47i_post, checkpoint47j_post, checkpoint48, checkpoint48a_post, checkpoint48b_post, checkpoint48c_post, checkpoint48c_pre, checkpoint48d_post, checkpoint48d_pre, checkpoint48e_post
Branch point for: c24_e25_ice, ecco-branch
Changes since 1.2: +21 -6 lines
Diff to previous 1.2
checkpoint47f_post
Merging from release1_p10:
o modifications for using pkg/exf with pkg/seaice
  - pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
    and SEAICE_EXTERNAL_FLUXES
  - pkg/exf CPP options EXF_READ_EVAP and
    EXF_NO_BULK_COMPUTATIONS
  - usage examples are Experiments 8 and 9 in
    verification/lab_sea/README
  - verification/lab_sea default experiment now uses
    pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf


Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Tue Nov 12 20:47:27 2002 UTC (21 years, 6 months ago) by heimbach
Branch: MAIN
CVS Tags: branch-exfmods-tag, checkpoint46n_post, checkpoint47, checkpoint47a_post, checkpoint47b_post, checkpoint47c_post, checkpoint47d_post, checkpoint47d_pre, checkpoint47e_post
Branch point for: branch-exfmods-curt
Changes since 1.1: +26 -0 lines
Diff to previous 1.1
Merging from release1_p8 branch:
o New package: pkg/seaice
  Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle).
  The sea-ice code is based on Hibler (1979-1980).
  Two sea-ice dynamic solvers, ADI and LSR, are included.
  In addition to computing prognostic sea-ice variables and diagnosing
  the forcing/external data fields that drive the ocean model,
  SEAICE_MODEL also sets theta to the freezing point under sea-ice.
  The implied surface heat flux is then stored in variable
  surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and
  kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the
  non-local transport term.  Because this call precedes model
  thermodynamics, temperature under sea-ice may not be "exactly" at
  the freezing point by the time theta is dumped or time-averaged.


Revision 1.1
Mon Nov 11 22:01:21 2002 UTC (21 years, 6 months ago) by heimbach
Branch: MAIN
Branch point for: release1
FILE REMOVED
file SEAICE_OPTIONS.h was initially added on branch release1.


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.22