Changeset 3845 for dynamico_lmdz

Timestamp:

Jul 2, 2015, 6:15:28 PM (10 years ago)

Author:

ymipsl

Message:

Dynamico side modification for Dynamico-LMDZ coupling

YM

Location:

dynamico_lmdz/aquaplanet/ICOSAGCM/src

Files:

• advect_tracer.f90 (modified) (1 diff)
• etat0_heldsz.f90 (modified) (2 diffs)
• etat0_start_file.f90 (modified) (1 diff)
• icosa_gcm.f90 (modified) (1 diff)
• icosa_mod.f90 (modified) (1 diff)
• icosagcm.f90 (modified) (1 diff)
• output_field.f90 (modified) (2 diffs)
• physics.f90 (modified) (6 diffs)
• physics_external.F90 (added)
• time.f90 (modified) (1 diff)
• write_etat0.f90 (modified) (1 diff)
• write_field.f90 (modified) (2 diffs)

dynamico_lmdz/aquaplanet/ICOSAGCM/src/advect_tracer.f90

@@ -58 +58 @@
     USE mpipara
     USE trace
-    USE write_field
+    USE write_field_mod
     IMPLICIT NONE
     

dynamico_lmdz/aquaplanet/ICOSAGCM/src/etat0_heldsz.f90

@@ -76 +76 @@
 
        theta_eq=f_theta_eq(ind) 
-       CALL compute_Teq(lat_i,theta_eq) ! FIXME : already done by Init_Teq
+       CALL compute_Teq(lat_i,theta_eq) ! FIXME : already done by Init_Teq 
 
        ps=f_ps(ind)
@@ -90 +90 @@
        CALL compute_theta2theta_rhodz(ps,theta,theta_rhodz,1)
        q=f_q(ind)
-       q(:,:,:)=1e2
+       q(:,:,1)=1e-2
+       q(:,:,2)=0
+       q(:,:,3:)=1e-2
     ENDDO
   END SUBROUTINE etat0

dynamico_lmdz/aquaplanet/ICOSAGCM/src/etat0_start_file.f90

@@ -11 +11 @@
   USE restart_mod
   USE wind_mod
-  USE write_field
+  USE write_field_mod
   USE time_mod
   USE transfert_mod

dynamico_lmdz/aquaplanet/ICOSAGCM/src/icosa_gcm.f90

@@ -4 +4 @@
   CALL icosa_init
 
+
 END PROGRAM icosa_gcm
+
+SUBROUTINE initialize_external_physics
+END SUBROUTINE initialize_external_physics
+
+SUBROUTINE external_physics
+END SUBROUTINE external_physics

dynamico_lmdz/aquaplanet/ICOSAGCM/src/icosa_mod.f90

@@ -13 +13 @@
   USE vector
   USE field_mod
-  USE write_field
+  USE write_field_mod
   USE transfert_mod
   USE time_mod

dynamico_lmdz/aquaplanet/ICOSAGCM/src/icosagcm.f90

@@ -17 +17 @@
   USE output_field_mod
   USE xios_mod
-  USE write_field
+  USE write_field_mod
   USE physics_mod
   IMPLICIT NONE

dynamico_lmdz/aquaplanet/ICOSAGCM/src/output_field.f90

@@ -14 +14 @@
   USE getin_mod
   USE xios_mod
-  USE write_field
+  USE write_field_mod
   IMPLICIT NONE
 
@@ -37 +37 @@
     USE field_mod
     USE xios_mod
-    USE write_field
+    USE write_field_mod
     IMPLICIT NONE  
      CHARACTER(LEN=*),INTENT(IN) :: name_in

dynamico_lmdz/aquaplanet/ICOSAGCM/src/physics.f90

@@ -5 +5 @@
   PRIVATE
 
-  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4 
+  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4, phys_external=5
 
   INTEGER :: phys_type
@@ -27 +27 @@
     USE etat0_venus_mod, ONLY : init_phys_venus=>init_physics
     USE physics_lmdz_generic_mod, ONLY : init_physics_lmdz_generic=>init_physics
