Changeset 569

Timestamp:

10/12/17 17:52:17 (7 years ago)

Author:

dubos

Message:

devel : additional fields in restart when NH - requires changes to icosa.xml

Location:

codes/icosagcm/devel/src

Files:

• output/write_etat0.f90 (modified) (3 diffs)
• time/timeloop_gcm.f90 (modified) (2 diffs)

codes/icosagcm/devel/src/output/write_etat0.f90

@@ -5 +5 @@
 CONTAINS
 
-  SUBROUTINE write_etat0(it,f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+  SUBROUTINE write_etat0(it,f_ps,f_phis,f_theta_rhodz,f_u, f_q, f_geopot, f_W)
   USE icosa
   USE restart_mod
@@ -20 +20 @@
     TYPE(t_field),POINTER :: f_u(:)
     TYPE(t_field),POINTER :: f_q(:)
+    TYPE(t_field),POINTER, OPTIONAL :: f_geopot(:)
+    TYPE(t_field),POINTER, OPTIONAL :: f_W(:)
   
     TYPE(t_field),POINTER,SAVE :: f_ulon(:)
@@ -41 +43 @@
     CALL transfert_request(f_u,req_e1_vect)
     CALL un2ulonlat(f_u, f_ulon, f_ulat)
-    
-    CALL write_restart(it,f_ps,f_phis,f_theta_rhodz_1d,f_u, f_ulon, f_ulat, f_q)
 
+    IF(hydrostatic) THEN
+       CALL write_restart(it,f_ps,f_phis,f_theta_rhodz_1d,f_u, f_ulon, f_ulat, f_q)
+    ELSE
+       CALL write_restart(it,f_ps,f_phis,f_theta_rhodz_1d,f_u, f_ulon, f_ulat, f_q, f_geopot, f_W)
+    END IF
     CALL deallocate_field(f_ulon)
     CALL deallocate_field(f_ulat)

codes/icosagcm/devel/src/time/timeloop_gcm.f90

@@ -219 +219 @@
     END IF
     
-    IF (write_start) CALL write_etat0(itau0,f_ps, f_phis,f_theta_rhodz,f_u,f_q)  ! FIXME : write_start undefined
+!    IF (write_start) CALL write_etat0(itau0,f_ps, f_phis,f_theta_rhodz,f_u,f_q)
+    IF (write_start) CALL write_etat0(itau0,f_ps, f_phis,f_theta_rhodz,f_u,f_q, f_geopot, f_W)
    
     CALL write_output_fields_basic(.TRUE., f_phis, f_ps, f_mass, f_geopot, f_theta_rhodz, f_u, f_W, f_q)
@@ -337 +338 @@
     END DO
     
-    CALL write_etat0(itau0+itaumax,f_ps, f_phis,f_theta_rhodz,f_u,f_q) 
+!    CALL write_etat0(itau0+itaumax,f_ps, f_phis,f_theta_rhodz,f_u,f_q) 
+    CALL write_etat0(itau0+itaumax,f_ps, f_phis,f_theta_rhodz,f_u,f_q, f_geopot, f_W) 
     
     CALL check_conserve_detailed(it, AAM_dyn, &