Commit 8388c386 authored by HOURDIN Christophe's avatar HOURDIN Christophe
Browse files

same results than asap_v1.00 with the MY_SRC modified files up to date with v2.00

parent df469f48
====================================
diff v1.00 v2.00
====================================
-------------------------------------
repertoire MY_SRC: compile/croco
-------------------------------------
cppdefs_dev.h.
cppdefs.h.
hmix_coef.F (bug enddo corrigé dans la v2) mais
parameter (horcon=0.025)
au lieu de
parameter (horcon=0.01)
Jobcomp.
p4zlim.F90.
p4zprod.F90. (bug jpi IRANGE corrigé dans la v2) => Disparait
param.h.
read_inp.F
-------------------------------------
croco.in
-------------------------------------
Pas de changement entre v1.00 et v2.00!!
-------------------------------------
namelist_pisces_ref
namelist_pisces_ref.1
-------------------------------------
Dans v2.00 _orig
< tracer(25) = 'LGW ' , 'Ligands Concentration ', 'mol-C/L'
Présent dans nameliste_pisces_ref.1. mais pas dans nameliste_pisces_ref
Dans v1.00_orig
Présent dans les 2
Il faut bien qu'elles y soient non?
Pourquoi a t elle disparu de nameliste_pisces_ref?
C'est l'histoire d'avoir sorti les ligands du tableau...
......@@ -34,6 +34,7 @@
#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 */
......@@ -163,9 +164,9 @@
# undef LMD_BKPP
# define LMD_RIMIX
# define LMD_CONVEC
# define LMD_DDMIX
# define LMD_NONLOCAL
# undef MLCONVEC
# define LMD_DDMIX
# undef LMD_LANGMUIR
# endif
/* Surface Forcing */
# define BULK_FLUX
......@@ -191,7 +192,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
......@@ -201,6 +202,7 @@
# ifdef MRL_WCI
# ifndef OW_COUPLING
# define WAVE_OFFLINE
# define ANA_WWAVE
# undef WKB_WWAVE
# endif
# undef WAVE_ROLLER
......@@ -266,15 +268,17 @@
/* Input/Output */
# define AVERAGES
# define AVERAGES_K
# undef OUTPUTS_SURFACE /* 2d surface fields with higher sampling */
# undef OUTPUTS_SURFACE
/* Parallel reproducibility */
# undef RVTK_DEBUG
/*
! Diagnostics
!---------------------------------
! Tracers, momentum balances
! Mixing layer balances
! Vertically integrated vorticity and energy balances
! Diagnostics
!--------------------------------------------
! 3D Tracer & momentum balance
! 2D Mixing layer balance
! Depth-mean vorticity and energy balance
! Eddy terms
!---------------------------------
!--------------------------------------------
!
*/
# undef DIAGNOSTICS_TS
......@@ -389,7 +393,8 @@
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined CANYON
/*
! Canyon Example
......@@ -407,7 +412,8 @@
# define ANA_SMFLUX
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined EQUATOR
/*
......@@ -437,6 +443,7 @@
# define LMD_RIMIX
# define LMD_CONVEC
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined INNERSHELF
/*
......@@ -483,7 +490,8 @@
# define T_FRC_BRY
# endif
# endif
# define NO_FRCFILE
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined SINGLE_COLUMN
/*
......@@ -515,6 +523,7 @@
# define ANA_BTFLUX
# define EW_PERIODIC
# define NS_PERIODIC
# undef RVTK_DEBUG
#elif defined INTERNAL
/*
......@@ -556,7 +565,8 @@
# define M3NUDGING
# define TNUDGING
# endif
# define NO_FRCFILE
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined IGW
/*
......@@ -607,7 +617,8 @@
# define M3NUDGING
# define TNUDGING
# undef ONLINE_ANALYSIS
# undef RVTK_DEBUG
#elif defined RIVER
/*
! River run-off test problem
......@@ -647,7 +658,8 @@
# endif
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined SEAMOUNT
/*
! Seamount Example
......@@ -669,7 +681,8 @@
# define ANA_BTFLUX
# define ANA_BSFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# elif defined SHELFRONT
/*
! Shelf Front Example
......@@ -690,8 +703,9 @@
# define ANA_BTFLUX
# define ANA_BSFLUX
# define EW_PERIODIC
# define NO_FRCFILE
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined SOLITON
/*
! Equatorial Rossby Wave Example
......@@ -707,7 +721,8 @@
# define EW_PERIODIC
# define ANA_SMFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined THACKER
/*
! Thacker Example
......@@ -733,7 +748,8 @@
# define ANA_SRFLUX
# define ANA_STFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
# elif defined OVERFLOW
/*
! Gravitational/Overflow Example
......@@ -752,7 +768,9 @@
# define ANA_SMFLUX
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# define NO_FRCFILE
# undef RVTK_DEBUG
/*
! Plume Example
! ===== =======
......@@ -788,8 +806,9 @@
# define LMD_NONLOCAL
# undef MLCONVEC
# endif
# define NO_FRCFILE
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined UPWELLING
/*
! Upwelling Example
......@@ -818,7 +837,8 @@
# define LMD_CONVEC
# define EW_PERIODIC
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined VORTEX
/*
! Baroclinic Vortex Example (TEST AGRIF)
......@@ -851,7 +871,8 @@
# define M3NUDGING
# define TNUDGING
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined JET
/*
! Baroclinic JET Example
......@@ -902,7 +923,8 @@
# define LMD_CONVEC
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined SHOREFACE
/*
! PLANAR BEACH Example
......@@ -953,6 +975,7 @@
# define TNUDGING
# define ANA_TCLIMA
# endif
# undef RVTK_DEBUG
#elif defined SANDBAR
/*
......@@ -1005,6 +1028,7 @@
# define MORPHODYN
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined RIP
/*
......@@ -1031,7 +1055,6 @@
# define RIP_TOPO_2D
# endif
# undef ANA_TIDES
!
# undef OPENMP
# undef MPI
# define SOLVE3D
......@@ -1118,7 +1141,8 @@
# undef ANA_BPFLUX
# endif
# undef DIAGNOSTICS_UV
# undef RVTK_DEBUG
#elif defined SWASH
/*
! SWASH PLANAR BEACH Example
......@@ -1158,7 +1182,8 @@
# define T_FRC_BRY
# define WET_DRY
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined TANK
/*
! Tank Example
......@@ -1184,6 +1209,41 @@
# 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
/*
......@@ -1206,6 +1266,7 @@
# define ANA_SRFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined GRAV_ADJ
/*
......@@ -1229,6 +1290,7 @@
# define ANA_BTFLUX
# undef PASSIVE_TRACER
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined I_SOLITON
/*
......@@ -1258,7 +1320,8 @@
# define ANA_BTFLUX
# undef PASSIVE_TRACER
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined KH_INST
/*
! Kelvin-Helmholtz Instability Example
......@@ -1267,7 +1330,7 @@
*/
# undef KH_INSTY
# undef KH_INST3D
# define MPI
# undef MPI
# define NBQ
# undef NBQ_PRECISE
# undef XIOS
......@@ -1296,7 +1359,8 @@
# define NS_PERIODIC
# endif
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined TS_HADV_TEST
/*
! Horizontal TRACER ADVECTION EXAMPLE
......@@ -1328,12 +1392,13 @@
# 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
# 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
#endif /* END OF CONFIGURATION CHOICE */
#include "cppdefs_dev.h"
......
......@@ -108,9 +108,6 @@
# define XIOS2
# define MPI
# define MPI_COMM_WORLD ocean_grid_comm
# define key_iomput
#else
# undef key_iomput
#endif
/*
......@@ -143,6 +140,7 @@
# undef NBQ_THETAIMP
# undef NBQ_FREESLIP
# undef NBQ_HZ_PROGNOSTIC
# undef M3FAST_REINIT
# ifdef TANK
# define NOT_NBQ_AM4
# endif
......@@ -255,7 +253,8 @@
*/
#if defined SOLVE3D
# define VAR_RHO_2D
# if !defined NONLIN_EOS && !defined INNERSHELF
# if !defined NONLIN_EOS && !defined INNERSHELF \
&& !defined MOVING_BATHY
# define RESET_RHO0
# endif
#endif
......@@ -279,7 +278,7 @@
|| defined SOLITON || defined JET \
|| defined ACOUSTIC || defined VORTEX \
|| defined THACKER || defined TANK \
|| defined KH_INST
|| defined KH_INST || defined TS_HADV_TEST
# define PGF_FLAT_BOTTOM
#elif defined RIP
# define PGF_BASIC_JACOBIAN
......@@ -631,7 +630,6 @@
# define CFB_STRESS
# undef CFB_STRESS2
# undef CFB_WIND
# define STFLUX_CFB
# else
# undef CFB_STRESS
# define CFB_STRESS2
......@@ -676,10 +674,7 @@
#endif
#ifdef MRL_WCI
/* Bottom streaming */
# ifdef WAVE_STREAMING
# define WAVE_BODY_STREAMING
# endif
# define STOKES_DRIFT /* Stokes drift */
/* Default WCI is with input file data (WAVE_OFFLINE) */
# if !defined WKB_WWAVE && !defined ANA_WWAVE && !defined OW_COUPLING
# define WAVE_OFFLINE
......@@ -713,11 +708,8 @@
#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
......@@ -782,20 +774,32 @@
# define BEDLOAD_MPM
# endif
# endif
#endif /* SEDIMENT */
/*
Morphodynamics (bed evolution feedback on circulation):
MORPHODYN or MOVING_BATHY (equivalent) must be defined
in cppdefs.h (default is undefined)
======================================================================
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
======================================================================
*/
# if defined MORPHODYN || defined MOVING_BATHY
# ifdef MOVING_BATHY
# else
# define MOVING_BATHY
# endif
# else
# undef MOVING_BATHY
# endif
#endif /* SEDIMENT */
#ifdef ANA_MORPHODYN
# define MORPHODYN
#endif
#ifdef SEDIMENT
# undef ANA_MORPHODYN
#endif
#if defined MORPHODYN && defined NBQ
# define NBQ_FREESLIP
#endif
/*
======================================================================
OBCs
......
......@@ -513,6 +513,7 @@
do j=JstrV-1,Jend
do i=IstrU-1,Iend
diff3d_r(i,j,k)=Pr*visc3d_r(i,j,k)
enddo
enddo
enddo
......
......@@ -104,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" ]] ; then
if [[ -e "namelist_pisces_ref" ]] ; then
echo " file namelist_pisces exists in Run directory"
else
\cp -f ${ROOT_DIR}/PISCES/namelist_pisces* $RUNDIR
......
......@@ -34,6 +34,7 @@
#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 */
......@@ -142,8 +143,8 @@
# undef TS_DIF4
# undef TS_MIX_S
/* Vertical Tracer Advection */
# undef TS_VADV_SPLINES
# define TS_VADV_AKIMA
# define TS_VADV_SPLINES
# undef TS_VADV_AKIMA
# undef TS_VADV_WENO5
/* Sponge layers for UV and TS */
# define SPONGE
......@@ -162,9 +163,9 @@
# define LMD_BKPP
# define LMD_RIMIX
# define LMD_CONVEC
# undef LMD_DDMIX
# define LMD_NONLOCAL
# undef MLCONVEC
# undef LMD_DDMIX
# undef LMD_LANGMUIR
# endif
/* Surface Forcing */
# undef BULK_FLUX
......@@ -190,7 +191,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
......@@ -199,7 +200,8 @@
# endif
# ifdef MRL_WCI
# ifndef OW_COUPLING
# define WAVE_OFFLINE
# undef WAVE_OFFLINE
# define ANA_WWAVE
# undef WKB_WWAVE
# endif
# undef WAVE_ROLLER
......@@ -209,7 +211,7 @@
# ifdef WKB_WWAVE
# undef WKB_OBC_NORTH
# undef WKB_OBC_SOUTH
# undef WKB_OBC_WEST
# define WKB_OBC_WEST
# undef WKB_OBC_EAST
# endif
# endif
......@@ -265,15 +267,17 @@
/* Input/Output */
# define AVERAGES
# define AVERAGES_K
# undef OUTPUTS_SURFACE /* 2d surface fields with higher sampling */
# undef OUTPUTS_SURFACE
/* Parallel reproducibility */
# undef RVTK_DEBUG
/*
! Diagnostics
!---------------------------------
! Tracers, momentum balances
! Mixing layer balances
! Vertically integrated vorticity and energy balances
! Diagnostics
!--------------------------------------------
! 3D Tracer & momentum balance
! 2D Mixing layer balance
! Depth-mean vorticity and energy balance
! Eddy terms
!---------------------------------
!--------------------------------------------
!
*/
# undef DIAGNOSTICS_TS
......@@ -325,7 +329,6 @@
# ifdef PISCES
# undef DIURNAL_INPUT_SRFLX
# define key_pisces
# define key_ligand
# endif
# ifdef BIO_NChlPZD
# define OXYGEN
......@@ -337,8 +340,6 @@
# 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 */
......@@ -388,7 +389,8 @@
# define ANA_STFLUX
# define ANA_BTFLUX
# define NO_FRCFILE
# undef RVTK_DEBUG
#elif defined CANYON
/*