Changeset 1140 for LMDZ4/branches/LMDZ4-dev/libf/dyn3d/etat0_netcdf.F

Timestamp:

Mar 30, 2009, 4:46:54 PM (16 years ago)

Author:

Ehouarn Millour

Message:

Premiere vaque de modifications pour l'unification des dynamiques (planetes-Terre) et un peu de netoyage ...

• modified 'makegcm' and 'makegcm_fcm' to remove 'CPP_PHYS' key and add 'CPP_EARTH' preprocessing key instead
• updated 'diagedyn.F' (in dyn3d and dyn3dpar) to use 'CPP_EARTH' key
• added 'ioipsl_getincom.F90' and 'ioipsl_stringop.F90' to 'dyn3d' and 'dyn3dpar' for future possibility of running without IOIPSL library
• modified conf_gcm.F ( in d'yn3d' and 'dyn3dpar') to read in flag 'planet_type' (default=='earth') (flag added in 'control.h')
• modified 'gcm.F' (in 'dyn3d' and 'dyn3dpar') so that flags so that 'read_start' and 'iflag_phys' (known from conf_gcm.F) are used
• added flag 'output_grads_dyn' (read by conf_gcm.F, stored in 'control.h') to write grads outputs from 'leapfrog.F' and 'leapfrog_p.F'
• removed 'comdiss.h' from 'dyn3d' and 'dyn3dpar' (it is not used)
• removed variable 'lstardis' from 'comdissip.h' (it is also in

'comdissnew.h'), in dyn3d as well as in dyn3dpar

• adapted 'dyn3d/iniacademic.F' to not use 'inicons0.F' but 'iniconst.F'
• updated 'dyn3d/etat0_netcdf.F' to not use 'inicons0' but 'iniconst' (added prerequisite pa=50000 instruction) and added #ifdef CPP_EARTH keys
• removed 'inicons0.F' and 'disvert0.F' (not used any more)

File:

• LMDZ4/branches/LMDZ4-dev/libf/dyn3d/etat0_netcdf.F (modified) (7 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/etat0_netcdf.F

@@ -5 +5 @@
 c
       SUBROUTINE etat0_netcdf (interbar, masque)
-    
+#ifdef CPP_EARTH        
       USE startvar
       USE ioipsl
@@ -14 +14 @@
       USE phys_state_var_mod
       USE filtreg_mod
+#endif
+!#endif of #ifdef CPP_EARTH
       !
       IMPLICIT NONE
@@ -25 +27 @@
 !     .KLON=KFDIA-KIDIA+1,KLEV=llm
       !
+#ifdef CPP_EARTH    
 #include "comgeom2.h"
 #include "comvert.h"
@@ -31 +34 @@
 #include "dimsoil.h"
 #include "temps.h"
-      !
+#endif
+!#endif of #ifdef CPP_EARTH
+      ! arguments:
       LOGICAL interbar
+      REAL :: masque(iip1,jjp1)
+
+#ifdef CPP_EARTH
+      ! local variables:
       REAL :: latfi(klon), lonfi(klon)
-      REAL :: orog(iip1,jjp1), rugo(iip1,jjp1), masque(iip1,jjp1)
+      REAL :: orog(iip1,jjp1), rugo(iip1,jjp1)
       REAL :: psol(iip1, jjp1), phis(iip1, jjp1)
       REAL :: p3d(iip1, jjp1, llm+1)
@@ -143 +152 @@
       !
       preff     = 101325.
+      pa        =  50000.
       unskap = 1./kappa
       !
@@ -168 +178 @@
 
 
-      CALL inicons0()
+      CALL iniconst()
       CALL inigeom()
 
@@ -759 +769 @@
       DEALLOCATE(q3d)
 
+#endif 
+!#endif of #ifdef CPP_EARTH
       RETURN
       !