+    USE physics_external_mod, ONLY : init_physics_external=>init_physics
     IMPLICIT NONE
 
@@ -45 +46 @@
        CALL init_physics_lmdz_generic
        phys_type=phys_lmdz_generic
+    CASE ('phys_external')
+       CALL init_physics_external
+       phys_type=phys_external
     CASE ('dcmip')
        CALL allocate_field(f_dulon,field_t,type_real,llm, name='dulon')
@@ -55 +59 @@
     CASE DEFAULT
        IF(is_mpi_root) PRINT*, 'init_physics : Bad selector for variable physics <',&
-            TRIM(physics_type), '> options are <none>, <held_suarez>, <Lebonnois2012>, <dcmip>, <phys_lmdz_generic>'
+            TRIM(physics_type), '> options are <none>, <held_suarez>, <Lebonnois2012>, <dcmip>', &
+                                '<phys_lmdz_generic>, <phys_external>'
        STOP
     END SELECT
@@ -66 +71 @@
     USE physics_interface_mod
     USE physics_lmdz_generic_mod, ONLY : physics_lmdz_generic => physics
+    USE physics_external_mod, ONLY : physics_external => physics
     USE physics_dcmip_mod, ONLY : write_physics_dcmip => write_physics
     USE etat0_heldsz_mod
@@ -96 +102 @@
        CASE (phys_lmdz_generic)
          CALL physics_lmdz_generic(it ,f_phis, f_ps, f_theta_rhodz, f_ue, f_wflux, f_q)
+       CASE (phys_external)
+         CALL physics_external(it ,f_phis, f_ps, f_theta_rhodz, f_ue, f_wflux, f_q)
        CASE(phys_LB2012)
           CALL phys_venus(f_ps,f_theta_rhodz,f_ue) 

dynamico_lmdz/aquaplanet/ICOSAGCM/src/time.f90

@@ -25 +25 @@
   INTEGER,SAVE :: day_step,ndays
 !$OMP THREADPRIVATE(day_step,ndays)  
-  REAL(rstd),SAVE :: jD_ref,jH_ref
-!$OMP THREADPRIVATE(jD_ref,jH_ref)  
-  INTEGER,SAVE :: day_ini,day_end,annee_ref,day_ref
-!$OMP THREADPRIVATE(day_ini,day_end,annee_ref,day_ref)  
-  REAL(rstd),SAVE::start_time
-!$OMP THREADPRIVATE(start_time)  
+
   CHARACTER(LEN=255) :: time_style
 !$OMP THREADPRIVATE(time_style)  
-  INTEGER,SAVE:: an, mois, jour
-!$OMP THREADPRIVATE(an, mois, jour)  
-  REAL(rstd),SAVE:: heure
-!$OMP THREADPRIVATE(heure)  
-  CHARACTER (LEN=10):: calend
-!$OMP THREADPRIVATE(calend)  
 
   PUBLIC create_time_counter_header, update_time_counter, close_time_counter, init_time,  &
          dt, write_period, itau_out, itau_adv, itau_dissip, itau_physics, itaumax,  &
          itau_check_conserv,  & 
-         day_step,ndays,jD_ref,jH_ref,day_ini,day_end,annee_ref,day_ref, &
-         an, mois, jour,heure, calend,time_style,itau0
+         day_step,ndays,time_style,itau0
 
 

dynamico_lmdz/aquaplanet/ICOSAGCM/src/write_etat0.f90

@@ -9 +9 @@
   USE restart_mod
   USE wind_mod
-  USE write_field
+  USE write_field_mod
   IMPLICIT NONE
     INTEGER,INTENT(IN)    :: it

dynamico_lmdz/aquaplanet/ICOSAGCM/src/write_field.f90

@@ -1 @@
-module write_field
+module write_field_mod
 USE genmod
 implicit none
@@ -1799 +1799 @@
   end function int2str
 
-end module write_field
+end module write_field_mod