Changeset 1969

Timestamp:

Jul 11, 2018, 11:47:54 AM (6 years ago)

Author:

emillour

Message:

Mars GCM:
Some cosmetic changes:

• make watercloud less verbose
• turn vdifc.F into a module
• turn updatereffrad.F into a module

EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/callradite_mod.F (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (1 diff)
• libf/phymars/updatereffrad_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/updatereffrad.F) (4 diffs)
• libf/phymars/vdifc_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/vdifc.F) (3 diffs)
• libf/phymars/watercloud_mod.F (modified) (3 diffs)

trunk/LMDZ.MARS/README

@@ -2603 +2603 @@
 == 05/07/2018 == MV
 - improvedclouds.F changed to module improvedclouds_mod.F
+
+== 11/07/2018 == EM
+Some cosmetic changes:
+- make watercloud less verbose
+- turn vdifc.F into a module
+- turn updatereffrad.F into a module

trunk/LMDZ.MARS/libf/phymars/callradite_mod.F

@@ -12 +12 @@
 
       use aeropacity_mod, only: aeropacity
+      use updatereffrad_mod, only: updatereffrad
       use dimradmars_mod, only: ndomainsz, nflev, nsun, nir
       use dimradmars_mod, only: naerkind, name_iaer,

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -50 +50 @@
       USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad
       USE calldrag_noro_mod, ONLY: calldrag_noro
+      USE vdifc_mod, ONLY: vdifc
       use param_v4_h, only: nreact,n_avog, 
      &                      fill_data_thermos, allocate_param_thermos

trunk/LMDZ.MARS/libf/phymars/updatereffrad_mod.F

@@ +1 @@
+      MODULE updatereffrad_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE updatereffrad(ngrid,nlayer,
      &                rdust,rice,nuice,
      &                reffrad,nueffrad,
      &                pq,tauscaling,tau,pplay)
-       USE updaterad
+       USE updaterad, ONLY: updaterdust, updaterice_micro,
+     &                      updaterice_typ
        use tracer_mod, only: nqmx, igcm_dust_mass, igcm_dust_number,
      &                       igcm_h2o_ice, igcm_ccn_mass, radius,
@@ -12 +19 @@
      &            iaer_dust_conrath,iaer_dust_doubleq,
      &            iaer_dust_submicron,iaer_h2o_ice
-       USE comcstfi_h
+
        IMPLICIT NONE
 c=======================================================================
@@ -35 +42 @@
 c    -------------
 c
-#include "callkeys.h"
+      include "callkeys.h"
 
 c-----------------------------------------------------------------------
@@ -202 +209 @@
       ENDDO ! iaer (loop on aerosol kind)
 
-      RETURN
-      END 
+      END SUBROUTINE updatereffrad
+      
+      END MODULE updatereffrad_mod

trunk/LMDZ.MARS/libf/phymars/vdifc_mod.F

@@ +1 @@
+      MODULE vdifc_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE vdifc(ngrid,nlay,nq,co2ice,ppopsk,
      $                ptimestep,pcapcal,lecrit,
@@ -12 +18 @@
      &                      igcm_h2o_ice, alpha_lift
       use surfdat_h, only: watercaptag, frost_albedo_threshold, dryness
-      USE comcstfi_h
+      USE comcstfi_h, ONLY: cpp, r, rcp, g
       use turb_mod, only: turb_resolved, ustar, tstar
       IMPLICIT NONE
@@ -872 +878 @@
       ENDIF
 
-      RETURN
       END SUBROUTINE vdifc
+
+      END MODULE vdifc_mod

trunk/LMDZ.MARS/libf/phymars/watercloud_mod.F

@@ -88 +88 @@
       ! for time loop
       INTEGER microstep  ! time subsampling step variable
-      INTEGER imicro     ! time subsampling for coupled water microphysics & sedimentation
-      SAVE imicro
-      REAL microtimestep ! integration timestep for coupled water microphysics & sedimentation
-      SAVE microtimestep
+      INTEGER,SAVE :: imicro ! time subsampling for coupled water microphysics & sedimentation
+      REAL,SAVE :: microtimestep ! integration timestep for coupled water microphysics & sedimentation
+      REAL,SAVE :: microtimestep_prev=-999
       
       ! tendency given by clouds (inside the micro loop)
@@ -145 +144 @@
 #endif
         call getin("imicro",imicro)
-        write(*,*)"imicro = ",imicro
+        write(*,*)"watercloud: imicro = ",imicro
         
         firstcall=.false.
@@ -153 +152 @@
       !!     TBD: consider possible diff imicro with domains?
       microtimestep = ptimestep/real(imicro)
-      write(*,*)"Physical timestep is",ptimestep
-      write(*,*)"Microphysics timestep is",microtimestep
-
+      if (microtimestep/=microtimestep_prev) then
+        ! only tell the world if microtimestep has changed
+        write(*,*)"watercloud: Physical timestep is ",ptimestep
+        write(*,*)"watercloud: Microphysics timestep is ",microtimestep
+        microtimestep_prev=microtimestep
+      endif
       
 c-----Initialization