Changeset 4154 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Mar 25, 2026, 5:48:30 PM (7 weeks ago)

Author:

emillour

Message:

Mars PCM:
Minor cleanup, remove obsolete and unused "thermoswater" flag.
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• callkeys_mod.F90 (modified) (1 diff)
• conf_phys.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/callkeys_mod.F90

@@ -12 +12 @@
 logical,save :: callnirco2,callnlte,callthermos,callconduct
 !$OMP THREADPRIVATE(callnirco2,callnlte,callthermos,callconduct)
-logical,save :: calleuv,callmolvis,callmoldiff,thermochem,thermoswater
-!$OMP THREADPRIVATE(calleuv,callmolvis,callmoldiff,thermochem,thermoswater)
+logical,save :: calleuv,callmolvis,callmoldiff,thermochem
+!$OMP THREADPRIVATE(calleuv,callmolvis,callmoldiff,thermochem)
 logical,save :: calltherm,callrichsl,callslope,tituscap
 !$OMP THREADPRIVATE(calltherm,callrichsl,callslope,tituscap)

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

@@ -75 +75 @@
      &                        surfaceice_tifeedback, temp_dependent_m,
      &                        tf_injection, ti_injection, thermochem,
-     &                        thermoswater, tituscap, tke_heat_flux,
+     &                        tituscap, tke_heat_flux,
      &                        topflows, water, dust_coagulation
       use write_output_mod, only: output_diagfi
@@ -1161 +1161 @@
          write(*,*) " callthermos = ",callthermos
          
-
-         write(*,*) " water included without cycle ",
-     &              "(only if water=.false.)"
-         thermoswater=.false. ! default value
-         call getin_p("thermoswater",thermoswater)
-         write(*,*) " thermoswater = ",thermoswater
-
          write(*,*) "call thermal conduction ?",
      &    " (only if callthermos=.true.)"
@@ -1227 +1220 @@
 
          if (.not.callthermos) then
-           if (thermoswater) then
-             print*,'if thermoswater is set, callthermos must be true'
-             call abort_physic(modname,
-     &          "thermoswater requires callthermos",1)
-           endif          
            if (callconduct) then
              print*,'if callconduct is set, callthermos must be true'
@@ -1276 +1264 @@
          endif
 
-! if callthermos is used, then thermoswater should be used too 
-! (if water not used already)
+! if callthermos is used, then water should be used too 
 
          if (callthermos .and. .not.water) then
-           if (callthermos .and. .not.thermoswater) then
-             print*,'if callthermos is used, water or thermoswater 
-     &               should be used too'
-             call abort_physic(modname,
-     &          "callthermos requires water or thermoswater",1)
-           endif
+           print*,'if callthermos is used, water '//
+     &               'should be used too'
+           call abort_physic(modname,
+     &          "callthermos requires water",1)
          endif