Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint65k: | (view) (download) (annotate) |
| Sticky Tag: |
from Jeff Scott: add option (#define EXF_CALC_ATMRHO) to calculate local air density as function of air Temp, Humidity and atm pressure.
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
adding ALLOW_RUNOFTEMP for specifying temperature of runoff Modified Files: EXF_FIELDS.h EXF_OPTIONS.h EXF_PARAM.h exf_check_range.F exf_diagnostics_fill.F exf_diagnostics_init.F exf_getffields.F exf_init.F exf_mapfields.F exf_monitor.F exf_readparms.F exf_summary.F
changing/adding comment
use EXF_OPTIONS.h to set pkg/exf options except if done in ECCO_CPPOPTIONS.h (previously, ALLOW_AUTODIFF_TAMC was controling this switch)
remove #include "AD_CONFIG.h" from all included OPTIONS files and add it explicitly in each fortran src file where it is needed
- when using ALLOW_ECCO_EVOLUTION (ecco within model/src/the_main_loop.F) we include OPTIONS the normal way (i.e. not via ECCO_CPPOPTIONS.h).
change default EXF_LWDOWN_WITH_EMISSIVITY to #define (was #undef before)
add option "EXF_USE_OLD_INTERP_POLE" to recover old results regarding exf-interpolation near N & S poles. Undef by default.
rotate vector component toward local grid-axis orientation using grid-angles (stored in GRID.h) instead of locally computed rotation angle; keep old code available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default).
- remove USE_NO_INTERP_RUNOFF - move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h", outside of the #ifdef ALLOW_THISPKG / #endif block.
add the new flag EXF_LWDOWN_WITH_EMISSIVITY as undef with explanation
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose (default= debugMode).
- introducing select_ZenAlbedo to choose method (replacing ALLOW_DIURNAL_ALBEDO & ALLOW_DAILY_ALBEDO_AIM) - adding options consistency checks in exf_check.F
improving readability of ALLOW_ZENITHANGLE related code - remove nSx,nSy dims from zen_albedo_table - rename useExfZenithAngle to useExfZenIncoming/useExfZenAlbedo and document them in EXF_PARAM.h - document ALLOW_ZENITHANGLE in EXF_OPTIONS.h and set it to false - document variables in EXF_FIELDS.h
avoid unbalanced quote (single or double) in commented line
add capability to bypass interpolation for runoff by setting yet another CPP-flag
Adding a capability to exf: read ice area from file.
Add AD_CONFIG.h
replaced EXF_OPTIONS.h CPP option EXF_SUBTRACT_UVVEL_FROM_UVWIND with EXF_PARAM.h runtime parameter useRelativeWind
o pkg/exf: added CPP option EXF_SUBTRACT_UVVEL_FROM_UVWIND for subtracting UVEL and VVEL from UWIND and VWIND prior to applying bulk formulae.
- Default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC) - EXF_INTERPOLATION: Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when reading the file ; otherwise, use fixed size array to read in (exf_interp_bufferSize).
change comments
o Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec o Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) o Thanks to Tom Haine for testing!
1 - Tidying up multi-threaded stuff to get rid and automate some CPP junk.
2 - Putting in CPP optional mode for exf_interp_read.F that allows it to work
multi-threaded with an F90 compiler (this mode wont work with g77).
o Added capability to read-in both atmospheric fluxes and atmospheric conditions, needed for running sea-ice model in conjunction with fluxes. o Removed ALLOW_CLIM_CYCLIC: cyclic monthly forcing is instead diagnosed from presence or absence of input parameters clim*period
Fixing OPTIONS files for use of exf: o ALLOW_ECCO not needed o ECCO_CPPOPTIONS.h should not be included from EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h as has been the case in the past o All cal/exf related options are currently set in single header file. Should remain so until we agree on a consistent new policy.
removed out-of-date option BICUBIC from EXF_OPTIONS
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
file EXF_OPTIONS.h was initially added on branch branch-genmake2.
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 |