Commit 5493c76d authored by Pierre-Antoine Bretonnière's avatar Pierre-Antoine Bretonnière
Browse files

Merge branch 'develop-testeleftheria' into 'master'

Develop testeleftheria

The bug of usalc is fixed here.
parents 48c4b098 d39c3ee3
......@@ -286,7 +286,7 @@ done
###############################################################################
function get_glorys {
typeset var path=/cfunas/exp/MERCATOR/GLORYS2V1/outputs/ORCA025L75_glorys
typeset var path=/cfunas/exp/MERCATOR/GLORYS2V1/outputs/ORCA1L46 #ORCA025L75_glorys
typeset var lstfiles=""
for year in $(seq $1 $2) ; do
cp ${path}/vosaline_${year}.nc .
......@@ -1160,3 +1160,5 @@ function gather_memb {
ncrename -h -O -d record,ensemble ${3} ${3}
ncpdq -O -h -a time,ensemble ${3} ${3}
}
......@@ -216,7 +216,7 @@ for ((yeari=$syeari;yeari<=$syearf;yeari=$(($yeari+intsdate)))) ; do
gyres psi_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc $NEMOVERSION gyres_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc
;;
'usalc')
'lmsalc')
if [[ $typeoutput == 'MMO' ]] ; then
if [ ! -f sal_300-5400m_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc ] ; then
vertmeansal grid_T_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc 300 5400 sal_300-5400m_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc
......@@ -224,7 +224,7 @@ for ((yeari=$syeari;yeari<=$syearf;yeari=$(($yeari+intsdate)))) ; do
fi
;;
'lmsalc')
'usalc')
if [[ $typeoutput == 'MMO' ]] ; then
if [ ! -f sal_0-300m_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc ] ; then
vertmeansal grid_T_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc 0 300 sal_0-300m_${expid}_${yeari}${moni}01_fc${memb}_${year0}$(printf "%02d" ${mon0})_${yearf}$(printf "%02d" ${monf}).nc
......
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