Skip to content

GitLab

Commit 9045d124 authored by HOURDIN Christophe's avatar HOURDIN Christophe
Browse files

create ASAP2 v2.00 branch - remake of Y1992.M1 KPP Simu made by S. Pous on Irene-AMD-rome

parent 8388c386
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 168 deletions
MY_SRC_v1_to_v2.txt deleted 100644 → 0
View file @ 8388c386
====================================
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...
compile/croco/cppdefs.base.h
View file @ 9045d124
......@@ -54,7 +54,7 @@
!
*/
/* Configuration Name */
# define ASAP
# define ASAP2
/* Parallelization */
# <script_key_openmp> OPENMP
# <script_key_mpi> MPI
......
compile/croco/param.base.h
View file @ 9045d124
......@@ -186,6 +186,8 @@
parameter (LLm0=411, MMm0=181, N=20) ! SEINE
# elif defined ASAP
parameter (LLm0=384, MMm0=248, N=50) ! SOUTHERN AFRICA
# elif defined ASAP2
parameter (LLm0=395, MMm0=298, N=50) ! EXTENDED SOUTHERN AFRICA
# else
parameter (LLm0=94, MMm0=81, N=40)
# endif
......
param_inputs/namelist.base_oce
View file @ 9045d124
......@@ -254,32 +254,32 @@ station_fields: Grdvar Temp Salt Rho Vel
T T T T T
psource: Nsrc Isrc Jsrc Dsrc Qbar [m3/s] Lsrc Tsrc
2
3 54 1 200. T T 20. 15.
3 40 0 200. T T 20. 15.
0
3 54 1 200. T T 5. 0.
3 40 0 200. T T 5. 0.
psource_ncfile: Nsrc Isrc Jsrc Dsrc qbardir Lsrc Tsrc runoff file name
croco_runoff.nc
18
158 196 0 -1 30*T 24.6074 2
144 216 0 -1 30*T 26.2625 2
251 143 0 1 30*T 26.3724 2
286 140 0 -1 30*T 26.382 2
282 132 0 -1 30*T 26.1829 2
241 116 0 1 30*T 24.659 2
175 100 0 -1 30*T 11.0901 2
249 134 0 1 30*T 25.9274 2
292 157 1 1 30*T 27.9465 2
299 124 0 1 30*T 26.0056 2
304 168 0 -1 30*T 28.2293 2
286 141 0 -1 30*T 26.4051 2
302 133 0 1 30*T 26.3263 2
234 98 0 1 30*T 22.3093 2
240 111 0 1 30*T 24.7462 2
286 117 0 -1 30*T 24.1854 2
216 78 0 1 30*T 17.0626 2
182 86 0 -1 30*T 13.5887 2
croco_runoff.nc
18
158 247 0 -1 30*T 24.6585 2
144 267 0 -1 30*T 26.3170 2
251 194 0 1 30*T 26.4024 2
286 191 0 -1 30*T 26.3881 2
282 183 0 -1 30*T 26.2203 2
242 167 0 1 30*T 24.5592 2
175 151 0 -1 30*T 11.0286 2
249 185 0 1 30*T 25.9157 2
292 208 1 1 30*T 27.8802 2
299 175 0 1 30*T 26.0033 2
302 218 0 -1 30*T 28.1125 2
286 192 0 -1 30*T 26.4094 2
302 184 0 1 30*T 26.3302 2
234 149 0 1 30*T 22.2946 2
240 162 0 1 30*T 24.7437 2
288 167 0 -1 30*T 24.2571 2
211 128 0 1 30*T 17.7886 2
182 137 0 -1 30*T 13.5737 2
online: byear bmonth recordsperday byearend bmonthend / data path
<year_begin_job> <month_begin_job> 1 2012 12
<year_begin_job> <month_begin_job> 1 2017 12
./ONLINE/
param_inputs/namelist.base_oce.1
View file @ 9045d124
......@@ -254,18 +254,18 @@ station_fields: Grdvar Temp Salt Rho Vel
T T T T T
psource: Nsrc Isrc Jsrc Dsrc Qbar [m3/s] Lsrc Tsrc
2
3 54 1 200. T T 20. 15.
3 40 0 200. T T 20. 15.
0
3 54 1 200. T T 5. 0.
3 40 0 200. T T 5. 0.
psource_ncfile: Nsrc Isrc Jsrc Dsrc qbardir Lsrc Tsrc runoff file name
croco_runoff.nc.1
4
153 239 0 -1 30*T 12.0923 2
332 231 0 1 30*T 22.4897 2
279 171 0 1 30*T 18.6351 2
173 197 0 -1 30*T 13.703 2
152 242 0 -1 30*T 11.9804 2
332 234 0 1 30*T 22.4290 2
278 173 0 1 30*T 17.7603 2
173 199 0 -1 30*T 13.7318 2
online: byear bmonth recordsperday byearend bmonthend / data path
<year_begin_job> <month_begin_job> 1 2012 12
<year_begin_job> <month_begin_job> 1 2017 12
./ONLINE/
param_inputs/namelist_pisces_cfg
View file @ 9045d124
......@@ -94,6 +94,7 @@
!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
&nampissbc ! parameters for inputs deposition
!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
ln_ironsed = .true. ! boolean for Fe input from sediments
/
!-----------------------------------------------------------------------
&nampislig ! Namelist parameters for ligands, nampislig
......
param_inputs/namelist_pisces_cfg.1
View file @ 9045d124
......@@ -94,6 +94,7 @@
!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
&nampissbc ! parameters for inputs deposition
!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
ln_ironsed = .true. ! boolean for Fe input from sediments
/
!-----------------------------------------------------------------------
&nampislig ! Namelist parameters for ligands, nampislig
......
scripts/00_README_remake_ASAP_Steph.txt deleted 100644 → 0
View file @ 8388c386
@===============================================================================
@ Remake des premiers pas de temps de la simu de Setph ASAP2020 KPP 01-1985 => 12-2011
@===============================================================================
Tous les fichiers I/O de la simu de Steph pour Y1985M1 sont recopiés dans jobs/00_ASAP_2020_KPP_Steph_Orig de l'experience.
Simu Steph localisation des fichiers I/O Y1985.M1 :
COMPILE:
/ccc/cont005/home/locean/pousstep/CROCO_ASAP_NEW2020_V2
Pour phasage:
croco locean v1.00
/ccc/scratch/cont005/gen1140/hourdinc/croco_v1.00_orig/OCEAN
/ccc/scratch/cont005/gen1140/hourdinc/croco_v1.00_orig/PISCES
croco locean v2.00
/ccc/scratch/cont005/gen1140/hourdinc/croco_v2.00_orig/OCEAN
/ccc/scratch/cont005/gen1140/hourdinc/croco_v2.00_orig/PISCES
INPUTS:
/ccc/cont005/home/locean/pousstep/ASAP2020_KPP/input_croco_2020
/ccc/cont005/home/locean/pousstep/ASAP2020_KPP/input_croco_2020/croco_Y1985.M1.in
/ccc/cont005/home/locean/pousstep/ASAP2020_KPP/input_croco_2020/croco_Y1985.M1.in.1
SCRIPTS
/ccc/cont005/home/locean/pousstep/ASAP2020_KPP/script_croco_2020
/ccc/cont005/home/locean/pousstep/ASAP2020_KPP/script_croco_2020/croco.Y1985.M1.ASAP_CROCO_NEW_V2_get.sh
LISTINGS
/ccc/work/cont005/gen1140/pousstep/KPP_outputs_2020/listing_croco_2020
/ccc/work/cont005/gen1140/pousstep/KPP_outputs_2020/listing_croco_2020/croco.Y1985.M1.ASAP_CROCO_NEW_V2_put_621056.txt
/ccc/work/cont005/gen1140/pousstep/KPP_outputs_2020/listing_croco_2020/croco.Y1985.M1.ASAP_CROCO_NEW_V2_get_620975.txt
/ccc/work/cont005/gen1140/pousstep/KPP_outputs_2020/listing_croco_2020/croco.Y1985.M1.ASAP_CROCO_NEW_V2_job_620977.txt
OUTPUTS
/ccc/store/cont005/gen1140/pousstep/ASAP_AGRIF_PISCESV2_V6_croco_KPP
scripts/IRENE-AMD_Rome.env
View file @ 9045d124
......@@ -32,7 +32,7 @@ if [ "${MODEL_OCE}" = "nemo" ] ; then
export DATA="/ccc/work/cont005/ra0542/hourdinc/data"
elif [ "${MODEL_OCE}" = "croco" ] ; then
# export INDIR="${WORKDIR}/${CONFIG}/inputs"
export INDIR="/ccc/work/cont005/gen1140/hourdinc/ASAP/inputs"
export INDIR="/ccc/work/cont005/gen1140/hourdinc/ASAP2/inputs"
fi
#-------------------------------------------------------------------------------
......
scripts/IRENE-AMD_Rome.header
View file @ 9045d124
......@@ -37,8 +37,8 @@
#======= Reserve Time CPU
#------- Test Queue
#MSUB -Q test # put 1800 s max for time
#MSUB -T <max_cpu_time> # 14400 s = 4 hours
#SUB -Q test # put 1800 s max for time
#MSUB -T <max_cpu_time>
#------ Production Queue for Intel
# can11sen2cp : (parent) LLm0=224, MMm0=288, N=50 (children) LLm0=200, MMm0=300, N=50
......
scripts/IRENE-Intel_Skylake.header
View file @ 9045d124
......@@ -35,8 +35,8 @@
#======= Reserve Time CPU
#------- Test Queue
#MSUB -Q test # put 1800 s max for time
#MSUB -T <max_cpu_time> # 14400 s = 4 hours
#SUB -Q test # put 1800 s max for time
#MSUB -T <max_cpu_time>
#------ Production Queue for Intel
# can11sen2cp : (parent) LLm0=224, MMm0=288, N=50 (children) LLm0=200, MMm0=300, N=50
......
scripts/caltools.sh
View file @ 9045d124
......@@ -3,7 +3,8 @@ set -u
#export CALTYPE=noleap
export CALTYPE=30d
#export CALTYPE=30d
export CALTYPE=julian
##------------------------------------------------------------------------------
......
scripts/getfile_oce.sh
View file @ 9045d124
......@@ -9,7 +9,7 @@
# BOUNDARY
echo "BOUNDARY files :"
lnfile ${INDIR}/bry/asap_bry_ORCA2_Y${YEAR_BEGIN_JOB}M${MONTH_BEGIN_JOB}.nc croco_bry.nc
lnfile ${INDIR}/bry/asap2_bry_BIORYS4_biol_ext_Y${YEAR_BEGIN_JOB}M${MONTH_BEGIN_JOB}.nc croco_bry.nc
echo ""
# BULK ONLINE
......@@ -24,14 +24,14 @@ echo ""
# files that depend on AGRIF
#-------------------------------------------------------------------------------
[ ${AGRIFZ} -ge 1 ] && echo "AGRIF : AGRIF_FixedGrids.in" && lnfile ${INDIR}/grd/asap_AGRIF_FixedGrids.in AGRIF_FixedGrids.in
[ ${AGRIFZ} -ge 1 ] && echo "AGRIF : AGRIF_FixedGrids.in" && lnfile ${INDIR}/grd/asap2_AGRIF_FixedGrids.in AGRIF_FixedGrids.in
# GRID (bathy & coordinates)
echo "GRID (bathy & coordinates) files :"
for nn in $( seq 0 ${AGRIFZ} ); do
[ ${nn} -eq 0 ] && suff="" || suff=".${nn}"
lnfile ${INDIR}/grd/asap_grd.nc${suff} croco_grd.nc${suff}
lnfile ${INDIR}/grd/asap2_grd.nc${suff} croco_grd.nc${suff}
done
echo ""
......@@ -58,7 +58,7 @@ echo ""
echo "RUNOFF files :"
for nn in $( seq 0 ${AGRIFZ} ); do
[ ${nn} -eq 0 ] && suff="" || suff=".${nn}"
lnfile ${INDIR}/runoff/asap_runoff.nc${suff} croco_runoff.nc${suff}
lnfile ${INDIR}/runoff/asap2_runoff_new.nc${suff} croco_runoff.nc${suff}
done
echo ""
......@@ -68,7 +68,7 @@ if ${USE_BIOLOGY} ; then
echo "FORCING BIO files :"
for nn in $( seq 0 ${AGRIFZ} ); do
[ ${nn} -eq 0 ] && suff="" || suff=".${nn}"
lnfile ${INDIR}/frcbio/pisces/asap_frcbio.nc${suff} croco_frcbio.nc${suff}
lnfile ${INDIR}/frcbio/pisces/asap2_frcbio_1m.nc${suff} croco_frcbio.nc${suff}
cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/param_inputs/kRGB61.txt${suff} kRGB61.txt${suff}
cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/param_inputs/namelist_pisces_cfg${suff} namelist_pisces_cfg${suff}
cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/param_inputs/namelist_pisces_ref${suff} namelist_pisces_ref${suff}
......
scripts/getrst_oce.sh
View file @ 9045d124
......@@ -12,7 +12,7 @@ do
if [ ${DATE_BEGIN_JOB} -eq ${DATE_BEGIN_EXP} ]; then
# lnfile /ccc/store/cont005/gen1140/chabertp/OUTPUTS_RUN_agrif_pisces/OUTPUTS_RUN_agrif_pisces_year2/can11_rst_agr_pis_year2_p6.nc${suff} croco_ini.nc${suff}
# lnfile ${INDIR}/ini/can11sen2_rst_bio.nc${suff} croco_ini.nc${suff}
lnfile ${INDIR}/ini/asap_Y1984.M12.ASAP_CROCO_NEW_V2.nc${suff} croco_ini.nc${suff}
lnfile ${INDIR}/ini/asap2_ini_Y1992.M1.BIORYS4_biol_newtime.nc${suff} croco_ini.nc${suff}
else
lnfile ${RSTDIR_IN}/restart_oce_${EXP_NAME}_*.nc${suff} croco_ini.nc${suff}
fi
......
scripts/namelist_exp.sh
View file @ 9045d124
......@@ -7,8 +7,8 @@
# Which Computer?
#-------------------------------------------------------------------------------
export NODE='Intel_Skylake' # just for IRENE ("Intel_Skylake" OR "AMD_Rome")
#export NODE='AMD_Rome' # just for IRENE ("Intel_Skylake" OR "AMD_Rome")
#export NODE='Intel_Skylake' # just for IRENE ("Intel_Skylake" OR "AMD_Rome")
export NODE='AMD_Rome' # just for IRENE ("Intel_Skylake" OR "AMD_Rome")
if [ `hostname |cut -c 1-5` == "irene" ]; then
# export NODE=`/usr/bin/grep 'MSUB' IRENE.header | /usr/bin/grep '\-q' | awk -v var=2 -F"-q" '{print $var}'`
......@@ -29,15 +29,16 @@ printf "\n ${TITLE_EXP} \n\n"
#-------------------------------------------------------------------------------
# Debug Modes
#-------------------------------------------------------------------------------
export MODE_TEST=true # for running different tests in the same exp with different names.
export MODE_TEST=false # for running different tests in the same exp with different names.
# Ability to submit different tests simultaneously
# export TEST_NAME="_remake_ASAP2020_KPP_Steph_Y1985M1_003_JEAN-ZAY_12x10x2_2tsp_optim"
export TEST_NAME="_remake_ASAP2020_KPP_Steph_Y1985M1_004_JEAN-ZAY_12x10x2_2tsp_optim_MY_SRC_v2.00"
# export TEST_NAME="_remake_ASAP2020_KPP_Steph_Y1985M1_004_JEAN-ZAY_12x10x2_2tsp_optim_MY_SRC_v2.00"
export TEST_NAME="_remake_ASAP2_KPP_Steph_Y1992M1_001_IRENE-AMD_16x16x2_v2.00_15tsp_optim"
export TEST_SCRIPT=false # the job is not submited
export TEST_FEW_NTIMES=true # replace the job timestep number by DNTIMES
export DNTIMES=2 # number of timsteps for the parent grid ( wich corresponds to 1 month in the script)
export TEST_FEW_NTIMES=false # replace the job timestep number by DNTIMES
export DNTIMES=15 # number of timsteps for the parent grid ( wich corresponds to 1 month in the script)
#-------------------------------------------------------------------------------
......@@ -47,7 +48,7 @@ export USE_OCE=true
export MODEL_OCE="croco"
# Time Step
export TSP_OCE=2400
export TSP_OCE=1800
export TSP_ICE=$(( 3 * $TSP_OCE ))
# Output frequency
......@@ -56,15 +57,15 @@ if [ "${MODEL_OCE}" == "croco" ] ; then
# export out_list="avg his diabio_avg"
export out_list="avg diabio_avg"
# export freq_out='day'
# export freq_his=1;
# export freq_avg=5;
# export freq_diabio_avg=5
export freq_out='day'
export freq_his=20000;
export freq_avg=31;
export freq_diabio_avg=31
export freq_out='tsp'
export freq_his=2000
export freq_avg=2
export freq_diabio_avg=2
# export freq_out='tsp'
# export freq_his=20000
# export freq_avg=111
# export freq_diabio_avg=111
fi
......@@ -84,7 +85,7 @@ if [ ${COMPUTER} == "JEAN-ZAY" ] ; then
elif [ ${COMPUTER} == "IRENE-Intel_Skylake" ] ; then
export NPROC_X=16; export NPROC_Y=16; export CPU_PER_TASK=2
elif [ ${COMPUTER} == "IRENE-AMD_Rome" ] ; then
export NPROC_X=16; export NPROC_Y=16; export CPU_PER_TASK=2
export NPROC_X=20; export NPROC_Y=18; export CPU_PER_TASK=1
fi
# OpenMP
......@@ -103,8 +104,8 @@ elif [ ${COMPUTER} == "IRENE-Intel_Skylake" ] ; then
export time_cpu_run="1800" # for Queue test max 1800 s
# export time_cpu_run="7200" # 2 heures
elif [ ${COMPUTER} == "IRENE-AMD_Rome" ] ; then
export time_cpu_run="1800" # for Queue test max 1800 s
# export time_cpu_run="7200" # 2 heures
# export time_cpu_run="1800" # for Queue test max 1800 s
export time_cpu_run="36000" # 10 heures
fi
# files to save in ascii jobdir after running
......
scripts/namelist_period.sh
View file @ 9045d124
......@@ -5,19 +5,19 @@
# The experiment is divided into jobs (called with "llsubmit" command)
# Beginning of Experiment
export YEAR_BEGIN_EXP=1985
export YEAR_BEGIN_EXP=1992
export MONTH_BEGIN_EXP=1
export DAY_BEGIN_EXP=1
# Duration of Experiment
#export EXP_DUR_MTH=$(( 1 * 1 ))
export EXP_DUR_MTH=0
export EXP_DUR_DAY=5
export EXP_DUR_MTH=$(( 1 * 1 ))
#export EXP_DUR_MTH=0
export EXP_DUR_DAY=0
# Beginning of Job
export YEAR_BEGIN_JOB=1985
export YEAR_BEGIN_JOB=1992
export MONTH_BEGIN_JOB=1
export DAY_BEGIN_JOB=1
# Duration of Job
export JOB_DUR_MTH=0
export JOB_DUR_DAY=5
export JOB_DUR_MTH=1
export JOB_DUR_DAY=0
#
scripts/submitjob.sh
View file @ 9045d124
......@@ -91,7 +91,7 @@ sed -e "s/<exp>/${ROOT_NAME_1}/g" \
-e "s/<cpu_per_task>/${CPU_PER_TASK}/" \
-e "s/<max_cpu_time>/${time_cpu_run}/" \
./${COMPUTER}.header > HEADER_tmp
cat HEADER_tmp ./common_definitions.sh ./namelist_exp.sh ./namelist_period.sh ./${COMPUTER}.env job.base.sh > ${JOBDIR_ROOT}/${jobname}
cat HEADER_tmp ./common_definitions.sh ./namelist_period.sh ./namelist_exp.sh ./${COMPUTER}.env job.base.sh > ${JOBDIR_ROOT}/${jobname}
\rm HEADER_tmp
chmod 755 ${JOBDIR_ROOT}/${jobname}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment