Changeset 101 for trunk/libf/dyn3dpar

Timestamp:

Mar 23, 2011, 4:23:31 PM (14 years ago)

Author:

slebonnois

Message:

SL: modifications pour arriver a compiler le gcm VENUS !
Ca marche !
A noter: modifs de makelmdz

Location:

trunk/libf/dyn3dpar

Files:

• ce0l.F90 (modified) (2 diffs)
• gcm.F (modified) (3 diffs)
• leapfrog_p.F (modified) (1 diff)
• logic.h (modified) (1 diff)
• sortvarc.F (modified) (1 diff)

trunk/libf/dyn3dpar/ce0l.F90

@@ -30 +30 @@
 #endif
   IMPLICIT NONE
+#include "iniprint.h"
 #ifndef CPP_EARTH
   WRITE(lunout,*)'limit_netcdf: Earth-specific routine, needs Earth physics'
@@ -39 +40 @@
 #include "paramet.h"
 #include "indicesol.h"
-#include "iniprint.h"
 #include "temps.h"
 #include "logic.h"

trunk/libf/dyn3dpar/gcm.F

@@ -188 +188 @@
 !#ifdef CPP_EARTH
 #ifdef CPP_PHYS
-        CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
+        CALL init_phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
 #endif
 !      endif ! of if (planet_type.eq."earth")
@@ -210 +210 @@
 #ifdef CPP_PHYS
 c$OMP PARALLEL
-      call InitComgeomphy
+      call initcomgeomphy
 c$OMP END PARALLEL 
 #endif
@@ -513 +513 @@
       else
 ! A voir pour Titan et Venus
-      write(lunout,*)'A VOIR POUR VENUS ET TITAN: separation en annees...'
+      write(lunout,*)'A VOIR POUR VENUS/TITAN: separation en annees...'
       endif ! planet_type
 

trunk/libf/dyn3dpar/leapfrog_p.F

@@ -203 +203 @@
       LOGICAL :: ok_start_timer=.FALSE.
       LOGICAL, SAVE :: firstcall=.TRUE.
+
+c dummy: sinon cette routine n'est jamais compilee...
+      if(1.eq.0) then
+        CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
+      endif
 
 c$OMP MASTER

trunk/libf/dyn3dpar/logic.h

@@ -10 +10 @@
      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0
+     &  ,ok_limit,ok_etat0,iflag_trac
 
       LOGICAL purmats,forward,leapf,apphys,statcl,conser,               &
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0
+     &  ,ok_limit,ok_etat0,iflag_trac
 
       INTEGER iflag_phys

trunk/libf/dyn3dpar/sortvarc.F

@@ -5 +5 @@
      $(itau,ucov,teta,ps,masse,pk,phis,vorpot,phi,bern,dp,time ,
      $ vcov )
+
+      use control_mod,only:resetvarc 
       IMPLICIT NONE