Changeset 2641 for LMDZ5/branches/testing/libf/dyn3dmem/initfluxsto_p.F

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/initfluxsto_p.F (modified) (8 diffs)

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

@@ -13 +13 @@
        use Write_field
        use misc_mod
+       USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: nivsigs
+       USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn
        
       implicit none
@@ -43 +46 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "description.h"
+      include "iniprint.h"
 
 C   Arguments
@@ -106 +103 @@
       CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
       tau0 = itau_dyn
-        
-        do jj = 1, jjp1
+        
+        do jj = 1, jjp1
         do ii = 1, iip1
           rlong(ii,jj) = rlonu(ii) * 180. / pi
@@ -165 +162 @@
      .             1, iip1, 1, jjn,tau0, zjulian, tstep, vhoriid,
      .             filevid,dynv_domain_id)
-        
-      rl(1,1) = 1.      
+        
+      rl(1,1) = 1.
       
       if (mpi_rank==0) then
@@ -191 +188 @@
       call histhori(fileid, iip1, rlong(:,jjb:jje),jjn,rlat(:,jjb:jje),
      .             'scalar','Grille points scalaires', thoriid)
-        
+        
 C
 C  Appel a histvert pour la grille verticale
@@ -211 +208 @@
 C
 C  Appels a histdef pour la definition des variables a sauvegarder
-        
-        CALL histdef(fileid, "phis", "Surface geop. height", "-",
+        
+        CALL histdef(fileid, "phis", "Surface geop. height", "-",
      .                iip1,jjn,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -219 +216 @@
      .                iip1,jjn,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
-        
+        
         if (mpi_rank==0) then
-        
-        CALL histdef(filedid, "dtvr", "tps dyn", "s",
+        
+        CALL histdef(filedid, "dtvr", "tps dyn", "s",
      .                1,1,dhoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -289 +286 @@
         if (mpi_rank==0) call histsync(filedid)
       endif
-        
+        
 #else
       write(lunout,*)'initfluxsto_p: Needs IOIPSL to function'