Changeset 1613 for palm/trunk/LIB

Timestamp:

Jul 8, 2015 2:53:29 PM (9 years ago)

Author:

maronga

Message:

bugfix in install_rrtmg, removed nc2vdf from mbuild, improved palm_wd

File:

• palm/trunk/LIB/rrtmg/install_rrtmg (modified) (4 diffs)

palm/trunk/LIB/rrtmg/install_rrtmg

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# Bugfix: compilation of shared library fails due to misplaced rm command
 # 
 # Former revisions:
@@ -46 +46 @@
 # compiler_name="ftn"
 # fopts="-em -s real64 -O3 -hnoomp -hfp3 -hdynamic"
+# fopts_trace="-eD -em -g -R b -K trap=fp -O0 -hnoomp"
 #
 #
 
- compiler_name="mpif90"
- fopts="-fltconsistency -O3 -cpp -r8 -nbs -convert little_endian -I /muksoft/packages/netcdf/4_intel/include"
- fopts_trace="-fpe0 -C -check nooutput_conversion -debug -traceback -g -w -xT -O0 -ftz -fno-alias -no-prec-div -no-prec-sqrt -ip -nbs -convert little_endian -diag-disable 8290,8291 -I /muksoft/packages/netcdf/4_intel/include"
- install_path="$HOME/palm/rrtmg"
- compile_static=true
+ compiler_name="ftn"
+ fopts="-em -s real64 -O3 -hnoomp -hfp3 -hdynamic"
+ fopts_trace="-eD -em -g -R b -K trap=fp -O0 -hnoomp -fpic"
+ install_path="$HOME/rrtmg"
+ compile_static=false
  compile_shared=true
  compile_static_debug=false
- compile_shared_debug=false
+ compile_shared_debug=true
 
  while  getopts  p: option
@@ -144 +145 @@
     mkdir -p $install_path/shared/lib
     mkdir -p $install_path/shared/include
-    cp shared/lib/$prog.so.$version $install_path/shared/lib
+    cp shared/lib/$prog.so.$version $install_path/shared/lib/
     cp shared/include/*.mod $install_path/shared/include/
-    rm $install_path/shared/lib/$prog.so.$version $install_path/shared/lib/$prog.so.1
+    if [ -f $install_path/shared/lib/$prog.so.1 ]
+    then
+       rm $install_path/shared/lib/$prog.so.1
+    fi
     ln -s $install_path/shared/lib/$prog.so.$version $install_path/shared/lib/$prog.so.1
+    if [ -f $install_path/shared/lib/$prog.so ]
+    then
+       rm $install_path/shared/lib/$prog.so
+    fi
     ln -s $install_path/shared/lib/$prog.so.1 $install_path/shared/lib/$prog.so
     rm -rf shared
@@ -167 +175 @@
     cp shared_trace/lib/$prog.so.$version $install_path/shared_trace/lib
     cp shared_trace/include/*.mod $install_path/shared_trace/include/
-    rm $install_path/shared_trace/lib/$prog.so.$version $install_path/shared_trace/lib/$prog.so.1
+    if [ -f $install_path/shared_trace/lib/$prog.so.1 ]
+    then
+       rm $install_path/shared_trace/lib/$prog.so.1
+    fi
     ln -s $install_path/shared_trace/lib/$prog.so.$version $install_path/shared_trace/lib/$prog.so.1
+    if [ -f $install_path/shared_trace/lib/$prog.so ]
+    then
+       rm $install_path/shared_trace/lib/$prog.so
+    fi
     ln -s $install_path/shared_trace/lib/$prog.so.1 $install_path/shared_trace/lib/$prog.so
     rm -rf shared_trace