Commit 6d349438 authored by HOURDIN Christophe's avatar HOURDIN Christophe
Browse files

create the v1.00 branch to test can11sen2 config with old v1.00 croco_locean version

parent 114ba298
......@@ -34,7 +34,6 @@
#undef SANDBAR /* Bar-generating Flume Example */
#undef SWASH /* Swash Test Case on a Planar Beach */
#undef TANK /* Tank Example */
#undef MOVING_BATHY /* Moving Bathymetry Example */
#undef ACOUSTIC /* Acoustic wave Example */
#undef GRAV_ADJ /* Graviational Adjustment Example */
#undef I_SOLITON /* Internal Soliton Example */
......@@ -143,8 +142,8 @@
# undef TS_DIF4
# undef TS_MIX_S
/* Vertical Tracer Advection */
# undef TS_VADV_SPLINES
# define TS_VADV_AKIMA
# undef TS_VADV_SPLINES
# define TS_VADV_AKIMA
# undef TS_VADV_WENO5
/* Sponge layers for UV and TS */
# define SPONGE
......@@ -163,9 +162,9 @@
# define LMD_BKPP
# define LMD_RIMIX
# define LMD_CONVEC
# define LMD_NONLOCAL
# undef LMD_DDMIX
# undef LMD_LANGMUIR
# define LMD_NONLOCAL
# undef MLCONVEC
# endif
/* Surface Forcing */
# undef BULK_FLUX
......@@ -191,7 +190,7 @@
# undef SFLX_CORR_COEF
# undef ANA_DIURNAL_SW
# endif
# undef SMFLUX_CFB
# undef SMFLUX_CFB
# undef SEA_ICE_NOFLUX
/* Wave-current interactions */
# ifdef OW_COUPLING
......@@ -200,8 +199,7 @@
# endif
# ifdef MRL_WCI
# ifndef OW_COUPLING
# undef WAVE_OFFLINE
# define ANA_WWAVE
# define WAVE_OFFLINE
# undef WKB_WWAVE
# endif
# undef WAVE_ROLLER
......@@ -211,7 +209,7 @@
# ifdef WKB_WWAVE
# undef WKB_OBC_NORTH
# undef WKB_OBC_SOUTH
# define WKB_OBC_WEST
# undef WKB_OBC_WEST
# undef WKB_OBC_EAST
# endif
# endif
......@@ -267,17 +265,15 @@
/* Input/Output */
# define AVERAGES
# define AVERAGES_K
# undef OUTPUTS_SURFACE
/* Parallel reproducibility */
# undef RVTK_DEBUG
# undef OUTPUTS_SURFACE /* 2d surface fields with higher sampling */
/*
! Diagnostics
!--------------------------------------------
! 3D Tracer & momentum balance
! 2D Mixing layer balance
! Depth-mean vorticity and energy balance
! Diagnostics
!---------------------------------
! Tracers, momentum balances
! Mixing layer balances
! Vertically integrated vorticity and energy balances
! Eddy terms
!--------------------------------------------
!---------------------------------
!
*/
# undef DIAGNOSTICS_TS
......@@ -341,6 +337,8 @@
# define DIAGNOSTICS_BIO
# if defined DIAGNOSTICS_BIO && defined PISCES
# define key_trc_diaadd
# define key_trc_dia3d
# define key_iomput
# endif
# endif
/* Lagrangian floats model */
......@@ -390,7 +388,7 @@
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined CANYON
/*
! Canyon Example
......@@ -408,8 +406,7 @@
# define ANA_SMFLUX
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined EQUATOR
/*
......@@ -439,7 +436,6 @@
# define LMD_RIMIX
# define LMD_CONVEC
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined INNERSHELF
/*
......@@ -486,8 +482,7 @@
# define T_FRC_BRY
# endif
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined SINGLE_COLUMN
/*
......@@ -519,7 +514,6 @@
# define ANA_BTFLUX
# define EW_PERIODIC
# define NS_PERIODIC
# undef RVTK_DEBUG
#elif defined INTERNAL
/*
......@@ -561,8 +555,7 @@
# define M3NUDGING
# define TNUDGING
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined IGW
/*
......@@ -613,8 +606,7 @@
# define M3NUDGING
# define TNUDGING
# undef ONLINE_ANALYSIS
# undef RVTK_DEBUG
#elif defined RIVER
/*
! River run-off test problem
......@@ -654,8 +646,7 @@
# endif
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined SEAMOUNT
/*
! Seamount Example
......@@ -677,8 +668,7 @@
# define ANA_BTFLUX
# define ANA_BSFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# elif defined SHELFRONT
/*
! Shelf Front Example
......@@ -699,9 +689,8 @@
# define ANA_BTFLUX
# define ANA_BSFLUX
# define EW_PERIODIC
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined SOLITON
/*
! Equatorial Rossby Wave Example
......@@ -717,8 +706,7 @@
# define EW_PERIODIC
# define ANA_SMFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined THACKER
/*
! Thacker Example
......@@ -744,8 +732,7 @@
# define ANA_SRFLUX
# define ANA_STFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# elif defined OVERFLOW
/*
! Gravitational/Overflow Example
......@@ -764,9 +751,7 @@
# define ANA_SMFLUX
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
/*
! Plume Example
! ===== =======
......@@ -802,9 +787,8 @@
# define LMD_NONLOCAL
# undef MLCONVEC
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined UPWELLING
/*
! Upwelling Example
......@@ -833,8 +817,7 @@
# define LMD_CONVEC
# define EW_PERIODIC
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined VORTEX
/*
! Baroclinic Vortex Example (TEST AGRIF)
......@@ -867,8 +850,7 @@
# define M3NUDGING
# define TNUDGING
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined JET
/*
! Baroclinic JET Example
......@@ -919,8 +901,7 @@
# define LMD_CONVEC
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined SHOREFACE
/*
! PLANAR BEACH Example
......@@ -971,7 +952,6 @@
# define TNUDGING
# define ANA_TCLIMA
# endif
# undef RVTK_DEBUG
#elif defined SANDBAR
/*
......@@ -1024,7 +1004,6 @@
# define MORPHODYN
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined RIP
/*
......@@ -1051,6 +1030,7 @@
# define RIP_TOPO_2D
# endif
# undef ANA_TIDES
!
# undef OPENMP
# undef MPI
# define SOLVE3D
......@@ -1137,8 +1117,7 @@
# undef ANA_BPFLUX
# endif
# undef DIAGNOSTICS_UV
# undef RVTK_DEBUG
#elif defined SWASH
/*
! SWASH PLANAR BEACH Example
......@@ -1178,8 +1157,7 @@
# define T_FRC_BRY
# define WET_DRY
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined TANK
/*
! Tank Example
......@@ -1205,41 +1183,6 @@
# define ANA_SRFLUX
# define ANA_STFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined MOVING_BATHY
/*
! Moving Bathy Example
! ====== ===== =======
Auclair et al., Ocean Mod. 2014: Implementation of a time-dependent
bathymetry in a free-surface ocean model: Application to internal
wave generation
*/
# undef MPI
# define ANA_MORPHODYN
# define NBQ
# define NBQ_PRECISE
# define M2FILTER_NONE
# define SOLVE3D
# define NEW_S_COORD
# undef PASSIVE_TRACER
# define UV_ADV
# define TS_HADV_WENO5
# define TS_VADV_WENO5
# define UV_HADV_WENO5
# define UV_VADV_WENO5
# define W_HADV_WENO5
# define W_VADV_WENO5
# define ANA_GRID
# define ANA_INITIAL
# define ANA_VMIX
# define ANA_BTFLUX
# define ANA_SMFLUX
# define ANA_SRFLUX
# define ANA_STFLUX
# define NO_FRCFILE
#elif defined ACOUSTIC
/*
......@@ -1262,7 +1205,6 @@
# define ANA_SRFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined GRAV_ADJ
/*
......@@ -1286,7 +1228,6 @@
# define ANA_BTFLUX
# undef PASSIVE_TRACER
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined I_SOLITON
/*
......@@ -1316,8 +1257,7 @@
# define ANA_BTFLUX
# undef PASSIVE_TRACER
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined KH_INST
/*
! Kelvin-Helmholtz Instability Example
......@@ -1326,7 +1266,7 @@
*/
# undef KH_INSTY
# undef KH_INST3D
# undef MPI
# define MPI
# define NBQ
# undef NBQ_PRECISE
# undef XIOS
......@@ -1355,8 +1295,7 @@
# define NS_PERIODIC
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined TS_HADV_TEST
/*
! Horizontal TRACER ADVECTION EXAMPLE
......@@ -1388,13 +1327,12 @@
# define EW_PERIODIC
# define NS_PERIODIC
# define TS_HADV_UP3 /* Choose specific advection scheme */
# undef TS_HADV_C4
# undef TS_HADV_UP5
# undef TS_HADV_WENO5
# undef TS_HADV_C6
# undef RVTK_DEBUG
#define TS_HADV_UP3 /* Choose specific advection scheme */
#undef TS_HADV_C4
#undef TS_HADV_UP5
#undef TS_HADV_WENO5
#undef TS_HADV_C6
#endif /* END OF CONFIGURATION CHOICE */
#include "cppdefs_dev.h"
......
......@@ -108,6 +108,9 @@
# define XIOS2
# define MPI
# define MPI_COMM_WORLD ocean_grid_comm
# define key_iomput
#else
# undef key_iomput
#endif
/*
......@@ -140,7 +143,6 @@
# undef NBQ_THETAIMP
# undef NBQ_FREESLIP
# undef NBQ_HZ_PROGNOSTIC
# undef M3FAST_REINIT
# ifdef TANK
# define NOT_NBQ_AM4
# endif
......@@ -253,8 +255,7 @@
*/
#if defined SOLVE3D
# define VAR_RHO_2D
# if !defined NONLIN_EOS && !defined INNERSHELF \
&& !defined MOVING_BATHY
# if !defined NONLIN_EOS && !defined INNERSHELF
# define RESET_RHO0
# endif
#endif
......@@ -278,7 +279,7 @@
|| defined SOLITON || defined JET \
|| defined ACOUSTIC || defined VORTEX \
|| defined THACKER || defined TANK \
|| defined KH_INST || defined TS_HADV_TEST
|| defined KH_INST
# define PGF_FLAT_BOTTOM
#elif defined RIP
# define PGF_BASIC_JACOBIAN
......@@ -630,6 +631,7 @@
# define CFB_STRESS
# undef CFB_STRESS2
# undef CFB_WIND
# define STFLUX_CFB
# else
# undef CFB_STRESS
# define CFB_STRESS2
......@@ -674,7 +676,10 @@
#endif
#ifdef MRL_WCI
# define STOKES_DRIFT /* Stokes drift */
/* Bottom streaming */
# ifdef WAVE_STREAMING
# define WAVE_BODY_STREAMING
# endif
/* Default WCI is with input file data (WAVE_OFFLINE) */
# if !defined WKB_WWAVE && !defined ANA_WWAVE && !defined OW_COUPLING
# define WAVE_OFFLINE
......@@ -708,8 +713,11 @@
#ifdef BIOLOGY
# ifdef PISCES
# undef DIURNAL_INPUT_SFLX /* Under Development */
# define key_trc_pisces
# define key_passivetrc
# ifdef DIAGNOSTICS_BIO
# define key_trc_diaadd
# define key_trc_dia3d
# endif
# endif
# ifdef BIO_BioEBUS
......@@ -774,32 +782,20 @@
# define BEDLOAD_MPM
# endif
# endif
#endif /* SEDIMENT */
/*
======================================================================
Hydro-morphodynamic coupling (Moving Bathymetry)
-> MORPHODYN: Morphodynamics (bed evolution & feedback on circulation)
... must be defined for coupling with SEDIMENT model
-> ANA_MORPHODYN: Analytical function of oscillating bathymetry
(ifndef SEDIMENT)
MORPHODYN or ANA_MORPHODYN must be defined in cppdefs.h
ANA_MORPHODYN triggers MORPHODYN below
ANA_MORPHODYN and SEDIMENT are incompatible for now
MORPHODYN && NBQ needs NBQ_FREESLIP
======================================================================
Morphodynamics (bed evolution feedback on circulation):
MORPHODYN or MOVING_BATHY (equivalent) must be defined
in cppdefs.h (default is undefined)
*/
#ifdef ANA_MORPHODYN
# define MORPHODYN
#endif
#ifdef SEDIMENT
# undef ANA_MORPHODYN
#endif
#if defined MORPHODYN && defined NBQ
# define NBQ_FREESLIP
#endif
# if defined MORPHODYN || defined MOVING_BATHY
# ifdef MOVING_BATHY
# else
# define MOVING_BATHY
# endif
# else
# undef MOVING_BATHY
# endif
#endif /* SEDIMENT */
/*
======================================================================
OBCs
......
......@@ -41,6 +41,7 @@ FC="<fc>"
#
# set MPI directories if needed
#
MPIDIR=$
MPIF90="<mpif90>"
MPILIB=""
MPIINC=""
......@@ -103,7 +104,7 @@ ls ${ROOT_DIR}/PISCES/* > /dev/null 2>&1 && \cp ${ROOT_DIR}/PISCES/* $SC
ls ${ROOT_DIR}/PISCES/SED/* > /dev/null 2>&1 && \cp ${ROOT_DIR}/PISCES/SED/* $SCRDIR
ls ${ROOT_DIR}/PISCES/kRGB61* > /dev/null 2>&1 && \cp ${ROOT_DIR}/PISCES/kRGB61* $RUNDIR
if [[ -e "namelist_pisces_ref" ]] ; then
if [[ -e "namelist_pisces" ]] ; then
echo " file namelist_pisces exists in Run directory"
else
\cp -f ${ROOT_DIR}/PISCES/namelist_pisces* $RUNDIR
......
This diff is collapsed.
......@@ -34,7 +34,6 @@
#undef SANDBAR /* Bar-generating Flume Example */
#undef SWASH /* Swash Test Case on a Planar Beach */
#undef TANK /* Tank Example */
#undef MOVING_BATHY /* Moving Bathymetry Example */
#undef ACOUSTIC /* Acoustic wave Example */
#undef GRAV_ADJ /* Graviational Adjustment Example */
#undef I_SOLITON /* Internal Soliton Example */
......@@ -143,8 +142,8 @@
# undef TS_DIF4
# undef TS_MIX_S
/* Vertical Tracer Advection */
# define TS_VADV_SPLINES
# undef TS_VADV_AKIMA
# undef TS_VADV_SPLINES
# define TS_VADV_AKIMA
# undef TS_VADV_WENO5
/* Sponge layers for UV and TS */
# define SPONGE
......@@ -163,9 +162,9 @@
# define LMD_BKPP
# define LMD_RIMIX
# define LMD_CONVEC
# define LMD_NONLOCAL
# undef LMD_DDMIX
# undef LMD_LANGMUIR
# define LMD_NONLOCAL
# undef MLCONVEC
# endif
/* Surface Forcing */
# undef BULK_FLUX
......@@ -191,7 +190,7 @@
# undef SFLX_CORR_COEF
# define ANA_DIURNAL_SW
# endif
# undef SMFLUX_CFB
# undef SMFLUX_CFB
# undef SEA_ICE_NOFLUX
/* Wave-current interactions */
# ifdef OW_COUPLING
......@@ -200,8 +199,7 @@
# endif
# ifdef MRL_WCI
# ifndef OW_COUPLING
# undef WAVE_OFFLINE
# define ANA_WWAVE
# define WAVE_OFFLINE
# undef WKB_WWAVE
# endif
# undef WAVE_ROLLER
......@@ -211,7 +209,7 @@
# ifdef WKB_WWAVE
# undef WKB_OBC_NORTH
# undef WKB_OBC_SOUTH
# define WKB_OBC_WEST
# undef WKB_OBC_WEST
# undef WKB_OBC_EAST
# endif
# endif
......@@ -267,17 +265,15 @@
/* Input/Output */
# define AVERAGES
# define AVERAGES_K
# undef OUTPUTS_SURFACE
/* Parallel reproducibility */
# undef RVTK_DEBUG
# undef OUTPUTS_SURFACE /* 2d surface fields with higher sampling */
/*
! Diagnostics
!--------------------------------------------
! 3D Tracer & momentum balance
! 2D Mixing layer balance
! Depth-mean vorticity and energy balance
! Diagnostics
!---------------------------------
! Tracers, momentum balances
! Mixing layer balances
! Vertically integrated vorticity and energy balances
! Eddy terms
!--------------------------------------------
!---------------------------------
!
*/
# undef DIAGNOSTICS_TS
......@@ -329,6 +325,7 @@
# ifdef PISCES
# undef DIURNAL_INPUT_SRFLX
# define key_pisces
# define key_ligand
# endif
# ifdef BIO_NChlPZD
# define OXYGEN
......@@ -340,6 +337,8 @@
# define DIAGNOSTICS_BIO
# if defined DIAGNOSTICS_BIO && defined PISCES
# define key_trc_diaadd
# define key_trc_dia3d
# define key_iomput
# endif
# endif
/* Lagrangian floats model */
......@@ -389,8 +388,7 @@
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined CANYON
/*
! Canyon Example
......@@ -408,8 +406,7 @@
# define ANA_SMFLUX
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined EQUATOR
/*
......@@ -439,7 +436,6 @@
# define LMD_RIMIX
# define LMD_CONVEC
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined INNERSHELF
/*
......@@ -486,8 +482,7 @@
# define T_FRC_BRY
# endif
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
# define NO_FRCFILE
#elif defined SINGLE_COLUMN
/*
......@@ -519,7 +514,6 @@