Changeset 1795 for LMDZ5/branches/testing/libf/dyn3dmem/gcm.F

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/gcm.F (modified) (6 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/gcm.F

@@ -19 +19 @@
       USE filtreg_mod
       USE control_mod
+
+#ifdef INCA
+! Only INCA needs these informations (from the Earth's physics)
+      USE indice_sol_mod
+#endif
 
 #ifdef CPP_PHYS
@@ -75 +80 @@
 #ifdef INCA
 ! Only INCA needs these informations (from the Earth's physics)
-#include "indicesol.h"
+!#include "indicesol.h"
 #endif
 
@@ -270 +275 @@
       ! constants & fields, if we run the 'newtonian' or 'SW' cases:
         if (iflag_phys.ne.1) then
-          CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
+          CALL iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
 
@@ -291 +296 @@
      .              'GCM: AVANT iniacademic AVANT AVANT AVANT AVANT'
       if (.not.read_start) then
-         CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
+         CALL iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
       endif
 
@@ -398 +403 @@
 #endif
 
-
+      if (iflag_phys.eq.1) then
+      ! these initialisations have already been done (via iniacademic)
+      ! if running in SW or Newtonian mode
 c-----------------------------------------------------------------------
 c   Initialisation des constantes dynamiques :
@@ -414 +421 @@
 c   --------------------------
         CALL inifilr
+      endif ! of if (iflag_phys.eq.1)
 c
 c-----------------------------------------------------------------------