Changeset 1403 for LMDZ4/trunk/libf/phylmd/phyredem.F

Timestamp:

Jul 1, 2010, 11:02:53 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4V5.0-dev branch changes r1292:r1399 to trunk.

Validation:
Validation consisted in compiling the HEAD revision of the trunk,
LMDZ4V5.0-dev branch and the merged sources and running different
configurations on local and SX8 machines comparing results.

Local machine: bench configuration, 32x24x11, gfortran

• IPSLCM5A configuration (comparison between trunk and merged sources):
  • numerical convergence on dynamical fields over 3 days
  • start files are equivalent (except for RN and PB fields)
  • daily history files equivalent

• MH07 configuration, new physics package (comparison between LMDZ4V5.0-dev branch and merged sources):
  • numerical convergence on dynamical fields over 3 days
  • start files are equivalent (except for RN and PB fields)
  • daily history files equivalent

SX8 machine (brodie), 96x95x39 on 4 processors:

• IPSLCM5A configuration:
  • start files are equivalent (except for RN and PB fields)
  • monthly history files equivalent

• MH07 configuration:
  • start files are equivalent (except for RN and PB fields)
  • monthly history files equivalent

Changes to the makegcm and create_make_gcm scripts to take into account
main programs in F90 files

---

Fusion de la branche LMDZ4V5.0-dev (r1292:r1399) au tronc principal

Validation:
La validation a consisté à compiler la HEAD de le trunk et de la banche
LMDZ4V5.0-dev et les sources fusionnées et de faire tourner le modéle selon
différentes configurations en local et sur SX8 et de comparer les résultats

En local: 32x24x11, config bench/gfortran

• pour une config IPSLCM5A (comparaison tronc/fusion):
  • convergence numérique sur les champs dynamiques après 3 jours
  • restart et restartphy égaux (à part sur RN et Pb)
  • fichiers histoire égaux

• pour une config nlle physique (MH07) (comparaison LMDZ4v5.0-dev/fusion):
  • convergence numérique sur les champs dynamiques après 3 jours
  • restart et restartphy égaux
  • fichiers histoire équivalents

Sur brodie, 96x95x39 sur 4 proc:

• pour une config IPSLCM5A:
  • restart et restartphy égaux (à part sur RN et PB)
  • pas de différence dans les fichiers histmth.nc

• pour une config MH07
  • restart et restartphy égaux (à part sur RN et PB)
  • pas de différence dans les fichiers histmth.nc

Changement sur makegcm et create_make-gcm pour pouvoir prendre en compte des
programmes principaux en *F90

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/phyredem.F (modified) (5 diffs)

LMDZ4/trunk/libf/phylmd/phyredem.F

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
 c
@@ -14 +14 @@
       USE traclmdz_mod, ONLY : traclmdz_to_restart
       USE infotrac
+      USE control_mod
+
 
       IMPLICIT none
@@ -24 +26 @@
 #include "dimsoil.h"
 #include "clesphys.h"
-#include "control.h"
 #include "temps.h"
 #include "thermcell.h"
@@ -247 +248 @@
       ENDDO
 c
-      CALL put_field("ZMEA","",zmea)
-c
-      CALL put_field("ZSTD","",zstd)
-      
-      CALL put_field("ZSIG","",zsig)
-      
-      CALL put_field("ZGAM","",zgam)
-      
-      CALL put_field("ZTHE","",zthe)
-      
-      CALL put_field("ZPIC","",zpic)
-      
-      CALL put_field("ZVAL","",zval)
+      CALL put_field("ZMEA","ZMEA",zmea)
+c
+      CALL put_field("ZSTD","ZSTD",zstd)
+      
+      CALL put_field("ZSIG","ZSIG",zsig)
+      
+      CALL put_field("ZGAM","ZGAM",zgam)
+      
+      CALL put_field("ZTHE","ZTHE",zthe)
+      
+      CALL put_field("ZPIC","ZPIC",zpic)
+      
+      CALL put_field("ZVAL","ZVAL",zval)
       
       CALL put_field("RUGSREL","RUGSREL",rugoro)
       
-      CALL put_field("TANCIEN","",t_ancien)
-      
-      CALL put_field("QANCIEN","",q_ancien)
+      CALL put_field("TANCIEN","TANCIEN",t_ancien)
+      
+      CALL put_field("QANCIEN","QANCIEN",q_ancien)
       
       CALL put_field("RUGMER","Longueur de rugosite sur mer",
@@ -298 +299 @@
 !!!!!!!!!!!!!!!!!!!! FIN TKE PBL !!!!!!!!!!!!!!!!!!!!!!!!!
 cIM ajout zmax0, f0, ema_work1, ema_work2
-cIM wake_deltat, wake_deltaq, wake_s, wake_cstar, wake_fip
-      
-      CALL put_field("ZMAX0","",zmax0)
-      
-      CALL put_field("F0","",f0)
-      
-      CALL put_field("EMA_WORK1","",ema_work1)
-      
-      CALL put_field("EMA_WORK2","",ema_work2)
+cIM wake_deltat, wake_deltaq, wake_s, wake_cstar, wake_pe, wake_fip
+      
+      CALL put_field("ZMAX0","ZMAX0",zmax0)
+      
+      CALL put_field("F0","F0",f0)
+      
+      CALL put_field("EMA_WORK1","EMA_WORK1",ema_work1)
+      
+      CALL put_field("EMA_WORK2","EMA_WORK2",ema_work2)
       
 c wake_deltat
-      CALL put_field("WAKE_DELTAT","",wake_deltat)
-
-      CALL put_field("WAKE_DELTAQ","",wake_deltaq)
-      
-      CALL put_field("WAKE_S","",wake_s)
-      
-      CALL put_field("WAKE_CSTAR","",wake_cstar)
-      
-      CALL put_field("WAKE_FIP","",wake_fip)
-
+      CALL put_field("WAKE_DELTAT","WAKE_DELTAT",wake_deltat)
+
+      CALL put_field("WAKE_DELTAQ","WAKE_DELTAQ",wake_deltaq)
+      
+      CALL put_field("WAKE_S","WAKE_S",wake_s)
+      
+      CALL put_field("WAKE_CSTAR","WAKE_CSTAR",wake_cstar)
+      
+      CALL put_field("WAKE_PE","WAKE_PE",wake_pe)
+
+      CALL put_field("WAKE_FIP","WAKE_FIP",wake_fip)
+
+c thermiques
+
+      CALL put_field("FM_THERM","FM_THERM",fm_therm)
+
+      CALL put_field("ENTR_THERM","ENTR_THERM",entr_therm)
+
+      CALL put_field("DETR_THERM","DETR_THERM",detr_therm)
 
 ! trs from traclmdz_mod