Changeset 3964

Timestamp:

Nov 8, 2016, 4:27:42 PM (9 years ago)

Author:

ymipsl

Message:

Update ADA configuration for IOIPSL lib

YM

Location:

dynamico_lmdz/aquaplanet/IOIPSL

Files:

• arch/arch-X64_ADA.fcm (modified) (1 diff)
• makeioipsl_fcm (modified) (3 diffs)

dynamico_lmdz/aquaplanet/IOIPSL/arch/arch-X64_ADA.fcm

@@ -9 +9 @@
 %PROD_FFLAGS         -g -traceback -O3 -vec-report2
 %DEV_FFLAGS          -g -O1 -traceback
-%DEBUG_FFLAGS        -g -traceback -check bounds -fp-model strict
+%DEBUG_FFLAGS        -g -check bounds -fp-model strict
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp -openmp-threadprivate=compat
-%BASE_LD             -i4 -r8 -auto ${MKL_LIBS}
+%BASE_LD             -i4 -r8 -auto
 %MPI_LD
 %OMP_LD              -openmp -openmp-threadprivate=compat

dynamico_lmdz/aquaplanet/IOIPSL/makeioipsl_fcm

@@ -10 +10 @@
 arch_defined="FALSE"
 arch_path="arch"
+arch_default_path="arch"
 arch_path_defined="FALSE"
 CPP_KEY="CPP_NONE" 
@@ -61 +62 @@
   rm -f arch.fcm
   rm -f arch.env
-  ln -s $arch_path/arch-${arch}.path ./arch.path
-  ln -s $arch_path/arch-${arch}.fcm  ./arch.fcm
+
+  if test -f $arch_path/arch-${arch}.path
+  then
+    ln -s $arch_default_path/arch-${arch}.path arch.path
+  elif test -f $arch_default_path/arch-${arch}.path
+  then
+    ln -s $arch_default_path/arch-${arch}.path arch.path
+  fi
+        
+  if test -f $arch_path/arch-${arch}.fcm
+  then
+    ln -s $arch_path/arch-${arch}.fcm arch.fcm
+  elif test -f $arch_default_path/arch-${arch}.fcm
+  then
+    ln -s $arch_default_path/arch-${arch}.fcm arch.fcm
+  fi
+
   if test -f $arch_path/arch-${arch}.env
-    then
-      ln -s $arch_path/arch-${arch}.env arch.env
-    else
-      ln -s .void_file arch.env
-    fi
+  then
+    ln -s $arch_path/arch-${arch}.env arch.env
+  elif test -f $arch_default_path/arch-${arch}.env
+  then
+    ln -s $arch_default_path/arch-${arch}.env arch.env
+  else
+    ln -s .void_file arch.env
+  fi
   source arch.env
   source arch.path
@@ -75 +94 @@
   exit 1
 fi
-
 LD_FLAGS="%BASE_LD"