Changeset 738

Timestamp:

09/21/18 00:59:11 (6 years ago)

Author:

dubos

Message:

devel/IRENE : use AVX512 in dynamics and AVX elsewhere ; fixes mass convervation issue

Location:

codes/icosagcm/devel

Files:

• arch/arch-X64_IRENE.fcm (modified) (1 diff)
• arch/arch-X64_IRENE.opt (added)
• bld.cfg (modified) (1 diff)
• make_icosa (modified) (4 diffs)

codes/icosagcm/devel/arch/arch-X64_IRENE.fcm

@@ -7 +7 @@
 %FPP_DEF             KEY_NONE CPP_NETCDF4
 %BASE_FFLAGS         -fPIC -i4 -r8 -auto -align all -I${MKLROOT}/include
-%PROD_FFLAGS         -g -traceback -O3 -xCORE-AVX512
+%FAST_FFLAGS         -g -traceback -O3 -xHost
+%PROD_FFLAGS         -g -traceback -O3 -xAVX
 %DEV_FFLAGS          -g -O1 -traceback
 %DEBUG_FFLAGS        -g -traceback -check bounds -fp-model strict

codes/icosagcm/devel/bld.cfg

@@ -49 +49 @@
 bld::tool::fppflags  %FPP_FLAGS
 
+# arch.opt is there to set per-file specific compiling options ; example :
+#bld::tool::fflags::phys::readaerosol %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -pi auto
+inc arch.opt
+
 # Pre-process code before analysing dependencies
 bld::pp              false

codes/icosagcm/devel/make_icosa

@@ -96 +96 @@
 mkdir .void_dir
 
+function link_if_exists()
+{
+  suffix=$1
+  if test -f $arch_path/arch-${arch}.${suffix}
+  then
+    ln -s $arch_path/arch-${arch}.${suffix} arch.${suffix}
+  elif test -f $arch_default_path/arch-${arch}.${suffix}
+  then
+    ln -s $arch_default_path/arch-${arch}.${suffix} arch.${suffix}
+  fi
+        
+}
+
 if [[ "$arch_defined" == "TRUE" ]]
 then
@@ -101 +114 @@
   rm -f arch.fcm
   rm -f arch.env
-
-  if test -f $arch_path/arch-${arch}.path
-  then
-    ln -s $arch_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
-  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
+  
+  for suffix in env path fcm opt ; do link_if_exists $suffix ; done
+
   source arch.env
   source arch.path
+
 else
   echo "Veuillez definir une architecture cible"
@@ -135 +126 @@
 
 LD_FLAGS="%BASE_LD"
-
-if [[ "$compil_mode" == "prod" ]]
-then
-  COMPIL_FFLAGS="%PROD_FFLAGS"
-elif [[ "$compil_mode" == "dev" ]]
-then
-  COMPIL_FFLAGS="%DEV_FFLAGS"
-elif [[ "$compil_mode" == "debug" ]]
-then
-  COMPIL_FFLAGS="%DEBUG_FFLAGS"
-fi
+COMPIL_FFLAGS=""
 
 if [[ "$parallel" == "mpi" ]]
@@ -210 +191 @@
 fi
 
+if [[ "$compil_mode" == "prod" ]]
+then
+  HOPT_FFLAGS="%FAST_FFLAGS $COMPIL_FFLAGS"
+  COMPIL_FFLAGS="%PROD_FFLAGS $COMPIL_FFLAGS"
+elif [[ "$compil_mode" == "dev" ]]
+then
+  COMPIL_FFLAGS="%DEV_FFLAGS $COMPIL_FFLAGS"
+  HOPT_FFLAGS=$COMPIL_FFLAGS
+elif [[ "$compil_mode" == "debug" ]]
+then
+  COMPIL_FFLAGS="%DEBUG_FFLAGS $COMPIL_FFLAGS"
+  HOPT_FFLAGS=$COMPIL_FFLAGS
+fi
+
 rm -f config.fcm
 
 echo "%COMPIL_FFLAGS $COMPIL_FFLAGS" >> config.fcm
+echo "%HOPT_FFLAGS $HOPT_FFLAGS" >> config.fcm
 echo "%LD_FLAGS $LD_FLAGS" >> config.fcm
 echo "%CPP_KEY $CPP_KEY" >> config.fcm