Changeset 4227 for dynamico_lmdz/simple_physics/phyparam

Timestamp:

Jan 10, 2020, 5:48:45 PM (5 years ago)

Author:

dubos

Message:

simple_physics : minor fixes for parsing by XCodeML F_Front

Location:

dynamico_lmdz/simple_physics/phyparam

Files:

• Makefile (modified) (2 diffs)
• physics/logging.F90 (modified) (2 diffs)
• physics/read_param_mod.F90 (modified) (2 diffs)
• physics/writefield_mod.F90 (modified) (2 diffs)

dynamico_lmdz/simple_physics/phyparam/Makefile

@@ -1 +1 @@
 # known to compile with gfortran version 7, ifort version 17, pgfortran version 18
 # Examples
-# clear ; make clean ; 
-# F90=ifort FFLAGS=-fast make
-# F90=gfortran F90FLAGS=-ffree-line-length-none make 
-# F90=pgfortran F90FLAGS="-fast -Minfo=loop" make
+# F90=ifort FFLAGS=-fast make clean all
+# F90=gfortran F90FLAGS=-ffree-line-length-none make clean all
+# F90=pgfortran F90FLAGS="-fast -Minfo=loop" make clean all
 
 # if XCodeML F_Front is installed, set FFRONT=F_Front to parse code into XML
 FFRONT ?= true
+
+F90 ?= gfortran
+F90FLAGS ?= -ffree-line-length-none
 
 VPATH = obj
@@ -20 +22 @@
 clean :
         rm -f obj/* include/* lib/* xml/*
-        rmdir obj include lib xml
 
 %.so : $(OBJECTS)

dynamico_lmdz/simple_physics/phyparam/physics/logging.F90

@@ -30 +30 @@
 #ifndef XCODEML
   ! Note F2003/F2008: XCodeML cannot parse procedure pointers
-  PROCEDURE(plugin), POINTER :: flush_plugin => NULL()
-  PROCEDURE(plugin_log_gridpoint), POINTER :: log_gridpoint_plugin => NULL()
+  PROCEDURE(plugin), POINTER, PUBLIC :: flush_plugin => NULL()
+  PROCEDURE(plugin_log_gridpoint), POINTER, PUBLIC :: log_gridpoint_plugin => NULL()
 #endif
 
@@ -44 +44 @@
 
   PUBLIC :: logging_buf, logging_bufsize, logging_lineno, flush_log, log_gridpoint, &
-       flush_plugin, log_gridpoint_plugin, default_flush_plugin, &
        missing_plugin
 

dynamico_lmdz/simple_physics/phyparam/physics/read_param_mod.F90

@@ -34 +34 @@
 #ifndef XCODEML
   ! Note compiler compatibility : see logging.F90
-  PROCEDURE(plugin_read_paramr), POINTER :: read_paramr_plugin => NULL()
-  PROCEDURE(plugin_read_parami), POINTER :: read_parami_plugin => NULL()
-  PROCEDURE(plugin_read_paramb), POINTER :: read_paramb_plugin => NULL()
+
+  PROCEDURE(plugin_read_paramr), POINTER, PUBLIC :: read_paramr_plugin => NULL()
+  PROCEDURE(plugin_read_parami), POINTER, PUBLIC :: read_parami_plugin => NULL()
+  PROCEDURE(plugin_read_paramb), POINTER, PUBLIC :: read_paramb_plugin => NULL()
+
 #endif
 
@@ -43 +45 @@
   END INTERFACE read_param
 
-  PUBLIC :: read_param, read_paramr_plugin, read_parami_plugin, read_paramb_plugin
+  PUBLIC :: read_param
 
 CONTAINS

dynamico_lmdz/simple_physics/phyparam/physics/writefield_mod.F90

@@ -17 +17 @@
 
 #ifndef XCODEML
-  PROCEDURE(plugin_writefield1), POINTER :: writefield1_plugin => NULL()
-  PROCEDURE(plugin_writefield2), POINTER :: writefield2_plugin => NULL()
+
+  PROCEDURE(plugin_writefield1), POINTER, PUBLIC :: writefield1_plugin => NULL()
+  PROCEDURE(plugin_writefield2), POINTER, PUBLIC :: writefield2_plugin => NULL()
+
 #endif
   INTERFACE writefield
@@ -24 +26 @@
   END INTERFACE writefield
 
-  PUBLIC :: writefield, writefield1_plugin, writefield2_plugin
+  PUBLIC :: writefield
 
 CONTAINS