Commit 5549e58a authored by Paulo V C Medeiros's avatar Paulo V C Medeiros
Browse files

Use data from all countries, not just SE

parent cb80ab6a
...@@ -2,3 +2,7 @@ ...@@ -2,3 +2,7 @@
generated_obs_files generated_obs_files
vobs vobs
carra2vobs.x carra2vobs.x
input_to_fix_obsfiles_scripts
*.err
*.out
tmp/
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#SBATCH --qos=normal #SBATCH --qos=normal
#SBATCH --time=02:00:00 #SBATCH --time=02:00:00
# #
set -x #set -x
work_dir=/scratch/ms/se/snz/carra_vobs_2018_2019/carra_vobs_code/new_scripts work_dir=/scratch/ms/se/snz/carra_vobs_2018_2019/carra_vobs_code/new_scripts
fix_obsfiles_scripts_dir="${work_dir}/fix_obsfiles_scripts" fix_obsfiles_scripts_dir="${work_dir}/fix_obsfiles_scripts"
...@@ -13,7 +13,7 @@ cd $work_dir ...@@ -13,7 +13,7 @@ cd $work_dir
gfortran src/carra2vobs.f90 -o carra2vobs.x gfortran src/carra2vobs.f90 -o carra2vobs.x
# Inputs: YYYY and MM
YYYY=$1 YYYY=$1
MM=$2 MM=$2
...@@ -62,6 +62,11 @@ DTGF=$(/home/ms/se/smo/bin/mandtg.x $DTG1 + -24) ...@@ -62,6 +62,11 @@ DTGF=$(/home/ms/se/smo/bin/mandtg.x $DTG1 + -24)
IMF=`perl -e "printf('%2.2i', '$MMF')"` IMF=`perl -e "printf('%2.2i', '$MMF')"`
${fix_obsfiles_scripts_dir}/Fix_obsfiles_DK.ksh $DTG1 $DTG2
${fix_obsfiles_scripts_dir}/Fix_obsfiles_FI.ksh $DTG1 $DTG2
${fix_obsfiles_scripts_dir}/Fix_obsfiles_IS.ksh $DTG1 $DTG2
${fix_obsfiles_scripts_dir}/Fix_obsfiles_NO1.ksh $DTG1 $DTG2
${fix_obsfiles_scripts_dir}/Fix_obsfiles_NO2.ksh $DTGNO1 $DTGNO2
${fix_obsfiles_scripts_dir}/Fix_obsfiles_SE.ksh $DTG1 $DTG2 ${fix_obsfiles_scripts_dir}/Fix_obsfiles_SE.ksh $DTG1 $DTG2
# So that carra2vobs can find obs_files generated in the previous step # So that carra2vobs can find obs_files generated in the previous step
...@@ -72,6 +77,10 @@ cd ${work_dir} ...@@ -72,6 +77,10 @@ cd ${work_dir}
while (( $DTG<=$DTG2 )) while (( $DTG<=$DTG2 ))
do do
echo ''
echo '--------------------------------------'
echo "Running carra2vobs on DTG=$DTG"
echo '--------------------------------------'
((BB = ${DTG} / 100)) ((BB = ${DTG} / 100))
((YY = $BB / 10000)) ((YY = $BB / 10000))
((MM = ( $BB - $YY*10000) / 100)) ((MM = ( $BB - $YY*10000) / 100))
...@@ -84,7 +93,7 @@ do ...@@ -84,7 +93,7 @@ do
ID=`perl -e "printf('%2.2i', '$DD')"` ID=`perl -e "printf('%2.2i', '$DD')"`
IH=`perl -e "printf('%2.2i', '$HH')"` IH=`perl -e "printf('%2.2i', '$HH')"`
/bin/rm vobs.txt /bin/rm -f vobs.txt
VOBSFILE=$vobs_dir/vobs_${DTG}.txt VOBSFILE=$vobs_dir/vobs_${DTG}.txt
...@@ -117,7 +126,7 @@ rm -rf ${vobs_dir} ...@@ -117,7 +126,7 @@ rm -rf ${vobs_dir}
#/bin/rm $INPATH/DK/obs_*.txt #/bin/rm $INPATH/DK/obs_*.txt
#/bin/rm $INPATH/FI/obs_*.txt #/bin/rm $INPATH/FI/obs_*.txt
#/bin/rm $INPATH/IC/obs_*.txt #/bin/rm $INPATH/IS/obs_*.txt
#/bin/rm $INPATH/NO/carra_Norway*.txt #/bin/rm $INPATH/NO/carra_Norway*.txt
#/bin/rm $INPATH/SE/obs_*.txt #/bin/rm $INPATH/SE/obs_*.txt
......
#!/bin/ksh #!/bin/ksh
# #
set -x #set -x
echo 'Running Fix_obsfiles_DK.ksh'
work_dir=/scratch/ms/se/snz/carra_vobs_2018_2019/carra_vobs_code/new_scripts work_dir=/scratch/ms/se/snz/carra_vobs_2018_2019/carra_vobs_code/new_scripts
outdir="${work_dir}/outputs" outdir="${work_dir}/outputs"
...@@ -22,10 +23,11 @@ do ...@@ -22,10 +23,11 @@ do
IM=`perl -e "printf('%2.2i', '$MM')"` IM=`perl -e "printf('%2.2i', '$MM')"`
FILE_OUT="$TXTPATH/obs_$DTG.txt" FILE_OUT="$TXTPATH/obs_$DTG.txt"
rm -f $FILE_OUT
INFILE1="${work_dir}/inputs/input_to_fix_obsfiles_scripts/DK/GCNET/$IY/gcnet_$IY$IM.txt" INFILE1="${work_dir}/inputs/input_to_fix_obsfiles_scripts/DK/GCNET/$IY/gcnet_${IY}${IM}.txt"
INFILE2="${work_dir}/inputs/input_to_fix_obsfiles_scripts/DK/Geus/$IY/geus_$IY$IM.txt" INFILE2="${work_dir}/inputs/input_to_fix_obsfiles_scripts/DK/Geus/$IY/geus_${IY}${IM}.txt"
INFILE3="${work_dir}/inputs/input_to_fix_obsfiles_scripts/DK/Asiaq/$IY/Asiaq_$IY$IM.txt" INFILE3="${work_dir}/inputs/input_to_fix_obsfiles_scripts/DK/Asiaq/$IY/Asiaq_${IY}${IM}.txt"
grep $DTG $INFILE1 > $FILE_OUT grep $DTG $INFILE1 > $FILE_OUT
grep $DTG $INFILE2 >> $FILE_OUT grep $DTG $INFILE2 >> $FILE_OUT
......
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