Merge pull request #236 from jedwards4b/izumi_update0525

Izumi update0525

Author: jedwards4b

machines/cmake_macros/nag.cmake

@@ -27,4 +27,3 @@ set(MPIFC "mpif90")
 set(SCC "gcc")
 set(SFC "nagfor")
 string(APPEND LDFLAGS " -lpthread")
-string(APPEND CONFIG_ARGS " FCLIBS='-Wl,--as-needed,--allow-shlib-undefined  -L$(COMPILER_PATH)/lib/NAG_Fortran -lf62rts'")

machines/izumi/config_machines.xml

@@ -61,11 +61,11 @@
         <command name="load">mpi/2.3.3/intel/20.0.1</command>
       </modules>
       <modules compiler="nag">
-        <command name="load">compiler/nag/6.2-8.1.0</command>
-        <command name="load">tool/netcdf/c4.6.1-f4.4.4/nag-gnu/6.2-8.1.0</command>
+        <command name="load">compiler/nag/7.0</command>
+        <command name="load">tool/netcdf/c4.7.4-f4.5.2/nag-gnu/7.0-9.3.0</command>
       </modules>
       <modules compiler="nag" mpilib="mvapich2">
-        <command name="load">mpi/2.3.3/nag/6.2</command>
+        <command name="load">mpi/2.3.3/nag/7.0</command>
       </modules>
       <modules compiler="nag" mpilib="mpi-serial">
         <command name="rm">mpi</command>
@@ -88,20 +88,20 @@
       </modules>
 
       <modules compiler="nag" mpilib="mvapich2" DEBUG="FALSE">
-        <command name="load">esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mvapich2-O</command>
-        <command name="load">mvapich2/2.3.3/nag/6.2/pio/2_5_10</command>
+        <command name="load">esmfpkgs/nag/7.0/esmf-8.8.0-ncdfio-mvapich2-O</command>
+<!--        <command name="load">mvapich2/2.3.3/nag/6.2/pio/2_5_10</command> -->
       </modules>
       <modules compiler="nag" mpilib="mvapich2" DEBUG="TRUE">
-        <command name="load">esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mvapich2-g</command>
-        <command name="load">mvapich2/2.3.3/nag/6.2/pio/2_5_10</command>
+        <command name="load">esmfpkgs/nag/7.0/esmf-8.8.0-ncdfio-mvapich2-g</command>
+<!--        <command name="load">mvapich2/2.3.3/nag/6.2/pio/2_5_10</command> -->
       </modules>
       <modules compiler="nag" mpilib="mpi-serial" DEBUG="TRUE">
-        <command name="load">esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mpiuni-g</command>
-        <command name="load">mpi-serial/2.3.0/nag/6.2/pio/2_5_10</command>
+        <command name="load">esmfpkgs/nag/7.0/esmf-8.8.0-ncdfio-mpiuni-g</command>
+<!--        <command name="load">mpi-serial/2.3.0/nag/6.2/pio/2_5_10</command> -->
       </modules>
       <modules compiler="nag" mpilib="mpi-serial" DEBUG="FALSE">
-        <command name="load">esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mpiuni-O</command>
-        <command name="load">mpi-serial/2.3.0/nag/6.2/pio/2_5_10</command>
+        <command name="load">esmfpkgs/nag/7.0/esmf-8.8.0-ncdfio-mpiuni-O</command>
+<!--        <command name="load">mpi-serial/2.3.0/nag/6.2/pio/2_5_10</command> -->
       </modules>
 
       <modules compiler="intel" mpilib="mpi-serial" DEBUG="TRUE">
@@ -113,12 +113,12 @@
         <command name="load">mpi-serial/2.3.0/intel/20.0.1/pio/2_5_10</command>
       </modules>
       <modules compiler="intel" mpilib="mvapich2" DEBUG="TRUE">
-        <command name="load">esmfpkgs/intel/20.0.1/esmf-8.6.1-ncdfio-mvapich2-g</command>
-        <command name="load">mvapich2/2.3.3/intel/20.0.1/pio/2_5_10</command>
+        <command name="load">esmfpkgs/intel/20.0.1/esmf-8.8.0-ncdfio-mvapich2-g</command>
+<!--        <command name="load">mvapich2/2.3.3/intel/20.0.1/pio/2_5_10</command> -->
       </modules>
       <modules compiler="intel" mpilib="mvapich2" DEBUG="FALSE">
-        <command name="load">esmfpkgs/intel/20.0.1/esmf-8.6.1-ncdfio-mvapich2-O</command>
-        <command name="load">mvapich2/2.3.3/intel/20.0.1/pio/2_5_10</command>
+        <command name="load">esmfpkgs/intel/20.0.1/esmf-8.8.0-ncdfio-mvapich2-O</command>
+<!--        <command name="load">mvapich2/2.3.3/intel/20.0.1/pio/2_5_10</command> -->
       </modules>
     </module_system>
     <environment_variables>

machines/izumi/izumi.cmake

@@ -6,4 +6,5 @@ if (MPILIB STREQUAL mvapich2)
   set(MPI_LIB_NAME "mpich")
 endif()
 set(NETCDF_PATH "$ENV{NETCDF_PATH}")
-string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf")
+# nf90 symbols seem to be missing from the shared library, explicitly adding the static fortran library solves the issue.
+string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf $(NETCDF_PATH)/lib/libnetcdff.a")

machines/izumi/nag_izumi.cmake

@@ -1 +1,2 @@
-string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf -Wl,-Wl,,-rpath,$(NETCDF_PATH)/lib")
+string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf -Wl,-Wl,,-rpath,$(NETCDF_PATH)/lib")
+string(APPEND CONFIG_ARGS " FCLIBS='-Wl,--as-needed,--allow-shlib-undefined  -L$(COMPILER_PATH)/lib/NAG_Fortran -lf70rts'")