Changeset 4223 for dynamico_lmdz/simple_physics/phyparam/dynphy_lonlat

Timestamp:

Jan 10, 2020, 12:09:43 AM (5 years ago)

Author:

dubos

Message:

simple_physics : cleanup phyparam and iniphyparam

Location:

dynamico_lmdz/simple_physics/phyparam/dynphy_lonlat

Files:

• iniphysiq_mod.F90 (modified) (2 diffs)
• iophys.F90 (moved) (moved from dynamico_lmdz/simple_physics/phyparam/param/iophys.F90) (4 diffs)
• physiq_mod.F90 (modified) (2 diffs)

dynamico_lmdz/simple_physics/phyparam/dynphy_lonlat/iniphysiq_mod.F90

@@ -21 +21 @@
     USE phyaqua_mod, ONLY: iniaqua
     USE nrtype, ONLY: pi
-    
+!    USE vertical_layers_mod, ONLY : presnivs
+
     !
     !=======================================================================
@@ -81 +82 @@
        CALL iniaqua(klon_omp,iflag_phys)
     ENDIF
+!
+!    call iophys_ini('phys.nc    ',presnivs)
 
     CALL setup_phyparam

dynamico_lmdz/simple_physics/phyparam/dynphy_lonlat/iophys.F90

@@ +1 @@
+MODULE iophys
+  IMPLICIT NONE
+  PRIVATE
+
+  PUBLIC :: iophys_ini
+  
+  CONTAINS
+
       subroutine iophys_ecrit(nom,lllm,titre,unite,px)
       USE dimphy
@@ -67 +75 @@
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+      SUBROUTINE writefield1(name, longname, unit, var)
+        CHARACTER(*), INTENT(IN) :: name, longname, unit
+        REAL, INTENT(IN)         :: var(:)
+        CALL iophys_ecrit(name, 1, longname, unit, var)
+      END SUBROUTINE writefield1
+
+      SUBROUTINE writefield2(name, longname, unit, var)
+        CHARACTER(*), INTENT(IN) :: name, longname, unit
+        REAL, INTENT(IN)         :: var(:,:)
+        PRINT *, 'writefield2', name, SHAPE(var)
+        CALL iophys_ecrit(name, SIZE(var,2), longname, unit, var)
+      END SUBROUTINE writefield2
+
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       SUBROUTINE iophys_ini(fichnom,presnivs)
       USE mod_phys_lmdz_para
-
+      USE writefield_mod
       IMPLICIT NONE
 
@@ -100 +124 @@
 !   ----------
 
+writefield1_plugin => writefield1
+writefield2_plugin => writefield2
+
 !$OMP MASTER
     IF (is_mpi_root) THEN       
@@ -109 +136 @@
 
       END
+
+END MODULE

dynamico_lmdz/simple_physics/phyparam/dynphy_lonlat/physiq_mod.F90

@@ -28 +28 @@
     
     USE infotrac_phy, only : nqtot
+    USE iophys,       ONLY : iophys_ini
     USE phyparam_mod, ONLY : phyparam
     !
@@ -72 +73 @@
     ENDIF
     
-    CALL phyparam(klon,klev,nqtot, &
-         debut,lafin, &
+    IF(debut) CALL iophys_ini('phys.nc    ',presnivs) ! calls iotd_ini
+
+    CALL phyparam(klon,klev,       &
+         debut,lafin,              &
          rjourvrai,gmtime,pdtphys, &
-         paprs,pplay,pphi,pphis,presnivs, &
-         u,v,t,qx, &
-         flxmass_w, &
-         d_u,d_v,d_t,d_qx,d_ps) 
+         paprs,pplay,pphi,         &
+         u,v,t,                    &
+         d_u,d_v,d_t,d_ps) 
+
+    IF(lafin) THEN
+       call iotd_fin
+       PRINT*,'Ecriture du fichier de reinitialiastion de la physique'
+!       write(75)  tsurf,tsoil FIXME
+    ENDIF
+
     
     print*,'PHYDEV: itau=',itau