Changeset 4230 for dynamico_lmdz/simple_physics/phyparam

Timestamp:

Jan 16, 2020, 3:25:44 PM (5 years ago)

Author:

dubos

Message:

simple_physics : able to run without plugins

Location:

dynamico_lmdz/simple_physics/phyparam/physics

Files:

• iniphyparam_mod.F90 (modified) (4 diffs)
• logging.F90 (modified) (4 diffs)
• read_param_mod.F90 (modified) (4 diffs)

dynamico_lmdz/simple_physics/phyparam/physics/iniphyparam_mod.F90

@@ -43 +43 @@
     CALL read_param('Cd_mer',.01      ,Cd_mer,'Cd_mer')
     CALL read_param('Cd_ter',.01      ,Cd_ter,'Cd_ter')
-    CALL read_param('I_mer',30000.    ,I_mer,'I_mer')
-    CALL read_param('I_ter',30000.    ,I_ter,'I_ter')
+    CALL read_param('I_mer',3000.    ,I_mer,'I_mer')
+    CALL read_param('I_ter',3000.    ,I_ter,'I_ter')
     CALL read_param('alb_ter',.112    ,alb_ter,'alb_ter')
     CALL read_param('alb_mer',.112    ,alb_mer,'alb_mer')
@@ -69 +69 @@
     CALL check_mismatch('R', pr, r)
     CALL check_mismatch('cpp', pcpp, cpp)
+    LOG_WARN('iniphyparam')
 
     WRITELOG(*,*) 'Activation de la physique:'
@@ -92 +93 @@
     dtphys=ptimestep
 
-    LOG_INFO('iniphyparama')
+    LOG_INFO('iniphyparam')
   END SUBROUTINE iniphyparam
 
@@ -99 +100 @@
     REAL, INTENT(IN) :: a,b
     IF(a /= b) THEN
-       PRINT *, 'Phys/dyn mismatch for ', name, ' : ',a,b
+       WRITELOG(*,*) 'Phys/dyn mismatch for ', name, ' : ',a,b
     END IF
   END SUBROUTINE check_mismatch

dynamico_lmdz/simple_physics/phyparam/physics/logging.F90

@@ -50 +50 @@
   SUBROUTINE missing_plugin(name, mod)
     CHARACTER(*), INTENT(IN) :: name, mod
-    PRINT *, 'FATAL : plugin ', name, ' not provided by the driver program'
-    PRINT *, '        see ', mod
-    STOP
+    WRITE(logging_buf(1),*) 'WARNING : plugin ', name, ' not provided by the driver program'
+    WRITE(logging_buf(2),*) '        see ', mod
+    logging_lineno=2
+    CALL flush_log(log_level_warn, 'missing_plugin')
   END SUBROUTINE missing_plugin
 
@@ -59 +60 @@
     CHARACTER(*), INTENT(IN) :: tag
 #ifndef XCODEML
-    IF(.NOT.ASSOCIATED(flush_plugin)) flush_plugin => default_flush_plugin
+    IF(.NOT.ASSOCIATED(flush_plugin)) THEN
+       flush_plugin => default_flush_plugin
+       WRITE(*,*) 'WARNING : plugin flush_plugin not provided by the driver program'
+       WRITE(*,*) '        see logging.F90'
+    END IF
     IF(logging_lineno>0 .AND. lev<=max_log_level) CALL flush_plugin(lev, TRIM(tag), logging_buf(1:logging_lineno))
     logging_lineno=0
@@ -73 +78 @@
     WRITE(prefix,*) '[', dbtag(lev), ' ', tag, ']'
     DO i=1, SIZE(buf)
-       PRINT *, TRIM(prefix), TRIM(buf(i))
+       WRITE(*,*) TRIM(prefix), TRIM(buf(i))
     END DO
   END SUBROUTINE default_flush_plugin
@@ -81 +86 @@
     logging_lineno = logging_lineno+1
 #ifndef XCODEML
-    IF(.NOT.ASSOCIATED(log_gridpoint_plugin)) log_gridpoint_plugin => default_log_gridpoint
+    IF(.NOT.ASSOCIATED(log_gridpoint_plugin)) THEN
+       log_gridpoint_plugin => default_log_gridpoint
+       WRITE(*,*) 'WARNING : plugin log_gridpoint_plugin not provided by the driver program'
+       WRITE(*,*) '        see logging.F90'
+    END IF
     CALL log_gridpoint_plugin(index, logging_buf(logging_lineno))
 #endif

dynamico_lmdz/simple_physics/phyparam/physics/read_param_mod.F90

@@ -1 +1 @@
 MODULE read_param_mod
-  USE logging, ONLY : missing_plugin
+#include "use_logging.h"
   IMPLICIT NONE
   PRIVATE
@@ -54 +54 @@
     REAL, INTENT(OUT)        :: val
 #ifndef XCODEML
-    IF(.NOT.ASSOCIATED(read_paramr_plugin)) CALL missing_plugin('read_paramr','read_param_mod')
-    CALL read_paramr_plugin(name, defval, val, comment)
+    IF(.NOT.ASSOCIATED(read_paramr_plugin)) THEN
+       CALL missing_plugin('read_paramr','read_param_mod')
+       val = defval
+    ELSE
+       CALL read_paramr_plugin(name, defval, val, comment)
+    END IF
 #endif
+    WRITELOG(*,*) name, ' = ', val
+    LOG_INFO('read_param')
   END SUBROUTINE read_paramr
 
@@ -64 +70 @@
     INTEGER, INTENT(OUT)     :: val
 #ifndef XCODEML
-    IF(.NOT.ASSOCIATED(read_parami_plugin)) CALL missing_plugin('read_parami','read_param_mod')
-    CALL read_parami_plugin(name, defval, val, comment)
+    IF(.NOT.ASSOCIATED(read_parami_plugin)) THEN
+       CALL missing_plugin('read_parami','read_param_mod')
+       val = defval
+    ELSE
+       CALL read_parami_plugin(name, defval, val, comment)
+    END IF
 #endif
+    WRITELOG(*,*) name, ' = ', val
+    LOG_INFO('read_param')
   END SUBROUTINE read_parami
 
@@ -74 +86 @@
     LOGICAL, INTENT(OUT)     :: val
 #ifndef XCODEML
-    IF(.NOT.ASSOCIATED(read_paramr_plugin)) CALL missing_plugin('read_paramb','read_param_mod')
-    CALL read_paramb_plugin(name, defval, val, comment)
+    IF(.NOT.ASSOCIATED(read_paramr_plugin)) THEN
+       CALL missing_plugin('read_paramb','read_param_mod')
+       val = defval
+    ELSE
+       CALL read_paramb_plugin(name, defval, val, comment)
+    END IF
 #endif
+    WRITELOG(*,*) name, ' = ', val
+    LOG_INFO('read_param')
   END SUBROUTINE read_paramb
-
+  
 END MODULE read_param_mod