Skip to content
Snippets Groups Projects
Commit 27af7111 authored by RIETTE Sébastien's avatar RIETTE Sébastien
Browse files

Merge commit '182c2380' into GPU

parents 90d65d85 182c2380
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
...@@ -167,7 +167,7 @@ fromdir='' ...@@ -167,7 +167,7 @@ fromdir=''
if echo $commit | grep '/' > /dev/null; then if echo $commit | grep '/' > /dev/null; then
fromdir=$commit fromdir=$commit
if [ "$cycle" == "" ]; then if [ "$cycle" == "" ]; then
content_apl_arome=$(cat $commit/src/arome/ext/apl_arome.F90) content_apl_arome=$(scp $commit/src/arome/ext/apl_arome.F90 /dev/stdout)
cycle=$(content2cycle) cycle=$(content2cycle)
fi fi
packBranch=$(echo $commit | sed 's/\//'${separator}'/g' | sed 's/:/'${separator}'/g' | sed 's/\./'${separator}'/g') packBranch=$(echo $commit | sed 's/\//'${separator}'/g' | sed 's/:/'${separator}'/g' | sed 's/\./'${separator}'/g')
...@@ -296,7 +296,7 @@ if [ $compilation -eq 1 ]; then ...@@ -296,7 +296,7 @@ if [ $compilation -eq 1 ]; then
fi fi
fi fi
EXT=PHYEX/ext/ EXT=PHYEX/ext
[ ! -d $EXT ] && EXT=PHYEX/externals #old name for ext/aux [ ! -d $EXT ] && EXT=PHYEX/externals #old name for ext/aux
if [ -d $EXT ]; then if [ -d $EXT ]; then
#Move manually files outside of mpa (a find on the whole repository would take too much a long time) #Move manually files outside of mpa (a find on the whole repository would take too much a long time)
...@@ -305,6 +305,7 @@ if [ $compilation -eq 1 ]; then ...@@ -305,6 +305,7 @@ if [ $compilation -eq 1 ]; then
[ -f $EXT/suparar.F90 ] && mv $EXT/suparar.F90 ../arpifs/phys_dmn/ [ -f $EXT/suparar.F90 ] && mv $EXT/suparar.F90 ../arpifs/phys_dmn/
[ -f $EXT/apl_arome.F90 ] && mv $EXT/apl_arome.F90 ../arpifs/phys_dmn/ [ -f $EXT/apl_arome.F90 ] && mv $EXT/apl_arome.F90 ../arpifs/phys_dmn/
[ -f $EXT/suphmpa.F90 ] && mv $EXT/suphmpa.F90 ../arpifs/phys_dmn/ [ -f $EXT/suphmpa.F90 ] && mv $EXT/suphmpa.F90 ../arpifs/phys_dmn/
[ -f $EXT/vdfhghtnhl.F90 ] && mv $EXT/vdfhghtnhl.F90 ../arpifs/phys_dmn/
#Special mpa case #Special mpa case
[ -f $EXT/modd_spp_type.F90 ] && mv $EXT/modd_spp_type.F90 ../mpa/micro/externals/ [ -f $EXT/modd_spp_type.F90 ] && mv $EXT/modd_spp_type.F90 ../mpa/micro/externals/
[ -f $EXT/spp_mod_type.F90 ] && mv $EXT/spp_mod_type.F90 ../mpa/micro/externals/ [ -f $EXT/spp_mod_type.F90 ] && mv $EXT/spp_mod_type.F90 ../mpa/micro/externals/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment