[cdftools] 06/228: JMM porting Pierre Mathiot Jade modification to the trunk on the forge
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 08:21:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdftools.
commit 65f38dd6b310dc03f33c26d966629a8a1f0d9296
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date: Tue Feb 16 14:31:28 2010 +0000
JMM porting Pierre Mathiot Jade modification to the trunk on the forge
git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@282 1055176f-818a-41d9-83e1-73fbe5b947c5
---
.../{cdfmoyvt_jade_new.ksh => cdfmoy_jade_new.ksh} | 65 ++++++++-----------
JOBS/cdfmoy_skel_new.ksh | 8 +++
JOBS/cdfmoyvt_jade_new.ksh | 4 +-
JOBS/{cdfvT_skel_new.ksh => cdfvT_jade_new.ksh} | 73 ++++++++++++++--------
JOBS/cdfvT_skel_new.ksh | 8 +++
JOBS/cpmoyvt_jade.ksh | 27 ++++++++
JOBS/mkmoy_jade.ksh | 39 ++++++++++++
JOBS/mkvt_jade.ksh | 39 ++++++++++++
macro.jade | 1 +
9 files changed, 196 insertions(+), 68 deletions(-)
diff --git a/JOBS/cdfmoyvt_jade_new.ksh b/JOBS/cdfmoy_jade_new.ksh
similarity index 63%
copy from JOBS/cdfmoyvt_jade_new.ksh
copy to JOBS/cdfmoy_jade_new.ksh
index 93d9cf1..f981314 100755
--- a/JOBS/cdfmoyvt_jade_new.ksh
+++ b/JOBS/cdfmoy_jade_new.ksh
@@ -15,9 +15,9 @@
#OAR -O METAMOY.%jobid%
### PBS is valid on JADE
-#PBS -N metamoyvt_jade
-#PBS -l select=1:ncpus=8:mpiprocs=8
-#PBS -l walltime=02:30:00
+#PBS -N metamoy_jade
+#PBS -l select=1:ncpus=8:mpiprocs=1
+#PBS -l walltime=02:00:00
#PBS -l place=scatter:excl
#PBS -M molines at hmg.inpg.fr
#PBS -mb -me
@@ -65,11 +65,6 @@ fi
scp $USER@${login_node}:$P_CDF_DIR/config_def.ksh $TMPDIR/.
scp $USER@${login_node}:$P_CDF_DIR/function_def.ksh $TMPDIR/.
- scp $USER@${login_node}:$CDFTOOLS/JOBS/mkmoy_jade.ksh $TMPDIR/mkmoy.ksh
- scp $USER@${login_node}:$CDFTOOLS/JOBS/mkvt_jade.ksh $TMPDIR/mkvt.ksh
- scp $USER@${login_node}:$CDFTOOLS/JOBS/testOK.ksh $TMPDIR/testOK.ksh
- chmod 755 $TMPDIR/testOK.ksh
-
if [ ! -f $TMPDIR/cdfmoy ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfmoy $TMPDIR/. ; fi ;
if [ ! -f $TMPDIR/cdfmoy_annual ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfmoy_annual $TMPDIR/. ; fi ;
@@ -102,38 +97,28 @@ CONFCASE=${CONFIG}-${CASE}
# always work in TMPDIR ! not in the data dir as file will be erased at the end of the script !
-for YEAR in $YEARLST ; do
- SDIR=$PREF/${CONFIG}/${CONFCASE}-S/$YEAR
- MDIR=$PREF/${CONFIG}/${CONFCASE}-MEAN/$YEAR
- chkdirg $MDIR
- chkdir $YEAR
- rm -f $YEAR/OK?
+for YEAR in $YEARLST ; do
+cd $TMPDIR
+SDIR=$PREF/${CONFIG}/${CONFCASE}-S/$YEAR
+ MDIR=$PREF/${CONFIG}/${CONFCASE}-MEAN/$YEAR
+ chkdirg $MDIR
+ chkdir $YEAR
+ cd $YEAR
# Monthly mean
#
- for grid in gridT gridU gridV gridW icemod ; do
-############### CDFMOY CDFVT #####################################
- if [ $grid = gridT ]; then NP=0 ; fi ;
- if [ $grid = gridU ]; then NP=1 ; fi ;
- if [ $grid = gridV ]; then NP=2 ; fi ;
- if [ $grid = gridW ]; then NP=3 ; fi ;
- if [ $grid = icemod ]; then NP=4 ; fi ;
-##################
- cd $TMPDIR
- cat mkmoy.ksh | sed -e "s/YYEEAARR/$YEAR/g" -e "s/GGRRIIDD/$grid/g" -e "s/NNPP/$NP/g" > $YEAR/tmp_mkmoy_$grid.ksh
- cd $YEAR
- chmod u+x tmp_mkmoy_$grid.ksh
- dplace -c$NP tmp_mkmoy_$grid.ksh > log_$grid 2>&1 &
- done
- NP=5
- cd $TMPDIR
- cat mkvt.ksh | sed -e "s/YYEEAARR/$YEAR/g" -e "s/NNPP/$NP/g" > $YEAR/tmp_mkvt.ksh
- cd $YEAR
- chmod u+x tmp_mkvt.ksh
- dplace -c$NP tmp_mkvt.ksh > log_VT 2>&1 & #dplace -c$NP
- dplace -c6 ../testOK.ksh > log_test1 2>&1
- dplace -c7 ../testOK.ksh > log_test2 2>&1
-cd $TMPDIR
- # clean directory for eventually next year:
-################# CDFVT #####################################
+ for grid in gridT gridU gridV gridW icemod ; do
+ for month in 01 02 03 04 05 06 07 08 09 10 11 12 ; do
+ getmonth $month $grid
+
+ ../cdfmoy ${CONFCASE}_y${YEAR}m${month}d??_$grid.nc
+ mv -f cdfmoy.nc ${CONFCASE}_y${YEAR}m${month}_$grid.nc
+ mv -f cdfmoy2.nc ${CONFCASE}_y${YEAR}m${month}_${grid}2.nc
+ \rm ${CONFCASE}_y${YEAR}m${month}d??_$grid.nc
+ done
+
+ ../cdfmoy_annual ${CONFCASE}_y${YEAR}m??_$grid.nc
+ mv -f cdfmoy_annual.nc ${CONFCASE}_y${YEAR}_ANNUAL_$grid.nc
+ ../cdfmoy_annual ${CONFCASE}_y${YEAR}m??_${grid}2.nc #; putannual ${grid}2 ;;
+ mv -f cdfmoy_annual.nc ${CONFCASE}_y${YEAR}_ANNUAL_${grid}2.nc
+ done
done
-
diff --git a/JOBS/cdfmoy_skel_new.ksh b/JOBS/cdfmoy_skel_new.ksh
index 2d2d9e0..15e6392 100755
--- a/JOBS/cdfmoy_skel_new.ksh
+++ b/JOBS/cdfmoy_skel_new.ksh
@@ -14,6 +14,14 @@
#OAR -E METAMOY.%jobid%
#OAR -O METAMOY.%jobid%
+### PBS is valid on JADE
+#PBS -N metamoy_jade
+#PBS -l select=1:ncpus=8:mpiprocs=8
+#PBS -l walltime=02:00:00
+#PBS -l place=scatter:excl
+#PBS -M molines at hmg.inpg.fr
+#PBS -mb -me
+#PBS -v NB_NODES=1,NB_NPROC=8
#################################################################################
# This script is used to compute time mean averages for DRAKKAR model output.
diff --git a/JOBS/cdfmoyvt_jade_new.ksh b/JOBS/cdfmoyvt_jade_new.ksh
index 93d9cf1..e299f72 100755
--- a/JOBS/cdfmoyvt_jade_new.ksh
+++ b/JOBS/cdfmoyvt_jade_new.ksh
@@ -17,8 +17,7 @@
### PBS is valid on JADE
#PBS -N metamoyvt_jade
#PBS -l select=1:ncpus=8:mpiprocs=8
-#PBS -l walltime=02:30:00
-#PBS -l place=scatter:excl
+#PBS -l walltime=4:30:00
#PBS -M molines at hmg.inpg.fr
#PBS -mb -me
@@ -72,6 +71,7 @@ fi
if [ ! -f $TMPDIR/cdfmoy ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfmoy $TMPDIR/. ; fi ;
if [ ! -f $TMPDIR/cdfmoy_annual ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfmoy_annual $TMPDIR/. ; fi ;
+if [ ! -f $TMPDIR/cdfvT ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfvT $TMPDIR/. ; fi ;
cd $TMPDIR
diff --git a/JOBS/cdfvT_skel_new.ksh b/JOBS/cdfvT_jade_new.ksh
similarity index 65%
copy from JOBS/cdfvT_skel_new.ksh
copy to JOBS/cdfvT_jade_new.ksh
index 2c6596f..63b8059 100755
--- a/JOBS/cdfvT_skel_new.ksh
+++ b/JOBS/cdfvT_jade_new.ksh
@@ -14,6 +14,13 @@
#OAR -E METAVT.%jobid%
#OAR -O METAVT.%jobid%
+### QSUB is valid on JADE
+#PBS -N metavt
+#PBS -l select=1:ncpus=8:mpiprocs=1
+#PBS -l walltime=02:00:00
+#PBS -l place=scatter:excl
+#PBS -M molines at hmg.inpg.fr
+#PBS -mb -me
#################################################################################
# This script is used to compute time mean averages for DRAKKAR model output.
@@ -21,21 +28,46 @@
# In this script mean quadratic terms US UT VS VT are computed from 5 days averages
# All customisable variable are set in Part I.
#
-# $Rev$
-# $Date$
-# $Id$
+# $Rev: 229 $
+# $Date: 2009-03-24 09:34:51 +0100 (mar, 24 mar 2009) $
+# $Id: cdfvT_skel_new.ksh 229 2009-03-24 08:34:51Z rcli002 $
################################################################################
set -x
. $HOME/.profile
P_CDF_DIR=$PDIR/RUN_CCOONNFF/CCOONNFF-CCAASSEE/CTL/CDF
. $P_CDF_DIR/config_def.ksh
-
-cp $P_CDF_DIR/config_def.ksh $TMPDIR
-cp $P_CDF_DIR/function_def.ksh $TMPDIR
-cd $TMPDIR
+. $P_CDF_DIR/function_def.ksh
+
+chkdir $TMPDIR
+
+#test network
+login_node=service1
+chknet $login_node
+echo "$login_node $NET"
+if [ $NET = KO ] ; then
+login_node=service2
+chknet $login_node
+echo "$login_node $NET"
+fi;
+if [ $NET = KO ] ; then
+login_node=service3
+chknet $login_node
+echo "$login_node $NET"
+fi;
+if [ $NET = KO ] ; then
+echo network is KO
+date
+exit
+fi
+
+scp $USER@${login_node}:$P_CDF_DIR/config_def.ksh $TMPDIR/.
+scp $USER@${login_node}:$P_CDF_DIR/function_def.ksh $TMPDIR/.
+if [ ! -f $TMPDIR/cdfvT ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfvT $TMPDIR/. ; fi ;
+if [ ! -f $TMPDIR/cdfmoy_annual ] ; then scp $USER@${login_node}:$CDFTOOLS/cdfmoy_annual $TMPDIR/. ; fi ;
+cd $TMPDIR
# Part I : setup config dependent names
#--------------------------------------
. ./config_def.ksh # config_def.ksh may be a link to an existing configuration file
@@ -50,7 +82,6 @@ cd $TMPDIR
# Metamoy meta script will subtitute YYYY and YYYE with correct begining and ending years
YEARS=YYYY
YEARE=YYYE
-LOCAL_SAVE=${LOCAL_SAVE:=0}
YEARLST=""
y=$YEARS
@@ -64,20 +95,14 @@ done
CONFCASE=${CONFIG}-${CASE}
# always work in TMPDIR ! not in the data dir as file will be erased at the end of the script !
-cd $TMPDIR
-mkdir MONTHLY
- if [ $LOCAL_SAVE = 1 ] ; then
- chkdir $WORKDIR/$CONFIG
- chkdir $WORKDIR/$CONFIG/${CONFCASE}-MEAN
- fi
for YEAR in $YEARLST ; do
- SDIR=${CONFIG}/${CONFCASE}-S/$YEAR
+cd $TMPDIR
+ SDIR=$PREF/${CONFIG}/${CONFCASE}-S/$YEAR
MDIR=$PREF/${CONFIG}/${CONFCASE}-MEAN/$YEAR
chkdirg $MDIR
- if [ $LOCAL_SAVE = 1 ] ; then
- chkdir $WORKDIR/$CONFIG/${CONFCASE}-MEAN/$YEAR
- fi
+ chkdir $YEAR
+ cd $YEAR
# Monthly mean
#
@@ -92,17 +117,13 @@ for YEAR in $YEARLST ; do
list="$list $tag"
done
- $CDFTOOLS/cdfvT $CONFCASE $list
- putvtmonth $month
+ ../cdfvT $CONFCASE $list
+ mv -f vt.nc ${CONFCASE}_y${YEAR}m${month}_VT.nc
\rm ${CONFCASE}_y${YEAR}m${month}d??_grid[UVT].nc
done
# annual mean (uses a ponderation to compute the exact annual mean ). ! suppose 5 day averages when creating monthly mean
- cd $TMPDIR/MONTHLY
- $CDFTOOLS/cdfmoy_annual ${CONFCASE}_y${YEAR}m??_VT.nc
- putvtannual
-
+ ../cdfmoy_annual ${CONFCASE}_y${YEAR}m??_VT.nc
+ mv -f cdfmoy_annual.nc ${CONFCASE}_y${YEAR}_ANNUAL_VT.nc
# clean directory for eventually next year:
- \rm ${CONFCASE}_y${YEAR}m??_VT.nc
- cd $TMPDIR
done
diff --git a/JOBS/cdfvT_skel_new.ksh b/JOBS/cdfvT_skel_new.ksh
index 2c6596f..ec389b0 100755
--- a/JOBS/cdfvT_skel_new.ksh
+++ b/JOBS/cdfvT_skel_new.ksh
@@ -14,6 +14,13 @@
#OAR -E METAVT.%jobid%
#OAR -O METAVT.%jobid%
+### QSUB is valid on JADE
+#PBS -N metavt
+#PBS -l select=1:ncpus=8:mpiprocs=1
+#PBS -l walltime=02:00:00
+#PBS -l place=scatter:excl
+#PBS -M molines at hmg.inpg.fr
+#PBS -mb -me
#################################################################################
# This script is used to compute time mean averages for DRAKKAR model output.
@@ -30,6 +37,7 @@ set -x
. $HOME/.profile
P_CDF_DIR=$PDIR/RUN_CCOONNFF/CCOONNFF-CCAASSEE/CTL/CDF
. $P_CDF_DIR/config_def.ksh
+chkdir $TMPDIR
cp $P_CDF_DIR/config_def.ksh $TMPDIR
cp $P_CDF_DIR/function_def.ksh $TMPDIR
diff --git a/JOBS/cpmoyvt_jade.ksh b/JOBS/cpmoyvt_jade.ksh
new file mode 100644
index 0000000..0641a8b
--- /dev/null
+++ b/JOBS/cpmoyvt_jade.ksh
@@ -0,0 +1,27 @@
+#!/bin/ksh
+. config_def.ksh
+
+run=1
+while (( $run==1 )); do
+sleep 3
+qstat -u $USER | grep -q metamoyvt || run=0
+echo "run = $run"
+done
+
+for year in `ls -d ???? `
+do
+echo $year
+nfilenc=$( ls -l $year/*.nc | wc -l )
+echo "nfilenc = $nfilenc"
+nfileok=$( ls -l $year/OK? | wc -l )
+echo "nfileok = $nfileok"
+if [ $nfilenc -eq 130 -a $nfileok -eq 6 ]; then
+echo "cp file for year "
+if [ ! -d /scratch/$USER/${CONFIG}-${CASE}-MEAN/ ] ; then mkdir /scratch/$USER/${CONFIG}-${CASE}-MEAN/ ; fi;
+if [ ! -d /data/$USER/$CONFIG/${CONFIG}-${CASE}-MEAN/$year ] ; then mkdir /data/$USER/$CONFIG/${CONFIG}-${CASE}-MEAN/$year ; fi;
+if [ ! -d /scratch/$USER/${CONFIG}-${CASE}-MEAN/$year ] ; then mkdir /scratch/$USER/${CONFIG}-${CASE}-MEAN/$year ; fi;
+cp -f $year/*.nc /data/${USER}/$CONFIG/${CONFIG}-${CASE}-MEAN/$year/.
+mv -f $year/*.nc /scratch/${USER}/${CONFIG}-${CASE}-MEAN/$year/.
+fi
+done
+echo "end"
diff --git a/JOBS/mkmoy_jade.ksh b/JOBS/mkmoy_jade.ksh
new file mode 100644
index 0000000..11ef116
--- /dev/null
+++ b/JOBS/mkmoy_jade.ksh
@@ -0,0 +1,39 @@
+#!/bin/ksh
+set -x
+cd ..
+
+. config_def.ksh
+. function_def.ksh
+
+CONFCASE=${CONFIG}-${CASE}
+
+login_node=service1
+
+YEAR=YYEEAARR
+grid=GGRRIIDD
+NP=NNPP
+
+cd $YEAR
+
+MEANY=$CONFIG/${CONFIG}-${CASE}-MEAN/$YEAR
+SDIRY=$CONFIG/${CONFIG}-${CASE}-S/$YEAR
+
+mkdir $grid; cd $grid;
+for month in 01 02 03 04 05 06 07 08 09 10 11 12 ; do
+ getmonth $month $grid
+
+ ../../cdfmoy ${CONFCASE}_y${YEAR}m${month}d??_$grid.nc
+ mv -f cdfmoy.nc ${CONFCASE}_y${YEAR}m${month}_$grid.nc
+ if [ $grid != icemod ] ; then
+ mv -f cdfmoy2.nc ${CONFCASE}_y${YEAR}m${month}_${grid}2.nc
+ fi
+ rm -f ${CONFCASE}_y${YEAR}m${month}d??_$grid.nc
+done
+../../cdfmoy_annual ${CONFCASE}_y${YEAR}m??_$grid.nc
+mv -f cdfmoy_annual.nc ${CONFCASE}_y${YEAR}_ANNUAL_$grid.nc
+if [ $grid != icemod ] ; then
+ ../../cdfmoy_annual ${CONFCASE}_y${YEAR}m??_${grid}2.nc
+ mv -f cdfmoy_annual.nc ${CONFCASE}_y${YEAR}_ANNUAL_${grid}2.nc
+fi
+mv -f ${CONFCASE}_y${YEAR}*_${grid}*.nc ../.
+cd .. ; rm -rf $grid ; touch OK$NP ;
diff --git a/JOBS/mkvt_jade.ksh b/JOBS/mkvt_jade.ksh
new file mode 100644
index 0000000..94b8919
--- /dev/null
+++ b/JOBS/mkvt_jade.ksh
@@ -0,0 +1,39 @@
+#!/bin/ksh
+set -x
+cd ..
+. config_def.ksh
+. function_def.ksh
+
+CONFCASE=${CONFIG}-${CASE}
+
+login_node=service1
+
+YEAR=YYEEAARR
+grid=GGRRIIDD
+NP=NNPP
+
+cd $YEAR
+
+MEANY=$CONFIG/${CONFIG}-${CASE}-MEAN/$YEAR
+SDIRY=$CONFIG/${CONFIG}-${CASE}-S/$YEAR
+
+mkdir VT; cd VT ;
+for month in 01 02 03 04 05 06 07 08 09 10 11 12 ; do
+ getmonth $month gridT
+ getmonth $month gridU
+ getmonth $month gridV
+ #####################
+ list=''
+ for f in ${CONFCASE}_y${YEAR}m${month}d??_gridT.nc ; do
+ tag=$( echo $f | awk -F_ '{print $2}' )
+ list="$list $tag"
+ done
+ ../../cdfvT $CONFCASE $list
+ mv -f vt.nc ${CONFCASE}_y${YEAR}m${month}_VT.nc
+ rm -f ${CONFCASE}_y${YEAR}m${month}d??_grid?.nc
+done
+ # annual mean (uses a ponderation to compute the exact annual mean ). ! suppose 5 day averages when creating monthly mean
+../../cdfmoy_annual ${CONFCASE}_y${YEAR}m??_VT.nc
+mv -f cdfmoy_annual.nc ${CONFCASE}_y${YEAR}_ANNUAL_VT.nc
+mv -f ${CONFCASE}_y${YEAR}*_VT.nc ../.
+cd .. ; rmdir VT ; touch OK$NP
diff --git a/macro.jade b/macro.jade
index 71abadc..7bf756a 100644
--- a/macro.jade
+++ b/macro.jade
@@ -8,6 +8,7 @@ NCDF= -I/opt/software/SGI/netcdf/4.0/include -L/opt/software/SGI/netcdf/4.0/lib
F90=ifort
MPF90=mpif90
+# flag static is used to allow the use of CDFTOOLS in parallel with mpi_metamon
FFLAGS= -static -O $(NCDF) -assume byterecl -convert big_endian
LMPI=-lmpich
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdftools.git
More information about the debian-science-commits
mailing list