Changeset 1619 for LMDZ5/trunk

Timestamp:

Mar 27, 2012, 10:16:51 AM (13 years ago)

Author:

jghattas

Message:

• Changed variable ratqs, clwcon and rnebcon in restartphy file : before they were saved only at surface layer, now the whole variables are saved. Added specific option in iostart to be able to restart with

old restart files.

• Added variable uancien and vancien in restartphy.nc file. These variables are only needed for calculation of diagnostiques.

No change in result for standard physics (old or new).

Location:

LMDZ5/trunk/libf/phylmd

Files:

• iostart.F90 (modified) (1 diff)
• phyetat0.F (modified) (3 diffs)
• phyredem.F (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/iostart.F90

@@ -177 +177 @@
          ierr=NF90_GET_VAR(nid_start,varid,field_glo)
          IF (ierr/=NF90_NOERR) THEN
+           ! La variable exist dans le fichier mais la lecture a echouee. 
            PRINT*, 'phyetat0: Lecture echouee pour <'//field_name//'>'
-           CALL abort
+
+           IF (field_name=='CLWCON' .OR. field_name=='RNEBCON' .OR. field_name=='RATQS') THEN
+              ! Essaye de lire le variable sur surface uniqument, comme fait avant
+              field_glo(:)=0.
+              ierr=NF90_GET_VAR(nid_start,varid,field_glo(1:klon_glo))
+              IF (ierr/=NF90_NOERR) THEN
+                 PRINT*, 'phyetat0: Lecture echouee aussi en 2D pour <'//field_name//'>'
+                 CALL abort
+              ELSE
+                 PRINT*, 'phyetat0: La variable <'//field_name//'> lu sur surface seulement'!, selon ancien format, le reste mis a zero'
+              END IF
+           ELSE
+              CALL abort
+           ENDIF
          ENDIF
 

LMDZ5/trunk/libf/phylmd/phyetat0.F

@@ -749 +749 @@
       ENDIF
 
-      u_ancien = 0.0   !AXC: We don't have u_ancien and v_ancien in the start
-      v_ancien = 0.0   !AXC: files, therefore they have to be initialized.
-c
+      CALL get_field("UANCIEN",u_ancien,found)
+      IF (.NOT. found) THEN
+         PRINT*, "phyetat0: Le champ <UANCIEN> est absent"
+         PRINT*, "Depart legerement fausse. Mais je continue"
+         ancien_ok = .FALSE.
+      ENDIF
+
+      CALL get_field("VANCIEN",v_ancien,found)
+      IF (.NOT. found) THEN
+         PRINT*, "phyetat0: Le champ <VANCIEN> est absent"
+         PRINT*, "Depart legerement fausse. Mais je continue"
+         ancien_ok = .FALSE.
+      ENDIF
 
       clwcon=0.
-      CALL get_field("CLWCON",clwcon(:,1),found)
+      CALL get_field("CLWCON",clwcon,found)
       IF (.NOT. found) THEN
          PRINT*, "phyetat0: Le champ CLWCON est absent"
@@ -766 +776 @@
 c
       rnebcon = 0.
-      CALL get_field("RNEBCON",rnebcon(:,1),found)
+      CALL get_field("RNEBCON",rnebcon,found)
       IF (.NOT. found) THEN
          PRINT*, "phyetat0: Le champ RNEBCON est absent"
@@ -781 +791 @@
 c
       ratqs=0.
-      CALL get_field("RATQS",ratqs(:,1),found)
+      CALL get_field("RATQS",ratqs,found)
       IF (.NOT. found) THEN
          PRINT*, "phyetat0: Le champ <RATQS> est absent"

LMDZ5/trunk/libf/phylmd/phyredem.F

@@ -267 +267 @@
       
       CALL put_field("QANCIEN","QANCIEN",q_ancien)
-      
+
+      CALL put_field("UANCIEN","",u_ancien)
+
+      CALL put_field("VANCIEN","",v_ancien)
+
       CALL put_field("RUGMER","Longueur de rugosite sur mer",
      .               frugs(:,is_oce))
       
-      CALL put_field("CLWCON","Eau liquide convective",clwcon(:,1))
-      
-      CALL put_field("RNEBCON","Nebulosite convective",rnebcon(:,1))
-      
-      CALL put_field("RATQS", "Ratqs",ratqs(:,1))
+      CALL put_field("CLWCON","Eau liquide convective",clwcon)
+      
+      CALL put_field("RNEBCON","Nebulosite convective",rnebcon)
+      
+      CALL put_field("RATQS", "Ratqs",ratqs)
 c
 c run_off_lic_0