remove heaps-array, adapt dir schema, fix MPI var, hdf5 bumped up to …

…1_12_0'
pacedproton · Sep 27, 2020 · 7d7c73d · 7d7c73d
2 parents efe88c1 + 1f650d1
commit 7d7c73d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/README b/README
@@ -3,7 +3,16 @@ for WRF/WRF-Chem/WPS.
 
 Buildtime: All the necessary parameterization is to fill out the block marked for required parameters.
 
-Required environment:
+2 environments are supported: AMD-generic and Intel-vsc. 
+
+Use PLATFORM_ARCH=INTEL-vsc for Intel clusters with a module environment congruent with the modules in initialize(). 
+Here, the Intel compilers, Intel MPI, cmake and perl need to be loadable through the module facility.
+
+or
+
+PLATFORM=AMD-generic for all other AMD and Intel ones (default). 
+
+Tested environment INTEL-vsc:
     RHEL/CentOS Linux (tested 7.6)
     Intel Parellel Studio (tested 19.1.0)
     cmake (tested 3.15.1)
@@ -13,16 +22,27 @@ Required environment:
     yacc (tested 1.9)
     flex (tested 2.6.4)
 
-The Intel compilers, Intel MPI, cmake and perl need to be loadable through the module facility.
+Tested environment for AMD-generic:
+    RHEL/CentOS Linux (tested 7.8)
+    Intel Parellel Studio (tested 2020.1.102)
+    cmake (tested 3.17.3)
+    perl (tested 5.16)
+    automake (tested 1.13.4) 
+    gettext (tested 0.19.8.1)
+    yacc (tested 1.9)
+    flex (tested 2.6.4)
+
+
 This script requires 2 passes to build WRF, 3 for WRF/WPS. 
 
 
 (1) Edit the script worf.sh parameter block top of the file to match the local environment.
 
 (2) Change to the script directory and run it from a bash shell: bash ./worf.sh
 
-(3) If testing was enabled (test='test') then the total compile time for the environment 
-    dependencies on a 2020 high-end SMP is around an hour wallclock time; without testing about 20'/
+(3) If testing was enabled (test='test') and the optimization level via the parameter OPTI set to '-O3' then 
+    the build time for the environment with dependencies on a 2020 high-end SMP is around 2 hours wallclock time;
+    without testing and at OPTI to '-O0' about 10'.
 
 (4) Check if the dependencies have all been deployed to 
     <PREFIX><CATEGORY>
@@ -54,7 +74,7 @@ This script requires 2 passes to build WRF, 3 for WRF/WPS.
     edit the resulting file configure.wps with:
     DM_FC: mpiifort
     DM_CC: mpiicc
-    LDFAGS: -qopenmp
+    LDFLAGS: -qopenmp
 
     then edit the library and include paths from the generated wrf_environment.sh file
     (see paramter section and wrf_environment.sh for the respective locations)

diff --git a/worf.sh b/worf.sh
@@ -25,6 +25,10 @@ initialize() {
 
     export PARALLELSTUDIO_ENVIONMENTSCRIPT='/metstor_nfs/opt/intel/parallel_studio_xe_2020.1.102/psxevars.sh'
 
+    export PLATFORM_ARCH='AMD-generic'          # {AMD-generic, INTEL-vsc}
+
+    export PARALLELSTUDIO_ENVIONMENTSCRIPT='/metstor_nfs/opt/intel/parallel_studio_xe_2020.1.102/psxevars.sh'
+
     declare -Ag environment_version             # tested versions, adapt to your environment
     environment_version[intel]='intel/19.1.0'   
     environment_version[intel-mpi]='intel-mpi/2019.6'
@@ -36,8 +40,7 @@ initialize() {
     environment_version[texinfo]='texinfo/6.5-gcc-9.1.0-jbo5m2y'
     environment_version[help2man]='help2man/1.47.8-intel-19.0.5.281-k3tb6t4'
 
-#    WRF_ENVIRONMENT=${PREFIX}/${PACKAGES}/wrf_environment.sh  # location for generated wrf environment file
-    WRF_ENVIRONMENT=/metstor_nfs/opt/sw/wrf/2709/wrf_environment.sh  # location for generated wrf environment file
+    WRF_ENVIRONMENT=${PREFIX}/${CATEGORY}/wrf_environment.sh  # location for generated wrf environment file
 
     WRF_CHEM=1
     WRF_KPP=0