Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint64q: | (view) (download) (annotate) |
| Sticky Tag: |
add Adams-Bashforth2 time discretization for ice dynamics; so far only for JFNK-solver - requires an additional time level that is stored in the pickup - you can start with AB2 from a pickup without this time level with pickupStrictlyMatch = .false.
change to f77 syntax (to enable to compile with g77 & pgf77)
removing all "ToM" comments; updating comment on Hlimit
- add a metric based on grid cell area to SEAICE_SCALPROD
initialise counters for JFNK diagnostics
Step 1 of merging ice-thickness distribution (ITD) code from MITgcm_contrib/torge/itd/code/ to main repository (author: Torge Martin)
- rename parameters: SIsalFrac to SEAICE_saltFrac & SIsal0 to SEAICE_salt0; - remove old parameters ( SEAICE_freeze, SEAICEturbFluxFormula, SEAICE_gamma_t, SEAICE_gamma_t_frz, SEAICE_availHeatTaper & SEAICE_availHeatFracFrz) from SEAICE_PARMS.h ; - move setting of facOpenGrow/Melt from SEAICE_INIT_FIXED to SEAICE_READPARMS (safer multi-threaded setting); always set SEAICEuseEVP; - setting of ocean-ice turb. flux coeff: moved from SEAICE_CHECK to SEAICE_READPARMS & SEAICE_INIT_FIXED (this fixes wrong summary report); stop if multiple specifications for the same coeff; make sure default SEAICE_mcPheePiston is compatible with drF(1) & deltaT.
add SEAICE_SIZE.h anywhere SEAICE.h is included
- 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.
- SItracer : added run time params, and allow coupling to ocn salinity. -> seaice_tracer_phys.F : use new run time params remove some logic that is now better placed in init & check. when SEAICE_salinityTracer is set, which implies SIsal0&SIsalFrac=0, activate salinity tracer coupling with ocn (i.e. saltFlux & saltPlumeFlux) This feature used to work but is due for further re-testing. -> seaice_readparms.F : init and read new run time params from SEAICE_TRACER.h -> seaice_init_fixed.F : set SITR params accordingly for 'age', salinity', 'one', ridge' if SEAICE_salinityTracer is set, then reset to SIsal0&SIsalFrac=0. -> seaice_check.F : stop if ALLOW_SITRACER is undef and SEAICE_salinityTracer or SEAICE_ageTracer run time is set prevent erroneous spec. of SItrFromOceanFrac/SItrFromFloodFrac (must be in [0. 1.]) restrict use of SItrFromOceanFrac/SItrFromFloodFrac to salinity case (for now at least) + a bit of re-organization
- 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.
- 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
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.
master thread always set SWFracB
minor edit around UVM setting.
Initialisation for FV-discretization of the B-grid LSOR solver, turn on with SEAICE_LSRBNEW.
- fix a bug in the initialisation of the second metric terms
k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0.
- this affects all seaice configurations with useCurviLinearGrid = .true.
and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms
= .true. (default)
- the only verification experiment affected is global_ocean.cs32x15:
icedyn, seaice, and seaice_dynmix (AD)
avoid unbalanced quote (single or double) in commented line
move initialisation of Time-Ave variables to seaice_init_varia.F
move MNC calls from _readparms.F to _init_fixed.F (called after ini_model_io)
Changed initialisation and re-initialisations of seaiceMaskU/V
- move initialization of grid variables from init_varia and init_fixed where possible
More _IF fixes.
remove unused variables (get less warnings)
o split seaice_init into _fixed, _varia o add first version of diagnostics interface (may need improvements, additions, etc)
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.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |