Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint62j: | (view) (download) (annotate) |
| Sticky Tag: |
Fixing bug in treatment of SaltPlumeSouthernOcean Flag should be applied prior to modifying surfaceForcingS Moved SaltPlumeSouthernOcean to seaice_growth.F
account for melting in seaice age evolution: tested by Pierre
remove "recip_QS" (not used and wrong)
re-introduce global field frWtrAtm for the case of ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined
revert to version 1.61, what was I thinking?
- move if-statement out of loop for better vectorization
third and step of replacing 3D versions of UICE,VICE,HEFF,AREA by 2D versions. Keep your fingers crossed.
first steps in cleaning up the 3-time levels of UICE,VICE,HEFF,AREA: 1. introduce fields for time step (N-1 = *Nm1) 2. do not use levels 2 and 3 anymore (but they are still around) these changes probably break the adjoint, but the pickup is still working, so I am stopping now to give P. a chance to fix the adjoint if necessary and then I will get rid of the 3D fields altogether carefully taking into account the pickup (not clear how).
o adding JM's doc/diags_changes.txt: a very useful summary that I refer to all the time o adding pkg/seaice diagnostics for atmospheric and oceanic heat flux and for atmospheric and oceanic ice growth
Added SEAICE_CLIM_AIR code, which permits modulation of surface air temperature and humidity over sea ice based on climatological values.
This check is redundant. It is already included in seaice_check.F
adding HO to parameters that can be separately specified in North and South
forgot a few instances of 330., when replace this number by a runtime parameter SEAICE_rhoSnow. There is still one instance in cost_ice_test.F, which I am not touching
simplify and operation that does not affect the verification experiments (I wonder why)
turn a few hard wired parameters into run time parameters this does not change any results
Update tamc.h for single-prec comlev option
changing ice age to effective ice age
added sea ice age tracer; #define SEAICE_AGE in SEAICE_PARAMS.h
Make frWtrAtm global for FW balancing in presence of sea-ice, and I need it outside of seaice code. Also move DIAGNOSTICS_FILL(frWtrAtm ... (hope I'm not making a betise).
fix a bug in diagnostic SIatmFW and changed the units from m/s to kg/m^2/s
Rearrange some almost impenetrable #ifdef blocks which reach across I,J loops (wow).
fix two diagnostics after someone removed the overlaps of GHEFF
o Update stores after recent IF (DIFFERENT_MULTIPLE ... o re-initialise to break some dependencies (not sure if all correct) o turn some scalares into tw-dim.
removed uneeded arrays KGEO, GWATX, and GWATY from SEAICE_CGRID code
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature
o pkg/seaice/seaice_growth.F: use a different time constant for freezing ice due to supercooled sea water, hardwired to SEAICE_deltaTtherm/0.1
- reformulated availHeat in seaice_growth.F to be independent of AREA
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL or U/VICE from U/VWIND before computing U/VSTRESS
pkg/seaice: removed some unused halos
o pkg/seaice: removed SEAICE_FFIELDS.h and seaice_get_forcing.F seaice forcing fields can now be read only through pkg/exf
added pkg/salt_plume by gathering code, which were previously spread around various files in model/inc and model/src results remain numerically identical to before, as a first step towards adding more options, etc., to this package
o add new diagnostics to seaice: advective, diffusive fluxes (only for multidim-advection, for scheme 2 they are not filled) and transports, thermodynamic growth rates
Change EmPmR units: from m/s to kg/m2/s
Add CPP option to remove code for precise gradient checks (for testing) SEAICE_EXCLUDE_FOR_EXACT_AD_TESTING
Update lab_sea adjoint output which now reverts to LSR solver and SEAICE_SALT.
Include SEAICE_SALINITY in adjoint.
Committing An Nguyen's modifications to SALT_PLUME code. This includes addition of a saltPlumeFlux array to FFIELDS and of routine plumefrac.F
oops! * -> / ... at least I found it before JM got to it ;-)
initialization of variable saltfluxadjust
define SEAICE_salinity as a fraction of the model's surface level salinity
reordering for some extreme scenarios
initial HSALT set to ICE2WATR*rhoConstFresh*SEAICE_salinity
A simple HSALT time stepping equation has been checked in.
Updating treatment of sea ice salinity. HSALT units are now g / m^2,
adding ice salinity HSALT as a prognostic variable
replace "recip_rhoConst*horiVertRatio" by mass2rUnit and "rhoConst*recip_horiVertRatio" by rUnit2mass
Break a few loops and CADJ STORE.
* commented out cap of HICE: it helps keep ice thinner * reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option
* replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F
* added SEAICE_availHeatFrac, which specifies fraction of surface level
heat content used to melt or grow ice (this is a placeholder until
Ian checks in code meant to reduce adjoint sensitivities).
removing bug fix: 24-Jun-07: bug fix for SEAICE_salinity: salt rejection was being double-counted recovering previous version of verification/lab_sea/results/output* files SEAICE_salinity=0 should not change results if fix is correct changing sign of saltWtrIce to saltFlux it should oppose contribution to EmPmR, which has opposite sign convention
bug fix for SEAICE_salinity: salt rejection was being double-counted
o pkg/seaice: added computation of saltFlux in seaice_growth; For time being, sea ice salinity is assumed constant contribution of snow flooding to freshening of sea ice is neglected. SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it defaults to 0.0 in order to maintain backward compatibility. Typical values for SEAICE_salinity are 4 to 10 g/kg.
add diagnostics for Net fresh-water flux from the atmosphere.
remove ALLOW_SEAICE from exf pkg files and add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h
add all needed EXF #ifdef and define them in SEAICE_OPTIONS.h if not using EXF
make pLoad & sIceLoad always available (but still only used if
ATMOSPHERIC_LOADING is #define).
- add myThid to argument list of seaice_budget_ice/ocean
fix a bug in the flooding algorithm: turn off the snow machine
more comments, try to clarify the use of precip(itation)
rewritting parts of growth in an effort to make it comprehensable: - give resonalbe variable names - avoid reusing the same variable for different purposes (still some instances left for the next time around) - lets hope for the adjoint (but that should actually be happier now)
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
transfering all regularization of local ice thickness to seaice_growth as a first step towards possibly getting rid of A22 alltogether
fix bug reported by DM
Just remove one CADJ STORE (and add a comment marking sensitive piece of code)
- replace area(i,j,3,bi,bj) by a local array. - rearrange routine a little more (Patrick is going to love this, but I moved the store directives as well): move the budget computations (seaice_budget_ocean/ice) to the beginning of the routine. Results are not changed and I don't expect any problems for the adjoint because the switched blocks are completely independent.
Updating seaice adjoint, step 1 (everything, except SEAICE_EVP).
overhaul of thermodynamics - growth.F and groatb.F are replaced by new routine seaice_growth.F - budget.F is replaced by two new routines seaice_budget_ocean/ice.F - move a few global fields out of SEAICE.h into seaice_growth.F and make them 2D (FICE/QNETO/ ...) - remove FO (it is the same as QNETO) - introduce a few local fields to avoid modifying external fields such as atemp, etc. lab_sea does not change, but hopefully it will be easier for Patrick do the adjoint
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 |