Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phydev

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phydev/inifis_mod.F90 (modified) (2 diffs)
• libf/phydev/phyredem.F90 (modified) (3 diffs)

LMDZ6/branches/Ocean_skin/libf/phydev/inifis_mod.F90

@@ -1 @@
-! $Id: $
+! $Id$
 MODULE inifis_mod
 
@@ -6 +6 @@
   SUBROUTINE inifis(prad, pg, pr, pcpp)
   ! Initialize some physical constants and settings
-  USE print_control_mod, ONLY: init_print_control
+  USE init_print_control_mod, ONLY: init_print_control
   USE comcstphy, ONLY: rradius, & ! planet radius (m)
                        rr, & ! recuced gas constant: R/molar mass of atm

LMDZ6/branches/Ocean_skin/libf/phydev/phyredem.F90

@@ -5 +5 @@
 
   USE geometry_mod, ONLY : longitude_deg, latitude_deg
-  USE iostart, ONLY: open_restartphy, close_restartphy, put_var, put_field
+  USE iostart, ONLY: open_restartphy, close_restartphy, enddef_restartphy, put_field, put_var
+
 
   IMPLICIT NONE
@@ -13 +14 @@
   INTEGER,PARAMETER :: tab_cntrl_len=100
   REAL :: tab_cntrl(tab_cntrl_len)
+  INTEGER :: pass
 
   ! open file
@@ -21 +23 @@
 
   tab_cntrl(:)=0.0
- 
 
-  CALL put_var("controle", "Control parameters", tab_cntrl)
+  DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
+
+    CALL put_var(pass, "controle", "Control parameters", tab_cntrl)
 
   ! coordinates
 
-  CALL put_field("longitude", "Longitudes on physics grid", longitude_deg)
+    CALL put_field(pass, "longitude", "Longitudes on physics grid", longitude_deg)
      
-  CALL put_field("latitude", "Latitudes on physics grid", latitude_deg)
+    CALL put_field(pass, "latitude", "Latitudes on physics grid", latitude_deg)
 
+    IF (pass==1) CALL enddef_restartphy
+    IF (pass==2) CALL close_restartphy
+
+  ENDDO
   ! close file