Changeset 1654 for LMDZ5/trunk/libf/dyn3dpar/calfis_p.F

Timestamp:

Sep 24, 2012, 5:07:18 PM (12 years ago)

Author:

aslmd

Message:

---

• Changements dans calfis pour appeler la physique generique planetaire NB: dans le futur il faudrait un appel commun mais actuellement differences dans les arguments...
• Changements dans dynetat0 pour s'accommoder des tableaux "controle" terrestre et planeto
• Passage de la variable pseudoalt dans comvert.h (compatibilite planeto)
• arch : ajout des fichiers pour faire fonctionner sur ciclad avec ifort

verifie : compatibilite bit-par-bit des resultats et initialisations, ainsi que 1+1=2 avec unpun.sh

---

• Changes in calfis so that generic physics for planets could be interfaced NB: ideally a common call should be implemented but for now there are differences in arguments...
• Changes in dynetat0 to cope with difference in "controle" between earth and planeto
• Transfer of variable pseudoalt into comvert.h (this is only used by planeto and done for compatibility)
• arch: added files to allow use of ifort compiler on ciclad cluster

checked : bit-by-bit compatibility of results and starts, as well as 1+1=2 with unpun.sh

---

Author : AS equipe planeto

File:

• LMDZ5/trunk/libf/dyn3dpar/calfis_p.F (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3dpar/calfis_p.F

@@ -242 +242 @@
       integer :: k,kstart,kend
       INTEGER :: offset  
+
+      LOGICAL tracerdyn
 c
 c-----------------------------------------------------------------------
@@ -636 +638 @@
       zdqfic_omp(:,:,:)=0.
 
-      if (planet_type=="earth") then
 #ifdef CPP_PHYS
       do isplit=1,nsplit_phys
@@ -644 +645 @@
          lafin_split=lafin.and.isplit==nsplit_phys
 
+      if (planet_type=="earth") then
 
       CALL physiq (klon,
@@ -674 +676 @@
      .             PVteta)
 
+      else if ( planet_type=="generic" ) then
+
+      CALL physiq (klon,     !! ngrid
+     .             llm,            !! nlayer
+     .             nqtot,          !! nq
+     .             tname,          !! tracer names from dynamical core (given in infotrac)
+     .             debut_split,    !! firstcall 
+     .             lafin_split,    !! lastcall
+     .             float(day_ini), !! pday <-- day_ini (dans temps.h)
+     .             jH_cur_split,   !! ptime "fraction of day"
+     .             zdt_split,      !! ptimestep
+     .             zplev_omp,  !! pplev
+     .             zplay_omp,  !! pplay
+     .             zphi_omp,   !! pphi
+     .             zufi_omp,   !! pu
+     .             zvfi_omp,   !! pv
+     .             ztfi_omp,   !! pt
+     .             zqfi_omp,   !! pq
+     .             flxwfi_omp, !! pw !! or 0. anyway this is for diagnostic. not used in physiq.
+     .             zdufi_omp,  !! pdu
+     .             zdvfi_omp,  !! pdv
+     .             zdtfi_omp,  !! pdt
+     .             zdqfi_omp,  !! pdq
+     .             zdpsrf_omp, !! pdpsrf
+     .             tracerdyn)      !! tracerdyn <-- utilite ???
+
+      endif ! of if (planet_type=="earth")
+
+
          zufi_omp(:,:)=zufi_omp(:,:)+zdufi_omp(:,:)*zdt_split
          zvfi_omp(:,:)=zvfi_omp(:,:)+zdvfi_omp(:,:)*zdt_split
@@ -688 +719 @@
 #endif
 ! of #ifdef CPP_PHYS
-      endif !of if (planet_type=="earth")
 
       zdufi_omp(:,:)=zdufic_omp(:,:)/nsplit_phys