Changeset 4230 for dynamico_lmdz

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

Files:

• bash/compile_XCodeML.sh (added)
• bash/omnicompiler-1.3.2.tar.bz2 (added)
• config/LMDZ/TEST_PARAM/check.sh (modified) (1 diff)
• config/LMDZ/TEST_PARAM/gcm.output.IRENE (modified) (1 diff)
• config/LMDZ/TEST_PARAM/gcm.output.ref (deleted)
• config/LMDZ/TEST_PARAM/planete.def (modified) (1 diff)
• config/LMDZ/TEST_PARAM/traceur.def (modified) (1 diff)
• config/LMDZ/USEFUL (modified) (1 diff)
• config/LMDZ/build_lmdz_phyparam.sh (modified) (2 diffs)
• phyparam/physics/iniphyparam_mod.F90 (modified) (4 diffs)
• phyparam/physics/logging.F90 (modified) (4 diffs)
• phyparam/physics/read_param_mod.F90 (modified) (4 diffs)

dynamico_lmdz/simple_physics/config/LMDZ/TEST_PARAM/check.sh

@@ -2 +2 @@
 #grep -A 1 'd abs' --no-group-separator gcm.log | grep -v 'd abs'  > gcm.output
 grep -A 1 'd abs' --no-group-separator gcm.log | grep -v 'd abs' | head > gcm.output
-diff -s gcm.output gcm.output.$1
-diff gcm.output gcm.output.$1
+diff -s gcm.output gcm.output.$1 && diff gcm.output gcm.output.$1

dynamico_lmdz/simple_physics/config/LMDZ/TEST_PARAM/gcm.output.IRENE

@@ -1 @@
-   100762.54565224030        5.0634871262939364E-003  0.99208256187172461     
-   99914.867101038908        5.0208898556170188E-003  0.99214890623452645     
-   99253.329187461582        4.9876464645606357E-003  0.99220068520671523     
-   98952.802170607873        4.9725444772984817E-003  0.99222420853053495     
-   99084.198759728839        4.9791473765518337E-003  0.99221392358122529     
-   99371.405615273499        4.9935800033400930E-003  0.99219144309525686     
-   99701.915155864132        5.0101886627687050E-003  0.99216557381701764     
-   100002.48069994792        5.0252925860888665E-003  0.99214204886784030     
-   100291.32387703673        5.0398074407825419E-003  0.99211944194159085     
-   100564.55205486271        5.0535376155414983E-003  0.99209805763060788     
+  [INF rad_sw]   100762.54565224030        5.0634871262939364E-003  0.99208256155400709
+  [INF rad_sw]   99914.880411921549        5.0208905245112245E-003  0.99214890393244037
+  [INF rad_sw]   99253.356956060161        4.9876478599793451E-003  0.99220068021623176
+  [INF rad_sw]   98952.829415248460        4.9725458463874229E-003  0.99222420140509127
+  [INF rad_sw]   99084.107098940629        4.9791427704433027E-003  0.99221392294421296
+  [INF rad_sw]   99371.272555205171        4.9935733168482163E-003  0.99219144222902989
+  [INF rad_sw]   99701.658751878960        5.0101757780378784E-003  0.99216557848027787
+  [INF rad_sw]   100002.12719360919        5.0252748218017141E-003  0.99214205635455444
+  [INF rad_sw]   100290.17486954234        5.0397497012264576E-003  0.99211950625490253
+  [INF rad_sw]   100562.38519882695        5.0534287273869697E-003  0.99209819550986678

dynamico_lmdz/simple_physics/config/LMDZ/TEST_PARAM/planete.def

@@ -8 +8 @@
 aphelie=150.
 peri_day=0.
-obliquit=0.
+obliquit=23.
 Cd_mer=.01
 Cd_ter=.01

dynamico_lmdz/simple_physics/config/LMDZ/TEST_PARAM/traceur.def

@@ -1 @@
-2
+3
 14 14 H2Ov
 10 10 H2Ol

dynamico_lmdz/simple_physics/config/LMDZ/USEFUL

@@ -1 @@
-./build_lmdz_phyparam.sh patch_lmdz
+./build_lmdz_phyparam.sh patch_lmdz -debug
 ./build_lmdz_phyparam.sh full
 (cd TEST_PARAM/; time ./gcm.e | tee gcm.log | grep '*    pas ' && ./check.sh IRENE)
+grep WRN TEST_PARAM/gcm.log | sort -u

dynamico_lmdz/simple_physics/config/LMDZ/build_lmdz_phyparam.sh

@@ -32 +32 @@
     ln -sf $ROOT/phyparam/dynphy_lonlat/* .
     cd $LMDZ
-    echo "./makelmdz_fcm -rrtm false  -v false -arch local -j 8 -p param -d 32x32x39 gcm" > compile.sh
+    echo "./makelmdz_fcm $* -rrtm false  -v false -arch local -j 8 -p param -d 32x32x39 gcm" > compile.sh
     chmod +x compile.sh
     ./compile.sh
@@ -58 +58 @@
 ROOT=$(cd -P ../.. ; pwd)
 
-cmd_$1
+CMD=$1
+shift
+cmd_$CMD $*
+

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