Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to MAIN: | (view) (download) (annotate) |
| Sticky Tag: |
rename seaice_do_diags.F --> seaice_output.F ; remove PLOT_FIELD_XYZ calls ; writing 3-levels field: skip copy to temp array by calling the right pkg/rw S/R
fix wrong type of EXCH for "arr" + change macros (EXCH & GLOBAL_SUM/MAX) sufix _R4/_R8 to _RS/_RL when applied to _RS/_RL variable
put local array "arr" in common block (for multi-threaded without SingleCpuIO)
added sea ice age tracer; #define SEAICE_AGE in SEAICE_PARAMS.h
o pkg/seaice: removed SEAICE_FFIELDS.h and seaice_get_forcing.F seaice forcing fields can now be read only through pkg/exf
adding ice salinity HSALT as a prognostic variable
move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this requires a new routine: seaice_diagnostics_fill.F
fix a diagnostics (SIpress was eta instead of press)
remove ALLOW_SEAICE from exf pkg files and add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h
add ice strength, bulk and shear viscosities to list of diagnostics for even better analyses
change temporary array(s) from RS to RL
add diagnostics of principal stress components normalised by pressure for checking the yield curve, this requires an extra 5 2D fields, too bad.
fixed DIAGNOSTICS_FILL usage
o Only output 1st level of AREA, HEFF, etc. fields (reserve 'I' option in diagnostics for future)
o split seaice_init into _fixed, _varia o add first version of diagnostics interface (may need improvements, additions, etc)
- write seaice fields at 1rst & last iter (dumpInitAndLast). - add snow thickness to snap-shot output list
all threads call WRITE_FLD S/R (needed if using SingleCpuIO) (no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R)
change seaice_monitor: - independant of main-monitor (write it's own mnc file) - called from the end of S/R SEAICE_DO_DIAGS
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.
move calendarDumps from "data" to "data.cal" and clean-up the code with a simple call to pkg/cal S/R: CAL_TIME2WRITE (the former piece of code started to spread over newly checked-in S/R) add useEXF & useCAL flags (for now, set in hard-coded way)
copy the halos to the array that ends up in the mnc or mdsio file in order to avoid funny values in the files (it cost me two hours to figure out what that was, while I was looking for bugs in the exchanges!)
o make mnc honor the writeBinaryPrec flag for all the non-pickup and non-diagnostics output types
o fix an uninitialized variable problem introduced when seaice was MNC-ified a couple of months ago -- tested and works with both g77 and ifort v8.1
o fix SEAICE use of MNC for tave and snapshot output
o for mnc output, fill the 'T' coordinate var with myTime and create a separate 'iter' variable for iteration count
Implement I/O flags as they should be. This fix several (some of them tricky) consistency problems.
remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE and rename it: DIFFERENT_MULTIPLE
use baseTime as time origin ; DIFF_BASE_MULTIPLE replaces DIFFERENT_MULTIPLE
o mnc-ifying the seaice package
o parameter calendarDumps: when set, approximate months (30-31 days) and years (360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq, KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar months and years. Requires pkg/cal.
o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice
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
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
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
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
checkpoint47b_post
Merging from release1_p9:
o pkg/seaice
- removed GOTO's and added taf directives
- double precision constants to reduce the g77 (Linux)
to F77 (SGI) differences reported in release1_p8
o tools/genmake
- added SGI options
o verification/testscript
- updated to that of checkpoint47a_post
o verification/global_ocean.90x40x15/input/eedata
- modified for SGI f77 compatibility
o verification/lab_sea
- added description of sea-ice model
- added missing matlab routines
- added test of thermodynamics parallelization
Modified Files:
doc/tag-index pkg/seaice/SEAICE_FFIELDS.h
pkg/seaice/SEAICE_PARAMS.h pkg/seaice/adi.F
pkg/seaice/advect.F pkg/seaice/budget.F pkg/seaice/diffus.F
pkg/seaice/dynsolver.F pkg/seaice/groatb.F pkg/seaice/growth.F
pkg/seaice/lsr.F pkg/seaice/ostres.F
pkg/seaice/seaice_do_diags.F pkg/seaice/seaice_get_forcing.F
pkg/seaice/seaice_init.F pkg/seaice/seaice_model.F
pkg/seaice/seaice_readparms.F tools/genmake
verification/global_ocean.90x40x15/input/eedata
verification/lab_sea/README
verification/lab_sea/matlab/lookat_exp1.m
verification/lab_sea/matlab/lookat_exp2.m
verification/lab_sea/matlab/lookat_exp3.m
verification/lab_sea/matlab/lookat_exp4.m
verification/lab_sea/matlab/lookat_exp5.m
verification/lab_sea/matlab/lookat_exp6.m
verification/lab_sea/results/AREAtave.0000000010.data
verification/lab_sea/results/HEFFtave.0000000010.data
verification/lab_sea/results/UICEtave.0000000010.data
verification/lab_sea/results/VICEtave.0000000010.data
verification/lab_sea/results/output.txt
Added Files:
verification/lab_sea/seaice.ps
verification/lab_sea/matlab/lookat_exp7.m
verification/lab_sea/matlab/mmax.m
verification/lab_sea/matlab/mypcolor.m
verification/lab_sea/matlab/myquiver.m
verification/lab_sea/matlab/readbin.m
verification/lab_sea/matlab/wysiwyg.m
Removed Files:
verification/lab_sea/code/KPP_OPTIONS.h
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.
file seaice_do_diags.F 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.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |