Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint65k: | (view) (download) (annotate) |
| Sticky Tag: |
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h - AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h - CTRL_OPTIONS.h is needed when including ctrl.h
- new integer parameter "exf_debugLev" (default set to main model debugLevel) to replace logical switch "exf_verbose".
to use eaice-fraction from pkg/exf in other pkgs than pkg/seaice: rename CPP option EXF_ALLOW_SEAICE_RELAX to EXF_SEAICE_FRACTION and rename array obsSIce to exf_iceFraction
comment out most of the EXCH calls (fields used by main model or other pkgs are exchanged in EXF_MAPFIELDS).
- pkg/exf : added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h). - pkg/exf, autodiff, ctrl, ecco and seaice : remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones. - pkg/ctrl, ecco : allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL. Depending on useAtmWind, one is inactive, and the other is active (see exf_getffields.F/exf_getsurfacefluxes.F).
Extra treatment of precip, snowprecip
Part two of ECCO-CLIVAR code merges. Completes merge of seaice area relax. code. Requires unified CPP option EXF_ALLOW_SEAICE_RELAX to be set in EXF_OPTIONS.h since this pkg controls its I/O (and avoids second CPP option in SEAICE_OPTIONS.h)
remove/avoid un-used variables
refine debugLevel criteria when printing messages
merge exf_bulk_largeyeager04 into exf_bulkformulae because these
files are nearly the same anyway.
Step 2: do the actual merge
unfortunately requires updating lab_sea.salt_plume (6 matching digits),
and global_ocean.cs32x15.icedyn (only 11 matching digits)
avoid unbalanced quote (single or double) in commented line
change macros (EXCH & GLOBAL_SUM/MAX) sufix _R4/_R8 to _RS/_RL when applied to _RS/_RL variable
Update tamc.h for single-prec comlev option
Adding a capability to exf: read ice area from file.
Change output logic.
Need to separate adjoint snapshots to get correct adjoint atmospheric snapshots (in addition to adxx fields)
Modify one set of stores.
- implement A-grid / C-grid selection for wind-stress input files ; - call the appropriate EXCH ; add some consistency check .
Further exf cleanup: o change various "constants" into runtime parameters o cleaned-up Large&Yeager04 routine which should eventually replace exf_bulkformulae.F (changed names of S/R and CPP) and merged various ALLOW_ATM_WIND options
try to fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid
move EXF header files from lower_case.h to UPPER_CASE.h ; add missing cvs Header & Name
Adding Large & Yeager 2004 bulk formula code (ported from bulk_force package). Compiles and runs, but still needs comprehensive testing, I guess.
Add extra storing for case #undef ALLOW_ATM_WIND
change exf_monitor: - independant of main-monitor (write it's own mnc file) - called from the end of S/R EXF_GETFORCING
o add new fields wspeed, snowprecip (to be able to couple to thsice) o correct Stefan-Boltzmann constant o new parameter for longwave surface emittance o separate some stuff from exf_bulkformulae into new routines exf_radiation, exf_wind
o Clean exf namelist o Update trend removal code
Adding unfinished 3-dim. relaxation code.
Adding precip control
A wonder they still let me check in stuff: bi,bj were missing in recent change.
o Rearranging hflux (exf_mapfields -> exf_getforcing) to ensure that diagnostics sees a true EXFqnet
Extended diagnostics output for EXF o now includes all EXF variables o hs, hl moved to common block o separate S/R for diagnostics, called after ctrl vector is added o name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet
Add myiter counter in some cases.
o various fixes to the CVS repository due to the disk crash on 20041206
exf_check_range:
* default changed to .TRUE.
* will check values for niter0 if debLevA, every timestep if debLevB
* STOP in exf_check_range if 'out of range'
* range chosen generous to allow for potential extema
TBD: a version with stricter range
permitted range would be runtime parameters
Change inscal usage for runoff
o enable to read exf forcing fields as either single file or yearly files (flag useExfYearlyFields)
fix debug_call
o commenting out the debug_call() subroutine because it does not exist anywhere in the code - Patrick: did you mean to add it?
Adding simple range check routine for exf fields after read
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
o exf totally restructured
- replaced all exf_set_ routines by one generic exf_set_gen.F
and made sure it's still differentiable
- split exf_getffields.F into new exf_bulkformulae.F
- exf_inscal_/exf_outscal_ suffixes consistent with field names
- updated adjoint/makefile and relevant verif. accordingly
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
Merging from release1_p8:
o exf:
updated external forcing package
- bug fixes carried over from ecco-branch
(missing OBCS_OPTIONS.h in two routines)
- enable easy to use "no forcing".
- added exf I/O for atmospheric loading
- added exf I/O for runoff data
- transfered scaling between exf <-> MITgcm to exf namelist
- removing old exfa stuff
o merge of relevant stuff from the ecco-branch:
- genmake: removed $S64 overwrite for case SunOS
- pkg/exf: update and corrections for field swapping and obcs
- pkg/ecco: parameter lists for the_model_main, the_main_loop
harmonized between ECCO and MITgcm
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice
updated checkpointing_lev... lists for obcs
- model/src: minor changes in forward_step, plot_field
added directive for divided adjoint in the_main_loop
- pkg/mdsio: added mdsio_gl_slice
Adding basic comments for exf package.
Added external forcing package. Not presently supported by mitgcm, i.e. disabled by default.
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 |